This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.
author: nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2004-09-16 21:19:02 +0000
committer: nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2004-09-16 21:19:02 +0000
commit: 40fdc8a404e75ab03b68cc62e9987cf208fd8c30 (patch)
tree: 37d9c4d3abe4aefd8a34ed797883dd2cd4862ca7
parent: c254b281f1b9a4ca19dd0c3ee73a0654a7718909 (diff)
download: ATCD-typecode-overhaul.tar.gz
2414 files changed, 64219 insertions, 53798 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 0302faafb08..668afa0e02c 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -1,92 +1,109 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><!-- $Id$ -->
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Building and Installing ACE and Its Auxiliary Libraries and Services</title>
+<!-- $Id$ -->
 
-  <link rev="made" href="mailto:d.schmidt@vanderbilt.edu"></head>
+<HTML>
+<HEAD>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <TITLE>Building and Installing ACE and Its Auxiliary Libraries and Services</TITLE>
+  <link rev=made href="mailto:d.schmidt@vanderbilt.edu">
+</HEAD>
 
+<BODY text    = "#000000"
+      link    = "#000fff"
+      vlink   = "#ff0f0f"
+      bgcolor = "#ffffff">
 
+<HR>
+<H3>Building and Installing ACE and Its Auxiliary Libraries and Services</H3>
 
-<body bgcolor="#ffffff" link="#000fff" text="#000000" vlink="#ff0f0f">
-
-<hr>
-<h3>Building and Installing ACE and Its Auxiliary Libraries and Services</h3>
-
-<h4>Synopsis</h4>
+<H4>Synopsis</H4>
 
 The file explains how to build and install ACE and its Network
 Services on the various OS platforms and compilers that it has been
-ported to.  Please consult the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ChangeLog">ChangeLog</a> file
+ported to.  Please consult the <A HREF="ChangeLog">ChangeLog</A> file
 to see whether any recent changes to the release will affect your
-code.  In addition, you should check out our <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-development-process.html">development
-process</a>.  As you start working with ACE, we suggest you get copies
-of the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE/book1/">C++NPv1</a>, <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE/book2/">C++NPv2</a>, and <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0201699710/qid=1066059513/sr=8-1/ref=sr_8_1/103-7740325-3955843?v=glance&amp;s=books&amp;n=507846">APG</a> books
+code.  In addition, you should check out our <A
+HREF="docs/ACE-development-process.html">development
+process</A>.  As you start working with ACE, we suggest you get copies
+of the <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE/book1/">C++NPv1</A>, <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE/book2/">C++NPv2</A>, and <A
+HREF="http://www.amazon.com/exec/obidos/tg/detail/-/0201699710/qid=1066059513/sr=8-1/ref=sr_8_1/103-7740325-3955843?v=glance&s=books&n=507846">APG</A> books
 to help guide you after you've built and installed ACE.  You should
-also consult the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-FMM.html">ACE Frequently Made
+also consult the <a href="docs/ACE-FMM.html">ACE Frequently Made
 Mistakes page</a>.  If you encounter any problems or would like to
-request an enhancement, then use our <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/usage-bugzilla.html">bug tracking system</a> to submit a
-report in accordance with our <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-bug-process.html">bug
-report process</a>.<p>
-
-</p><h4>Document Index</h4>
-
-<ul>
-  <li><a href="#platforms">Supported Platforms and C++ Compilers</a>
-  </li><li><a href="#installpre">Installation prerequisites</a>
-  </li><li><a href="#installnotes">Installation Notes</a>
-  </li><li><a href="#g++">Compiling ACE with GNU g++</a>
-  </li><li><a href="#egcs">Compiling ACE with egcs</a>
-  </li><li><a href="#aceinstall">Building and Installing ACE</a>
-  </li><li><a href="#svcsinstall">Building and Installing ACE Network Services</a>
-  </li><li><a href="#sslinstall">Building and Installing The ACE_SSL Library</a>
-  </li><li><a href="#minimum_build">What Do I Need to Build for TAO?</a>
-  </li><li><a href="#resource_requirements">System Resource Requirements</a>
-  </li><li><a href="#MPC">General MPC Information</a>
-  </li><li><a href="#eclipse">Working with ACE in Eclipse</a>
-  </li><li><a href="#advanced">Advanced Topics</a>
-  </li><li><a href="#power">Building from Anonymous CVS</a>
-</li></ul>
-
-
-<p></p><hr><p>
-</p><h3><a name="platforms">Platforms, C++ Compilers, and Support</a></h3>
-
-<p>ACE has been ported to a large number of platfroms using many different
-compilers over the years.  The <a href="http://www.dre.vanderbilt.edu/">DOC group</a>, <a href="http://www.riverace.com/">Riverace</a>, <a href="http://www.theaceorb.com/">OCI</a>, <a href="http://www.theaceorb.nl/">Remedy IT</a>, and members of the ACE
+request an enhancement, then use our <a
+href="docs/usage-bugzilla.html">bug tracking system</a> to submit a
+report in accordance with our <A
+HREF="docs/ACE-bug-process.html">bug
+report process</a>.<P>
+
+<H4>Document Index</H4>
+
+<UL>
+  <LI><A HREF="#platforms">Supported Platforms and C++ Compilers</A>
+  <LI><A HREF="#installpre">Installation prerequisites</A>
+  <LI><A HREF="#installnotes">Installation Notes</A>
+  <LI><A HREF="#g++">Compiling ACE with GNU g++</A>
+  <LI><A HREF="#egcs">Compiling ACE with egcs</A>
+  <LI><A HREF="#aceinstall">Building and Installing ACE</A>
+  <LI><A HREF="#svcsinstall">Building and Installing ACE Network Services</A>
+  <LI><A HREF="#sslinstall">Building and Installing The ACE_SSL Library</A>
+  <LI><A HREF="#minimum_build">What Do I Need to Build for TAO?</A>
+  <LI><A HREF="#resource_requirements">System Resource Requirements</A>
+  <LI><A HREF="#MPC">General MPC Information</A>
+  <LI><A HREF="#advanced">Advanced Topics</A>
+  <LI><A HREF="#power">Building from Anonymous CVS</A>
+</UL>
+
+
+<P><HR><P>
+<H3><A NAME="platforms">Platforms, C++ Compilers, and Support</A></H3>
+
+<p>ACE has been ported to a large number of platfroms using many different 
+compilers over the years.  The <A
+HREF="http://www.dre.vanderbilt.edu/">DOC group</A>, <A
+HREF="http://www.riverace.com/">Riverace</A>, <A
+HREF="http://www.theaceorb.com">OCI</A>, <A
+HREF="http://www.theaceorb.nl">Remedy IT</A>, and members of the ACE
 user community have all contributed ports to make ACE the successful
 and far-reaching toolkit it is today.  Any UNIX/POSIX/Windows
-variation is a potential target platform for ACE.  If you have <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-porting.html">porting questions</a> or have a problem
+variation is a potential target platform for ACE.  If you have <A
+HREF="docs/ACE-porting.html">porting questions</A> or have a problem
 compiling the ACE source distribution, please contact one of the
 commercial support companies, or send a copy of the
-PROBLEM-REPORT-FORM to either the <a href="news:comp.soft-sys.ace">ACE
-Newsgroup</a> or the <a href="mailto:ace-users@cs.wustl.edu">ACE
-mailing list</a> and someone will try to help you fix the problems.
+PROBLEM-REPORT-FORM to either the <A HREF="news:comp.soft-sys.ace">ACE
+Newsgroup</A> or the <A HREF="mailto:ace-users@cs.wustl.edu">ACE
+mailing list</A> and someone will try to help you fix the problems.
 
-</p><p>The responsibility for maintaining ACE across this wide range of
+<p>The responsibility for maintaining ACE across this wide range of
 platforms is divided among a few different groups: the DOC group,
 Riverace, OCI, Remedy IT, and the ACE user community itself.  The
 table below summarizes each group's role and where you can get more
 detailed information.  For information on TAO's platform coverage and
-support, please also see <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/TAO-INSTALL.html">TAO's install
-document</a>.</p><p>
+support, please also see <A HREF="TAO/TAO-INSTALL.html">TAO's install
+document</A>.<P>
 
-<table border="1" width="75%">
-<caption><b>Groups Involved in ACE Development and Support<br></b></caption>
+<table width="75%" border=1>
+<caption><b>Groups Involved in ACE Development and Support<BR></B></caption>
 <thead>
-  <tr valign="top">
+  <tr valign=top>
     <th>Group
-    </th><th>Platforms
-    </th><th>For more information
-  </th></tr>
-</thead><tbody>
+    <th>Platforms
+    <th>For more information
+  </tr>
+<tbody>
   <tr>
     <th>DOC Group</th>
-    <td><a href="http://www.dre.vanderbilt.edu/scoreboard/">Tested</a>
+    <td><A HREF="http://www.dre.vanderbilt.edu/scoreboard/">Tested</A>
         and used daily by the DOC group:
         Solaris 7, 8 and 9 (many compilers excluding SunC++ 4.x)
         Windows 2000, XP (MSVC++ 6.x, and 7.x)
         Linux/Intel (many compilers), Linux/IA64 (GCC).
     </td>
-    <td>DOC sites at <a href="http://www.dre.vanderbilt.edu/">ISIS, </a><a href="http://doc.ece.uci.edu/">UCI</a> and <a href="http://tao.doc.wustl.edu/">Washington University</a>
+    <td>DOC sites at <A HREF="http://www.dre.vanderbilt.edu/">ISIS, <A
+    HREF="http://doc.ece.uci.edu/">UCI</A> and <A
+    HREF="http://tao.doc.wustl.edu/">Washington University</A>
     </td>
   </tr>
   <tr>
@@ -94,26 +111,26 @@ document</a>.</p><p>
     <td>Offers support services for many platforms including those
         above, HP-UX, AIX, and Windows CE.
     </td>
-    <td>Riverace's <a href="http://www.riverace.com/">web site</a></td>
+    <td>Riverace's <A HREF="http://www.riverace.com/">web site</A></td>
   </tr>
   <tr>
     <th>OCI</th>
     <td>Maintains ACE on certain platforms required for their TAO
         software and service offerings.
     </td>
-    <td>OCI's <a href="http://www.theaceorb.com/">web site</a> and
-        the TAO <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/TAO-INSTALL.html">install document</a></td>
+    <td>OCI's <A HREF="http://www.theaceorb.com/">web site</A> and
+        the TAO <A HREF="TAO/TAO-INSTALL.html">install document</A></td>
   </tr>
   <tr>
     <th>Remedy IT</th>
     <td>Maintains ACE on many platforms required for their ACE and
         TAO service offerings. Besides the standard DOC group platforms
-        we also support Borland C++ Builder 6, CBuilderX 1.0, MinGW,
-        Cygwin, VxWorks 5.5, OpenVMS 7.3-2, Linux 64bit Alpha, Tru64,
-        HPUX 11i 32/64 bit on PA-RISC, and HPUX 11i v2 on Itanium.
+        we also support Borland C++ Builder 6, CBuilderX 1.0, MinGW, 
+        Cygwin, VxWorks 5.5, OpenVMS 7.3-2, Linux 64bit Alpha, Tru64, 
+        and HPUX 11i 32/64 bit.
     </td>
-    <td>Remedy IT <a href="http://www.theaceorb.nl/">web site</a> and
-        the TAO <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/TAO-INSTALL.html">install document</a>
+    <td>Remedy IT <A HREF="http://www.theaceorb.nl">web site</A> and
+        the TAO <A HREF="TAO/TAO-INSTALL.html">install document</A>
     </td>
   </tr>
   <tr>
@@ -128,7 +145,7 @@ document</a>.</p><p>
         Chorus; OS/9; PharLap TNT Embedded ToolSuite 9.1;
         QNX RTP and Neutrino 2.0; VxWorks; LynxOS; RTEMS
     </td>
-  </tr><tr>
+  <tr>
     <th>Not supported</th>
     <td>The following platforms have been supported in the past but are
         not supported anymore by the DOC Group. If you want to have
@@ -137,29 +154,33 @@ document</a>.</p><p>
         Borland C++ Builder 4 and 5.
     </td>
   </tr>
-    <tr><td></td>
+    <td></td>
   </tr>
-</tbody></table></p><p>
+</table><P>
 
-</p><p>Although the DOC group has provided outstanding, world-class
+<p>Although the DOC group has provided outstanding, world-class
 support for ACE over the years, ACE's success has greatly increased
 the amount of effort required to keep up with its maintenance, answer
 users' questions, and give design guidance. Riverace offers
 world-class commercial services to support ACE users and OCI and
 Remedy IT offer similar services for TAO, allowing the DOC group's
-primary focus to shift back to their main goal: <em>research</em>. The
-DOC group is fundamentally focused on (and <a href="http://www.cs.wustl.edu/%7Eschmidt/resume-grants.html">funded
-by</a>) advanced R&amp;D projects. The group continues to be
+primary focus to shift back to their main goal: <EM>research</EM>. The
+DOC group is fundamentally focused on (and <A
+HREF="http://www.cs.wustl.edu/~schmidt/resume-grants.html">funded
+by</A>) advanced R&amp;D projects. The group continues to be
 intimately involved in ACE+TAO development and maintenance, but with
-revised priorities for maintenance. The <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-bug-process.html">bug fixing policies</a> followed by
-the DOC group are designed to strike a balance between their many <a href="http://www.cs.wustl.edu/%7Eschmidt/research.html">research
-projects</a> and their commitment to the ACE+TAO <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE-users.html">user
-community</a>.  Naturally, we will be happy to accept well-tested
+revised priorities for maintenance. The <A
+HREF="docs/ACE-bug-process.html">bug fixing policies</A> followed by
+the DOC group are designed to strike a balance between their many <A
+HREF="http://www.cs.wustl.edu/~schmidt/research.html">research
+projects</A> and their commitment to the ACE+TAO <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE-users.html">user
+community</A>.  Naturally, we will be happy to accept well-tested
 patches from the ACE+TAO user community for any platforms that aren't
-supported by the DOC group, Riverace, OCI or Remedy IT. </p><p>
+supported by the DOC group, Riverace, OCI or Remedy IT. <P>
 
-</p><p></p><hr><p>
-</p><h3><a name="installpre">Installation prerequisites</a></h3>
+<P><HR><P>
+<H3><A NAME="installpre">Installation prerequisites</A></H3>
 
 ACE (including TAO and CIAO) uses MPC (MakeProjectCreator) to generate
 files useful for the build tools (such as GNUmakefiles for UNIX based
@@ -169,44 +190,47 @@ of ACE (TAO and CIAO) includes GNUmakefiles for UNIX platforms, VC6
 project files, and VC71 solution files. If it is necessary to generate
 files for build tools for other compilers such as Visual Age for IBM,
 and Windows CE users have to run MPC themselves to generate the
-appropriate files. Please see <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/MPC/USAGE"> USAGE </a>, <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/MPC/README"> README </a> and <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/bin/MakeProjectCreator/README">README for ACE</a> files for
+appropriate files. Please see <A HREF="MPC/USAGE"> USAGE </A>, <A
+HREF="MPC/README"> README </A> and <A
+HREF="bin/MakeProjectCreator/README">README for ACE</A> files for
 details. The options that have been used to generate the above build
-files can be found in <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/bin/MakeProjectCreator/config/global.features">
-global.features</a> file.
+files can be found in <A
+HREF="bin/MakeProjectCreator/config/global.features">
+global.features</A> file.
 
 
-<p></p><hr><p>
-</p><h3><a name="installnotes">Installation Notes</a></h3>
+<P><HR><P>
+<H3><A NAME="installnotes">Installation Notes</A></H3>
 
-<ul>
-  <li><b>Windows (Windows NT, 2000, XP, 2003, etc., and Windows '9x/ME) </b><p>
+<UL>
+  <LI><B>Windows (Windows NT, 2000, XP, 2003, etc., and Windows '9x/ME) </B><P>
 
       All of ACE has been ported to the Win32 API (which includes
       Windows NT, Windows 2000, and Windows '95/98/ME) and Win64.  The entire
       release now compiles using the Microsoft Visual C++ 6.0, and
       7.1 (aka Visual C++ .NET 2003) compilers.  ACE can be built as both
       a static (LIB) and dynamic (DLL) library, using the Win32 installation
-      process described below.</p><p>
+      process described below.<P>
 
-      Please see the <a href="#Non-static%20Object%20Manager">Non-static
-      ACE_Object_Manager</a> discussion below.</p><p>
+      Please see the <A HREF="#Non-static Object Manager">Non-static
+      ACE_Object_Manager</A> discussion below.<p>
 
       We've also added some support for
-      <a href="#mingw">GNU g++ with MinGW</a>,
-      <a href="#cygwin">GNU g++ with Cygwin</a>
-      <a href="#borland">Borland C++ 5.5, Borland C++ Builder 4.0/5.0/6.0
-      and Borland C++ BuilderX</a>, and IBM's VisualAge C++ compiler.
+      <A HREF="#mingw">GNU g++ with MinGW</A>,
+      <A HREF="#cygwin">GNU g++ with Cygwin</A>
+      <A HREF="#borland">Borland C++ 5.5, Borland C++ Builder 4.0/5.0/6.0
+      and Borland C++ BuilderX</A>, and IBM's VisualAge C++ compiler.
       Since we don't have these compilers we rely on the ACE+TAO users
       community to maintain these ports.  Therefore, please send email
-      to the ACE mailing list if you run into problems. </p><p>
+      to the ACE mailing list if you run into problems. <P>
 
-  </p></li><li><b>Windows CE</b><p>
+  <li><b>Windows CE</b><p>
 
-      Take a look at (<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/CE-status.txt">CE-status.txt</a>) for
-      up-to-date information about ACE on CE.</p><p>
+      Take a look at (<a href="docs/CE-status.txt">CE-status.txt</a>) for
+      up-to-date information about ACE on CE.<P>
 
-  </p></li><li><b> Solaris 2.6, 7, 8, and 9 using Sun 5.5
-       or Forte 9, Centerline C++ 2.x, GNU gcc 2.95 and later.</b><p>
+  <LI><B> Solaris 2.6, 7, 8, and 9 using Sun 5.5
+       or Forte 9, Centerline C++ 2.x, GNU gcc 2.95 and later.</B><P>
 
       All the source code and tests should build and run without any
       problems on Solaris 7, 8, and 9 platforms using the above
@@ -218,36 +242,38 @@ global.features</a> file.
       /usr/ccs/bin/as, if you want -gstabs+ and -pipe support.
 
       Thanks to Susan Liebeskind &lt;shl@janis.gtri.gatech.edu&gt;
-      for providing the following useful information:</p><p>
+      for providing the following useful information:<p>
 
       By default, ACE uses both the Solaris and POSIX thread
       interface.  To disable use of the Solaris thread interface, add
       <code>-D_POSIX_PTHREAD_SEMANTICS</code> to the
       <code>CFLAGS</code> in your
-      <code>$(ACE_ROOT)/include/makeinclude/platform_macros.GNU</code>.
-      See the Solaris Intro (3) man page for more information.</p><p>
+      <code>ACE_wrappers/include/makeinclude/platform_macros.GNU</code>.
+      See the Solaris Intro (3) man page for more information.<p>
 
       To disable ACE thread support completely, build with the
-      <code>threads=0</code> make flag.  See the <a href="#flags">Makefile Flags</a> section below for more
-      information on make flags.</p><p>
+      <code>threads=0</code> make flag.  See the <a
+      href="#flags">Makefile Flags</a> section below for more
+      information on make flags.<p>
 
       If you use g++ on Solaris 7, you might need to rebuild
       it on a SunOS 5.7 (Solaris 7) host.  Some versions of g++ and
       egcs provide replacements for system header files.  The
       replacements on older SunOS systems are not compatible with the
-      SunOS 5.7 system headers.  See <a href="http://www.cs.wustl.edu/%7Elevine/Hints.html">David Levine's
+      SunOS 5.7 system headers.  See <a
+      href="http://www.cs.wustl.edu/~levine/Hints.html">David Levine's
       Hints page</a> for instructions on how to build egcs on a SunOS
       5.7 host, using a g++ or egcs that was built on an older SunOS
-      host. </p><p>
+      host. <P>
 
       The Sun/C++ compilers until and including 5.4 has several
       problems with templates and we don't test very often with them.
       We regularly use and test with Sun/C++ 5.5.</p>
 
-  </li><li><b>AIX</b><p>
+  <LI><B>AIX</B><P>
 
       ACE has been ported to AIX 4.3 and higher using the IBM C/C++
-      Compiler 3.6.6, Visual Age C++ 5 and 6, and g++ 3.2.</p><p>
+      Compiler 3.6.6, Visual Age C++ 5 and 6, and g++ 3.2.<p>
 
       To build ACE on AIX with Visual Age C++ 5 in incremental mode
       (i.e. with the IDE), use the
@@ -257,7 +283,7 @@ global.features</a> file.
       include the general config-aix-4.x.h file which has support for all
       of the OS versions and compilers supported on AIX. Using the general
       config file is the recommended practice for g++, IBM
-      C/C++, and Visual Age C++ batch mode compilers.</p><p>
+      C/C++, and Visual Age C++ batch mode compilers.<p>
 
       Visual Age C++ 4 has also been supported on ACE 5.1, but is no longer
       supported. If you are still using this compiler, please use the
@@ -265,81 +291,85 @@ global.features</a> file.
       config-aix-4.3.x.h ACE config file. Beware, however, that it hasn't
       been tested.
 
-      BTW, here's a technique from Rob Jordan &lt;<a href="mailto:jordan@hursley.ibm.com">jordan@hursley.ibm.com</a>&gt;
+      BTW, here's a technique from Rob Jordan &lt<A
+      HREF="mailto:jordan@hursley.ibm.com">jordan@hursley.ibm.com</A>&gt
       that can reduce the size of the ACE libraries by about one
       third, and can also be applied to applications.  It works by
       optimising the sharing of template functions, which are created
-      in an "unusual" way under AIX. It also speeds up
-      compilation.</p><p>
+      in an &quot;unusual&quot; way under AIX. It also speeds up
+      compilation.<P>
 
-      Here's how to optimise the ACE library generation:</p><p>
+      Here's how to optimise the ACE library generation:<P>
 
-      Look at the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/GNUmakefile.ACE">ace/GNUmakefile.ACE</a>
-      in <code>$ACE_ROOT/ace</code>. Create a file called
-      <code>ACE_All_Src.cpp</code>, and add a line to #include
+      Look at the <A
+      HREF="ace/GNUmakefile.ACE">ace/GNUmakefile.ACE</a>
+      in <CODE>$ACE_ROOT/ace</CODE>. Create a file called
+      <CODE>ACE_All_Src.cpp</CODE>, and add a line to #include
       each of the source files
-      listed under <code>FILES=</code> in the GNUmakefile. Create a
-      file called <code>ACE_All_Tmp.h</code>
+      listed under <CODE>FILES=</CODE> in the GNUmakefile. Create a
+      file called <CODE>ACE_All_Tmp.h</CODE>
       and add a line to #include each of the .h files listed under
-      <code>TEMPLATE_FILES=</code> in the GNUmakefile. Now update the
+      <CODE>TEMPLATE_FILES=</CODE> in the GNUmakefile. Now update the
       GNUmakefile so that
-      <code>FILES=ACE_All_Src</code> and
-      <code>TEMPLATE_FILES=ACE_All_Tmp</code>.</p><p>
+      <CODE>FILES=ACE_All_Src</CODE> and
+      <CODE>TEMPLATE_FILES=ACE_All_Tmp</CODE>.<P>
 
-  </p></li><li><b><a name="Linux">Linux</a></b><p>
+  <LI><B><a name="Linux">Linux</a></B><P>
 
-      ACE has been ported to <a href="http://www.cs.wustl.edu/%7Ecleeland/ace/">Linux</a> on
+      ACE has been ported to <A
+      HREF="http://www.cs.wustl.edu/~cleeland/ace/">Linux</A> on
       Intel, Alpha, and PowerPC platforms.  If you use a RedHat 5.x
       distribution, it's best to use RedHat 5.1 or later.  ACE works
       without any modifications on RedHat 5.1 and later, and on
       Debian 2.1 on both Intel and Alpha.  Use the
       <code>platform_linux.GNU</code> and <code>ace/config-linux.h</code>
-      in your <code>platform_macros.GNU</code> and 
-      <code>config.h</code> files, respectively.  The same
+      in your platform_macros.GNU and config.h files, respectively.  The same
       files can be used on PowerPC, with LinuxPPC
-      1999 (R5), with glibc 2.1.1.</p><p>
+      1999 (R5), with glibc 2.1.1.<p>
 
       If you run out of memory, it's easy to add virtual memory on
       Linux.  Please see the <code>mkswap</code> man page.  You'll
       need at least 256 to 300 Mb of virtual memory (RAM + swap) to
       compile all of ACE+TAO.  The <a href="#resource_requirements">System
       Resource Requirements section</a> has some suggestions on how
-      to reduce the memory requirement.</p><p>
+      to reduce the memory requirement.<p>
 
       The glibc 2.0 dynamic loader isn't thread safe. If you want to
       use the Invocation API you'll have to set
       <code>LD_BIND_NOW=true</code>. If you want to use
       <code>dlopen</code>, you should use <code>RTLD_NOW</code>.  The
-      dynamic loader in glibc 2.1 is thread safe.</p><p>
+      dynamic loader in glibc 2.1 is thread safe.<p>
 
       The ACE <code>Tokens_Test</code> hangs with egcs 1.1b on Linux.
       It runs properly when built with egcs 1.0.2 and later.  All other
-      ACE tests run properly with these egcs 1.0.2 and later.</p><p>
+      ACE tests run properly with these egcs 1.0.2 and later.<p>
 
       <strong>NOTE:</strong> The TAO NameService uses IP multicasting
       by default, though it is not required.  IP multicast on Linux
-      requires the following:</p><p>
+      requires the following:<p>
 
-      </p><ul>
+      <ul>
         <li>Enable IP multicast in the Linux kernel.  It is enabled in
             the default RedHat 5.1 kernel.  In older distributions, you
             can enable it by rebuilding your kernel with CONFIG_IP_MULTICAST
             enabled.<p>
-        </p></li><li>Enable IP multicast in ACE.  It is enabled by default in
+        <li>Enable IP multicast in ACE.  It is enabled by default in
             <code>ace/config-linux-common.h</code>.  If you don't use
             IP multicast, add <code>#define ACE_HAS_IP_MULTICAST 0</code>
             to your <code>ace/config.h</code> before building ACE.<p>
-        </p></li><li>There must be a network interface that is up and supports
+        <li>There must be a network interface that is up and supports
             multicast.  If you have linuxconf, it's easiest to use that
             to add a network route for multicast (224.0.0.0) on one of
             your network interfaces, such as <code>eth0</code>.  If
             you don't have or use linuxconf, try adding a multicast
             routing table entry using something like this:<p>
-            </p><pre>             <code># route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0</code>
+            <pre>
+             <code># route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0</code>
             </pre><p>
-      </p></li></ul>
+      </ul>
 
-      With RedHat 5.0, you'll need some <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/os-patches/linux-patches.html">updates and possibly some
+      With RedHat 5.0, you'll need some <a
+      href="os-patches/linux-patches.html">updates and possibly some
       patches</a> to get ACE working with LinuxThreads.  Some of the
       patches are necessary with Alpha CPUs and with some older
       kernels.  egcs 1.0.1 can also be used, but it may need patches,
@@ -350,56 +380,57 @@ global.features</a> file.
       best to install egcs in a different directory than
       <code>/usr</code>, such as <code>/usr/local</code>, and set your
       <code>PATH</code> and <code>LD_LIBRARY_PATH</code>
-      accordingly.</p><p>
+      accordingly.<p>
 
       Some of the ACE tests fail on older, pre-glibc2 Linux platforms,
       such as RedHat 4.2.  The problems are with threads and
-      thread-specific storage.</p><p>
+      thread-specific storage.<p>
 
-  </p></li><li><b>SCO UNIX</b><p>
+  <LI><B>SCO UNIX</B><P>
 
       ACE has been ported to SCO UNIX using the GNU g++ 2.7.2
-      compiler.  Arturo Montes &lt;<a href="mailto:mitosys@colomsat.net.co">mitosys@colomsat.net.co</a>&gt;
+      compiler.  Arturo Montes &lt<A
+      HREF="mailto:mitosys@colomsat.net.co">mitosys@colomsat.net.co</A>&gt
       maintains this code.  In addition, he also maintains a version
-      of <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/FSU-threads.tar.gz">FSU pthreads</a>.</p><p>
+      of <A HREF="FSU-threads.tar.gz">FSU pthreads</A>.<P>
 
-  </p></li><li><b>SGI IRIX 5.x and 6.x</b><p>
+  <LI><B>SGI IRIX 5.x and 6.x</B><P>
 
       ACE used to build fine using the SGI C++ and GNU GCC compilers
       for IRIX 5.x.  It has been ported to IRIX 6.x using the SGI
       MipsPro 7.1 C++ compiler; be aware that in IRIX 6.2 there is a
       number of patches that have to be installed and exceptions
       appear to fail with the O32 ABI.  Please check the config files
-      for the details.</p><p>
+      for the details.<P>
 
-  </p></li><li><b> HP-UX 10.x and 11.x </b> <p>
+  <LI><B> HP-UX 10.x and 11.x </B> <P>
 
       HP sells 2 C++ compilers for HP-UX 10.x and 11.00:
 
-      </p><ul>
-        <li>HP C++ - this is CC, HP's cfront-based compiler.  As of ACE 4.4, it
+      <UL>
+        <LI>HP C++ - this is CC, HP's cfront-based compiler.  As of ACE 4.4, it
             can be used, but some people have problems with templates.
             Caveat emptor.  It's been said that you should run version 10.24,
             if not later. ACE hasn't been tested with this compiler since
             the ACE 5.0 timeframe.
 
-        </li><li>HP aC++ - this is aCC, HP's new, ANSI compiler.  It handles ACE
+        <LI>HP aC++ - this is aCC, HP's new, ANSI compiler.  It handles ACE
             very well.  You should use version A.01.27 (or higher) on
             HP-UX 10.x and version A.03.37 (or higher) on HP-UX 11.
 
-      </li></ul>
-      <p>
+      </UL>
+      <P>
       On HP-UX 10.20, a patch is required to compile ACE. The exact patch
       number depends on the platform - check with HP's patch database to
       locate the exact patch or its successor. For 9000 700 series machines
-      it is PHKL_8693 (s700 10.20 sys/time.h fix for select(2)/C++ defects).</p><p>
+      it is PHKL_8693 (s700 10.20 sys/time.h fix for select(2)/C++ defects).<p>
 
       Also see further notes on this platform at Riverace's
-      <a href="http://www.riverace.com/FAQ/faq.html">Frequently Asked
-      Questions</a> page.
-      </p><p>
+      <A HREF="http://www.riverace.com/FAQ/faq.html">Frequently Asked
+      Questions</A> page.
+      <P>
 
-  </p></li><li><b>OSF/1 3.2 and 4.0 (a.k.a. Digital UNIX 4.0)</b> <p>
+  <LI><B>OSF/1 3.2 and 4.0 (a.k.a. Digital UNIX 4.0)</B> <P>
 
       The Digital UNIX C++ 5.4 through 5.7 compilers have problems
       with ACE's templates.  They compile the lib and most of the test
@@ -407,14 +438,14 @@ global.features</a> file.
       run, some dump core.  If you use a 5.x version of cxx, be sure
       to set the CXX_VER variable to CXX_5, either on your make
       command line or in an environment variable.  The ACE Makefiles
-      assume by default that the cxx version is 6.x or later.</p><p>
+      assume by default that the cxx version is 6.x or later.<P>
 
       CXX 6.0 and 6.1 are much improved over 5.x: V6.0-020, V6.1-025,
       and later build all of ACE cleanly.  All of the tests in
-      $(ACE_ROOT)/tests run successfully with CXX 6.0 and CXX 6.1.
+      ACE_wrappers/tests run successfully with CXX 6.0 and CXX 6.1.
       Please note that problems have been reported with some versions
       of CXX 6.1, notably versions -021 and earlier.  It's best to use
-      V6.1-022 or later.</p><p>
+      V6.1-022 or later.<p>
 
       NOTE: if you use Digital UNIX 4.0f or later, you <strong>must</strong>
       use <code>ace/config-tru64.h</code> instead of
@@ -423,14 +454,14 @@ global.features</a> file.
       Digital UNIX after and include 4.0.  And, with 4.0f and later when
       using Digital CXX, you <strong>must</strong> use
       <code>include/makeinclude/platform_tru64_cxx.GNU</code> instead of
-      <code>include/makeinclude/platform_osf1_4.0.GNU</code>.</p>
+      <code>include/makeinclude/platform_osf1_4.0.GNU</code>.</P>
 
-  </li><li><b> FreeBSD </b><p>
+  <li><b> FreeBSD </b><p>
 
       FreeBSD is a fast evolving platform.  However, it has the
       advantage of having standard releases.  At this moment, ACE is
       only perodically tested against -stable (3.1R) and we rely a lot
-      on FreeBSD users' feedbacks.  </p><p>
+      on FreeBSD users' feedbacks.  <p>
 
       Notice that on older FreeBSD, <code>ld.so</code> only looks for
       so libraries with <b>version number</b> appended.  ACE makefiles
@@ -439,62 +470,65 @@ global.features</a> file.
       <code>$ACE_ROOT/ace</code> with appropriate ACE version.
       However, this does not work for libACE.so itself so you have to
       create it manually (If you figure out how to do this, please let
-      us know) like this: </p><p>
+      us know) like this: <p>
 
-      <code>ln -sf $ACE_ROOT/ace/libACE.so $ACE_ROOT/ace/libACE.so.4.5</code></p><p>
+      <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><p>
+      On newer FreeBSD (3.0 or later,) this is no longer necessary.<p>
 
-  </p></li><li><b>NetBSD</b><p>
+  <li><b>NetBSD</b><p>
 
       Like older FreeBSD, NetBSD's <code>ld.so</code> also requires
-      versioned .so files.</p><p>
+      versioned .so files.<p>
 
-  </p></li><li><b>OpenBSD</b><p>
+  <li><b>OpenBSD</b><p>
 
-      ACE has been ported to OpenBSD 3.1 and GNU g++ 2.95.3.</p><p>
+      ACE has been ported to OpenBSD 3.1 and GNU g++ 2.95.3.<P>
 
       As with FreeBSD and NetBSD, OpenBSD requires versioned .so
       files.  This is currently handled by the build files and no
-      additional work is needed.</p><p>
+      additional work is needed.<P>
 
       ACE has been ported to OpenBSD with and without pthreads
       enabled.  When using pthreads, though, C++ exceptions must be
       disabled.  This is a known problem with the current release of
       OpenBSD (see www.openbsd.org, bug #1750).  ACE emulated
-      exceptions work fine.</p><p>
+      exceptions work fine.<P>
 
       Compiling TAO may require the user data segment size
       restrictions and possibly other options to be increased.  This
       is done by modifying the default user class in /etc/login.conf
       or by adding a new class and modifying the master passwer file
-      accordingly.</p><p>
+      accordingly.<P>
 
-  </p></li><li><b> UnixWare </b> <p>
+  <LI><B> UnixWare </B> <P>
 
-      Steve Huston &lt;<a href="mailto:shuston@riverace.com">shuston@riverace.com</a>&gt;
-      has ported ACE to work with UnixWare 2.01 and g++.</p><p>
+      Steve Huston &lt<A
+      HREF="mailto:shuston@riverace.com">shuston@riverace.com</A>&gt
+      has ported ACE to work with UnixWare 2.01 and g++.<P>
 
-      Ganesh Pai &lt;<a href="mailto:gpai@voicetek.com">gpai@voicetek.com</a>&gt;
-      subsequently did the port for version 2.1.2, also with g++.</p><p>
+      Ganesh Pai &lt<A
+      HREF="mailto:gpai@voicetek.com">gpai@voicetek.com</A>&gt
+      subsequently did the port for version 2.1.2, also with g++.<P>
 
-      Phil Mesnier &lt;<a href="mailto:mesnier_p@ociweb.com">
-      mesnier_p@ociweb.com</a>&gt; updated the port to support
+      Phil Mesnier &lt<A HREF="mailto:mesnier_p@ociweb.com">
+      mesnier_p@ociweb.com</A>&gt updated the port to support
       UnixWare 7.1.0, with help from Michael Meissnitzer
-      &lt;<a href="mailto:michael.meissnitzer@siemens.at">
-      michael.meissnitzer@siemens.at</a>&gt;, Christian Klepp &lt;
-      <a href="mailto:christian.klepp@siemens.at">christian.klepp@siemens.at
-      </a>&gt; and Engelbert Staller &lt;<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/engelbert.staller@siemens.at">
-      engelbert.staller@siemens.at</a>&gt;
+      &lt<A HREF="mailto:michael.meissnitzer@siemens.at">
+      michael.meissnitzer@siemens.at</A>&gt, Christian Klepp &lt
+      <A HREF="mailto:christian.klepp@siemens.at">christian.klepp@siemens.at
+      </A>&gt and Engelbert Staller &lt<A HREF="engelbert.staller@siemens.at">
+      engelbert.staller@siemens.at</A>&gt
       Building ACE (and TAO) on Unixware 7.1.0 requires a very specific
       g++ build environment.  In particular, you must build and install
       g++ 2.95.2, along with binutils 2.9.1. The order (and the declaration
       of configuration) is extremely important. Using the gcc compiler
       provided on the Skunkware CD on a pentium system, here is the recipe
       I used to build a working environment (as root):<br>
-</p><pre>  mkdir /usr/local/newgnu
-&lt; ftp and untar binutils-2.9.1 &gt;
-&lt; ftp and untar gcc-2.95.2 &gt;
+<pre>
+  mkdir /usr/local/newgnu
+&lt ftp and untar binutils-2.9.1 &gt
+&lt ftp and untar gcc-2.95.2 &gt
   mkdir -p build/binutils build/gcc
   cd build/binutils
   ../../binutils-2.9.1/configure i386-sco-sysv4
@@ -514,107 +548,111 @@ global.features</a> file.
 </pre>
        Once done, ACE and TAO will successfully build and link.<p>
 
-  </p></li><li><b>Chorus</b> <p>
+  <LI><B>Chorus</B> <P>
 
-      Wei Chiang &lt;<a href="mailto:chiang@tele.nokia.fi">chiang@tele.nokia.fi</a>&gt;
-      has ported ACE to Chorus 3.1 using GNU g++ 2.7.2.</p><p>
+      Wei Chiang &lt<A
+      HREF="mailto:chiang@tele.nokia.fi">chiang@tele.nokia.fi</A>&gt
+      has ported ACE to Chorus 3.1 using GNU g++ 2.7.2.<P>
 
-  </p></li><li><b><a name="LynxOS">LynxOS</a></b><p>
+  <LI><B><a name="LynxOS">LynxOS</a></B><P>
 
       ACE builds and runs properly on LynxOS 3.0.x, 3.1.x and 4.0.0 for Intel
       and PowerPC targets. LynxOS 2.5.x is no longer supported.
       To build ACE on LynxOS 3.0.x you need to update GCC to
       version 2.9-gnupro-98r2, which can be obtained from
-      <a href="ftp://ftp.lynuxworks.com/compilers/98r2-preview/">
-      ftp://ftp.lynuxworks.com/compilers/98r2-preview/</a></p><p>
+      <A HREF="ftp://ftp.lynuxworks.com/compilers/98r2-preview/">
+      ftp://ftp.lynuxworks.com/compilers/98r2-preview/</A><p>
 
-      If you run out of memory on LynxOS, these might help:</p><p>
+      If you run out of memory on LynxOS, these might help:<p>
 
-      </p><ul>
+      <ul>
         <li>Increase the limits in <code>/etc/starttab</code>,
           then reboot system.  We use these limits:
-          <pre># Data, stack, and core file limits (in Kbytes)
+          <pre>
+# Data, stack, and core file limits (in Kbytes)
 80000
 16000
 102400</pre><p>
-        </p></li><li>Enable or expand virtual memory, with something like:
-          <pre># mkcontig /swap 320
+        <li>Enable or expand virtual memory, with something like:
+          <pre>
+# mkcontig /swap 320
 # prio 17 vmstart /swap</pre>
           See the <code>mkcontig</code> and <code>vmstart</code>
           man pages, and <code>/bin/rc</code>.<p>
-      </p></li></ul>
+      </ul>
 
       Please see the comments in the
-      <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_lynxos.GNU">ACE
+      <a href="include/makeinclude/platform_lynxos.GNU">ACE
       platform_lynxos.GNU file</a> for information on, and an
       example of, tailoring for your particular platform.<p>
 
       NOTE: if you want to use IP multicast on LynxOS, be sure to add
-      this line to your <code>/net/rc.network</code>, and reboot:</p><p>
-      </p><pre><code>
+      this line to your <code>/net/rc.network</code>, and reboot:<p>
+      <pre><code>
         /bin/route add "224.0.0.0" "$my_name"
       </code></pre>
 
-  </li><li><strong>VxWorks</strong><p>
+  <LI><STRONG>VxWorks</STRONG><P>
 
-      <a href="http://www.cs.wustl.edu/%7Elevine/">David Levine</a>
-      &lt;<a href="mailto:levine@cs.wustl.edu">levine@cs.wustl.edu</a>&gt; has
+      <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/5.4 with the GreenHills
       1.8.8/1.8.9 and g++ compilers that are distributed with
       VxWorks/Tornado.  An anonymous contributor has also
-      provided <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/os-patches/vxworks-5.1.txt">notes for using
+      provided <a href="os-patches/vxworks-5.1.txt">notes for using
       ACE with VxWorks 5.1.</a>. It is not possible to use VxWorks 5.4
       and earlier with ACE anymore because the compilers delivered with
-      5.4 and earlier don't support the C++ features ACE needs.</p><p>
+      5.4 and earlier don't support the C++ features ACE needs.<P>
 
       Tornado 2.2/VxWorks 5.5 support IP multicast.  That is not enabled
       by default in ACE for VxWorks, because it probably depends on
       kernel configuration.  To enable it, add
       <code>#define ACE_HAS_IP_MULTICAST</code> to your
-      <code>ace/config.h</code>.</p><p>
+      <code>ace/config.h</code>.<p>
 
       In addition to all of the other benefits of ACE, it helps work
       around some deficiencies with VxWorks 5.3/5.3.1.  Some of these
       apply only with g++, at least thru version 2.7.2.  That is the
       version that is shipped with Tornado 1.0.1/ VxWorks 5.3.1.  The
-      problems are:</p><p>
+      problems are:<P>
 
-      </p><ol>
-        <li>The program entry point cannot be called "main" with g++.  ACE
-            renames it to "ace_main" (configurable via ACE_MAIN) on VxWorks.
+      <OL>
+        <LI>The program entry point cannot be called &quot;main&quot; with g++.  ACE
+            renames it to &quot;ace_main&quot; (configurable via ACE_MAIN) on VxWorks.
             While this may seem trivial, it is important with legacy code.
-            ACE itself ran into this problem.<p>
+            ACE itself ran into this problem.<P>
 
-        </p></li><li>argc/argv isn't used with VxWorks entry points.  ACE provides
+        <LI>argc/argv isn't used with VxWorks entry points.  ACE provides
             a wrapper function that transparently converts shell command
-            line arguments to argc/argv form.  See <a href="#spa">below</a>
-            for details.<p>
+            line arguments to argc/argv form.  See <A HREF="#spa">below</a>
+            for details.<P>
 
-        </p></li><li>Unsigned long long support is not available with the g++ that
+        <LI>Unsigned long long support is not available with the g++ that
             is distributed with Tornado 1.0.1/VxWorks 5.3.1, or with
             GreenHills 1.8.8.  The documentation says that it is supported
             by g++, but try using it :-)   Wind River technical support verified
             that it doesn't work.  ACE provides its own 64-bit unsigned integer
             type, ACE_hrtime_t, so you don't even have to worry about this
-            problem if you use it.<p>
+            problem if you use it.<P>
 
-        </p></li><li>There a gory problem with munch that is severely aggravated
+        <LI>There a gory problem with munch that is severely aggravated
             by the presence of a static in the Wind River/g++ iostream.h.
             ACE hides this and provides an easy-to-use workaround in the
             very unlikely situation where it becomes a problem.
-            Please see ace/config-vxworks5.x.h for more information.<p>
-      </p></li></ol>
+            Please see ace/config-vxworks5.x.h for more information.<P>
+      </OL>
 
-      In addition, as noted <a href="#g++">below</a> following the
+      In addition, as noted <A HREF="#g++">below</A> following the
       discussion of the g++ -fno-implicit-templates option,
       -fno-implicit-templates is broken for x86 targets.  And, -O2
-      is not supported on some targets.<p>
+      is not supported on some targets.<P>
 
       Please note that ACE uses one of the spare fields in the Wind
       River task control block, spare4, for thread- specific storage.
       This field is specified in only one place, in ace/OS.i, so it
       can easily be changed to one of the other spare fields, if
-      necessary.</p><p>
+      necessary.<P>
 
       Versions of ACE from 4.3.3 and beyond destroy dynamically
       allocated singletons in the ACE library.  But, they may not
@@ -622,14 +660,15 @@ global.features</a> file.
       running a program multiple times, it may be necessary to unload
       the module, using unld, and reload it between runs.
       Alternatively, you could try calling <code>cplusDtors</code> and
-      then <code>cplusCtors</code> between runs.</p><p>
+      then <code>cplusCtors</code> between runs.<P>
 
-  </p></li><li><b>MVS OpenEdition</b> <p>
+  <LI><B>MVS OpenEdition</B> <P>
 
-      All of ACE has been ported to OpenEdition by Chuck Gehr &lt;<a href="mailto:gehr@sweng.stortek.com">gehr@sweng.stortek.com</a>&amp;gt.
+      All of ACE has been ported to OpenEdition by Chuck Gehr &lt<A
+      HREF="mailto:gehr@sweng.stortek.com">gehr@sweng.stortek.com</A>&gt.
       The ACE library, all the tests and most of the examples and apps
       build clean.  There are still some problems that need to be
-      ironed out:</p><p>
+      ironed out:<P>
 
       MVS does not support the dynamic linking dl...() calls that the
       Service Configurator uses to dynamically link services at run
@@ -640,46 +679,53 @@ global.features</a> file.
       flex and yacc on a ascii (not ebcdic) machine and as a result
       they don't work very well with ebcdic svc.conf files.  We should
       be able to regenerate these files on MVS but MVS doesn't have
-      flex.  This is something that needs to be done.</p><p>
+      flex.  This is something that needs to be done.<P>
 
       Some of the tests do not execute properly.  This is a minority
-      and over time the goal is to get to 100%.</p><p>
+      and over time the goal is to get to 100%.<P>
 
       The make scheme for some of the apps still doesn't work
       perfectly on MVS.  This is mainly due to the way shared
-      libraries are handled on MVS.  See <a href="#mvs">additional
-      build tips for MVS</a> for more on this.</p><p>
+      libraries are handled on MVS.  See <A HREF="#mvs">additional
+      build tips for MVS</A> for more on this.<P>
 
-  </p></li><li><strong>QNX Neutrino</strong><p>
+  <li><strong>QNX Neutrino</strong><p>
 
-      ACE has been ported to <a href="http://www.qnx.com/products/os/neutrino.html">QNX Neutrino
+      ACE has been ported to <a
+      href="http://www.qnx.com/products/os/neutrino.html">QNX Neutrino
       2.0</a>.  We cross-compile for Neutrino on a QNX4 host using g++
-      2.8.1, using the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/config-qnx-neutrino.h">ace/config-qnx-neutrino.h</a>
-      and <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_qnx_neutrino.GNU">include/makeinclude/platform_qnx_neutrino.GNU</a>
+      2.8.1, using the <a
+      href="ace/config-qnx-neutrino.h">ace/config-qnx-neutrino.h</a>
+      and <a
+      href="include/makeinclude/platform_qnx_neutrino.GNU">include/makeinclude/platform_qnx_neutrino.GNU</a>
       configuration files.  Many of the ACE tests succeed, though some
       fail.  As the porting effort progresses, we hope to eliminate
       these failures.  If you know of fixes, please send them to
-      us.</p><p>
-      </p></li><li><strong>QNX RTP</strong><p>
+      us.<p>
+      <li><strong>QNX RTP</strong><p>
 
-      ACE has been ported to <a href="http://get.qnx.com/">QNX RTP
+      ACE has been ported to <a
+      href="http://get.qnx.com/">QNX RTP
       </a>. We compile for QNX RTP using the GCC compiler shipped with the
-      distribution, using the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/config-qnx-rtp.h">ace/config-qnx-rtp.h</a>
-      and <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_qnx_rtp_gcc.GNU">include/makeinclude/platform_qnx_rtp_gcc.GNU</a>
+      distribution, using the <a
+      href="ace/config-qnx-rtp.h" >ace/config-qnx-rtp.h</a>
+      and <a
+      href="include/makeinclude/platform_qnx_rtp_gcc.GNU">include/makeinclude/platform_qnx_rtp_gcc.GNU</a>
       configuration files.
       Many of the ACE tests succeed, though some
       fail.  As the porting effort progresses, we hope to eliminate
       these failures.  If you know of fixes, please send them to
-      us.</p><p>
+      us.<p>
       <strong><blink><font color="#ff0000">WARNING:</font></blink></strong>
       Under the current version of QNX RTP ACE fails if compiled with
-      inline=0 . </p><p>
+      inline=0 . <p>
 
-  </p></li><li><strong>PharLap TNT Embedded ToolSuite (ETS)</strong><p>
+  <li><strong>PharLap TNT Embedded ToolSuite (ETS)</strong><p>
 
-      ACE has been ported to <a href="http://www.pharlap.com/">PharLap's</a> TNT Embedded
+      ACE has been ported to <a
+      href="http://www.pharlap.com">PharLap's</a> TNT Embedded
       ToolSuite (ETS) version 9.1. The port is being tested with
-      Microsoft Visual C++ 6.</p><p> To build for PharLap, use the
+      Microsoft Visual C++ 6.<p> To build for PharLap, use the
       ace/config-pharlap.h configuration file, and the instructions
       for building on Windows. Building the ACE library is the same as
       for regular Windows platforms, except you choose one of the PharLap
@@ -689,11 +735,11 @@ global.features</a> file.
       binaries, see the tests directory. The tests_pharlap_msvc.lnk
       file is a LinkLoc commands file that the ACE tests are built
       with. It is likely that local sites may need to adjust this file
-      for their target environment.</p><p>
+      for their target environment.<P>
 
-</p></li><li><strong>Mac OS X (10.2.x)</strong><p>
+<li><strong>Mac OS X (10.2.x)</strong><p>
 
-        </p><p>ACE builds and runs on Mac OS X 10.2.x, but the following are
+        <p>ACE builds and runs on Mac OS X 10.2.x, but the following are
         needed to build it:</p>
 
         <p>1. The latest version of the Apple Developer Tools
@@ -717,27 +763,29 @@ global.features</a> file.
 
         <p>The work to port ACE to Mac OS X was done by several people,
         John Zorko
-        &lt;<a href="mailto:j.zorko@att.net">j.zorko@att.net</a>&gt; is
+        &lt;<A href="mailto:j.zorko@att.net">j.zorko@att.net</A>&gt; is
         only one of them.</p>
 
-</li></ul>
+</UL>
 
 
-<hr>
-<h4><a name="g++">Compiling ACE with GNU g++</a></h4>
+<HR>
+<H4><A NAME="g++">Compiling ACE with GNU g++</A></H4>
 
 If you use the GNU GCC g++ compiler please note the following:
 
-<ul>
+<UL>
   <li>If you have problems building shared libraries with egcs 1.1 or 1.1.1
       on SunOS 2.5 or 2.5.1 that look like this:
-      <pre>        /usr/ccs/lib/libgen.a(reg_compile.o): In function `_get_vars_storage':
+      <pre>
+        /usr/ccs/lib/libgen.a(reg_compile.o): In function `_get_vars_storage':
         reg_compile.o(.text+0x30): relocation truncated to fit: R_SPARC_GOT13 free
       </pre>
       the suggested workaround is to comment out the <code>ACE_HAS_REGEX</code>
       <code>#define</code> in <code>ace/config-sunos5.5.h</code>.
       Or better, create an <code>ace/config.h</code> that looks like:
-      <pre>      #ifndef ACE_CONFIG_H
+      <pre>
+      #ifndef ACE_CONFIG_H
       // ACE_CONFIG_H is defined by the following #included header.
 
       #include "ace/config-sunos5.5.h"
@@ -749,14 +797,14 @@ If you use the GNU GCC g++ compiler please note the following:
       We don't know what causes the link problem, though the
       workaround solves it.<p>
 
-  </p></li><li>ACE/TAO don't seem to build well with g++ 2.8.*.  We routinely
+  <li>ACE/TAO don't seem to build well with g++ 2.8.*.  We routinely
       use g++ 2.95.x and g++ 3.x, and recommend those versions or better.<p>
 
-  </p></li><li>Earlier (prior to 2.95.2) versions of g++ may not compile
+  <LI>Earlier (prior to 2.95.2) versions of g++ may not compile
       certain parts of ACE correctly due to compiler bugs.  Please
-      upgrade to g++ 2.95.2 or greater.<p>
+      upgrade to g++ 2.95.2 or greater.<P>
 
-  </p></li><li>Make sure to update your gcc <code>config.status</code>
+  <LI>Make sure to update your gcc <code>config.status</code>
       file.  This file is produced when installing gcc; it specifies
       where to install the binary files that gcc uses.  For example,
       it specifies whether to use Solaris's <code>/usr/ccs/bin</code>
@@ -764,52 +812,52 @@ If you use the GNU GCC g++ compiler please note the following:
       <code>config.status</code> file is an output of the gcc
       <code>configure</code> script; it is preferable to use the
       <code>--prefix</code> option to <code>configure</code> instead
-      of hacking its output.<p>
+      of hacking its output.<P>
 
-  </p></li><li>If you are getting weird link errors when building libACE
+  <LI>If you are getting weird link errors when building libACE
       on Solaris you are probably using the GNU linker.  Try using the
       Sun linker (/usr/ccs/bin/ld) instead.  Note that gcc first looks
       for the GNU linker if it is installed along with gcc.  The only
       way to not use the GNU linker is to delete it from the
       installation or to build your own compiler with no linker.  Be
-      aware that you still need the libraries and includes of gcc.<p>
+      aware that you still need the libraries and includes of gcc.<P>
 
       NOTE: if you do use the GNU linker, you might need to change
       the <code>-G</code> flag to <code>-shared</code> in
       the <code>SOFLAGS</code> definition in your
-      <code>include/makeinclude/platform_macros.GNU</code>.</p><p>
+      <code>include/makeinclude/platform_macros.GNU</code>.<p>
 
-  </p></li><li>Don't get too confused about contradictory statements in
+  <LI>Don't get too confused about contradictory statements in
       the gcc documentation. It was written by different
-      people...<p>
+      people...<P>
 
-  </p></li><li>Make sure that the linker invoked by gcc produces code
+  <LI>Make sure that the linker invoked by gcc produces code
       that initializes static objects.  Please see gcc's
-      documentation for using <code>collect2</code>.<p>
+      documentation for using <CODE>collect2</CODE>.<P>
 
-  </p></li><li>On VxWorks only, g++ (thru version 2.9.6, distributed
+  <LI>On VxWorks only, g++ (thru version 2.9.6, distributed
       with Tornado 2.2/VxWorks 5.5), for x86 targets,
       -fno-implicit-templates is broken.  In addition, -O2
-      is not supported on some targets.<p>
-</p></li></ul>
+      is not supported on some targets.<P>
+</UL>
 
 
-<p></p><hr>
-<h4><a name="egcs">Compiling ACE with egcs</a></h4>
+<P><HR>
+<H4><A NAME="egcs">Compiling ACE with egcs</A></H4>
 <ul>
   <li>ACE transparently supports egcs, for the most part.  Please see
       <a href="#g++">Compiling ACE with g++</a> in this document.  And,
       please use the appropriate g++ config and platform files for the OS on
       which you will use egcs.<p>
 
-  </p></li><li><strong><blink><font color="#ff0000">WARNING:</font></blink></strong>
+  <li><strong><blink><font color="#ff0000">WARNING:</font></blink></strong>
       The default behavior of the ACE Makefiles is to enable native
       exception support.  To disable exception handling, add
       <code>exceptions=0</code> to your <code>make</code> command line
       invocation, or to your
       <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code> file.<p>
 
-  </p></li><li>egcs may have trouble linking some executables, such as the ACE
+  <li>egcs may have trouble linking some executables, such as the ACE
       IOStream_Test, if its static libraries are used.  Though
       <a href="mailto:trose@bridgewatersys.com">Tim Rose</a> reports
       that egcs 1.1.1 static libraries work just fine on Solaris 2.6
@@ -821,21 +869,21 @@ If you use the GNU GCC g++ compiler please note the following:
       <code>--enable-shared</code> option is <strong>not</strong> an
       egcs run-time option.  Build egcs in a way similar to the
       following example:
-      </p><pre><code>
+      <pre><code>
          $ ./configure --enable-shared
          $ make bootstrap
       </code></pre>
       Be sure to set your <code>LD_LIBRARY_PATH</code> environment
       variable, if necessary, to pick up those shared libraries.<p>
 
-  </p></li><li>On DEC Alpha, egcs through version 1.03a, at least, may fail
+  <li>On DEC Alpha, egcs through version 1.03a, at least, may fail
       to build ACE if debugging (-g) is enabled.  The fix is to
       edit the egcs gcc/mips-file.c file, at line 976, and change
       <code>PAGE_SIZE</code> to 8192.  Then rebuild ACE.  Thanks to
       <a href="mailto:gpai@voicetek.com">Ganesh Pai</a> for this
       information.<p>
 
-   </p></li><li>Sun OS 5.6 using egcs1.1.2/egcs 2.95 with
+   <li>Sun OS 5.6 using egcs1.1.2/egcs 2.95 with
        ld:Software Generation Utilities - Solaris/ELF (3.0)
        as: WorkShop Compilers 4.X dev 18 Sep 1996<p>
 
@@ -843,7 +891,8 @@ If you use the GNU GCC g++ compiler please note the following:
 
       Example:
 
-      </p><pre>      -I/opt/ace/SunOS-1.0 -DACE_HAS_EXCEPTIONS  -o Cached_Accept_Conn_Test
+      <pre>
+      -I/opt/ace/SunOS-1.0 -DACE_HAS_EXCEPTIONS  -o Cached_Accept_Conn_Test
       .obj/Cached_Accept_Conn_Test.o  -L/opt/ace/SunOS-1.0/ace -L./  -lACE
       -lsocket -ldl -lgen -lnsl -lposix4 -lthread
       ld: warning: relocation error: R_SPARC_32: file
@@ -854,36 +903,36 @@ If you use the GNU GCC g++ compiler please note the following:
       Client_Svc_HandlerZUiZt8ACE_Hash1Zt30...</pre>
 
       external symbolic relocation against non-allocatable section .stab;
-      cannot be processed at runtime: relocation ignored<p>
+      cannot be processed at runtime: relocation ignored<P>
 
-      Solution:</p><p>
+      Solution:<P>
 
       Install the "binutils" package from GNU (www.gnu.org); specifically,
-      "as" and "ld".</p><p>
+      "as" and "ld".<P>
 
-      Conclusion:</p><p>
+      Conclusion:<P>
 
-      Perfect build stats:</p><p>
+      Perfect build stats:<P>
 
       OS:
-      Kernel version: SunOS 5.6 Generic 105181-03 December 1999.</p><p>
+      Kernel version: SunOS 5.6 Generic 105181-03 December 1999.<P>
 
       compiler:
-      gcc version egcs-2.91.66 19990314 (egcs-1.1.2 release)</p><p>
+      gcc version egcs-2.91.66 19990314 (egcs-1.1.2 release)<P>
 
       loader:
       GNU ld version 2.9.1 (with BFD 2.9.1)
       Supported emulations:
-       elf32_sparc</p><p>
+       elf32_sparc<P>
 
       assembler:
       GNU assembler version 2.9.1 (sparc-sun-solaris2.6), using
-      BFD version 2.9.1</p><p>
+      BFD version 2.9.1<P>
 
       Thanks to <a href="mailto:johng@keck.hawii.edu">John Gathright</a> for providing this
-      information.</p><p>
+      information.<P>
 
-   </p></li><li>Compiling using the <code>-fsquangle</code> option helps to shorten long
+   <li>Compiling using the <code>-fsquangle</code> option helps to shorten long
        symbol names and is a boon to linkers and assemblers which cant
        grok long names.
 
@@ -892,62 +941,62 @@ If you use the GNU GCC g++ compiler please note the following:
        option with egcs.<p>
 
        Heres a note on how to go about this (contributed by Skye
-       Sweeney):</p><p>
+       Sweeney):<p>
 
-       1) -fsquangle  the name is a combination of squash and mangle!</p><p>
+       1) -fsquangle  the name is a combination of squash and mangle!<p>
 
-       2) -fsquangle  compresses the mangled names.</p><p>
+       2) -fsquangle  compresses the mangled names.<p>
 
        3) All libraries must be compiles with the option. You cannot simply
        compile modules that have large names with it. This includes system
-       libraries and vendor libraries like RogueWave.</p><p>
+       libraries and vendor libraries like RogueWave.<p>
 
        4) The "simple" solution is not to add the option to each makefile,
        but rather recompile the compiler to have the option on by default.
        This is done by editing the file `gcc/cp/decl2.c', setting
        `flag_do_squangling = 1', then rebuilding the compiler and
-       libraries.</p><p>
+       libraries.<p>
 
        5) After many false starts and linking snafus, I can recompile my
-       ACE/TAO/RogueWave/Lex/Yacc 100 Meg application.</p><p>
+       ACE/TAO/RogueWave/Lex/Yacc 100 Meg application.<p>
 
-</p></li></ul>
+</ul>
 
 
-<p></p><hr>
-<h3><a name="aceinstall">Building and Installing ACE</a></h3>
+<P><HR>
+<H3><A NAME="aceinstall">Building and Installing ACE</A></H3>
 
-The following explains how to build ACE on <a href="#unix">UNIX</a>
-and <a href="#win32">Windows</a>.
+The following explains how to build ACE on <A HREF="#unix">UNIX</A>
+and <A HREF="#win32">Windows</A>.
 
 <h4>General Rules</h4>
-<ul>
+<UL>
   <li><p>Many features in ACE can be modified by defining some macros in
       <code>$ACE_ROOT/ace/config.h</code>.  These macros should
       <em><b>always</b></em> appear <em><b>before</b></em> including
       your platform specific config file.</p>
-  </li><li><p>However, if you want to undefine/redefine macros defined in the
+  <li><p>However, if you want to undefine/redefine macros defined in the
       platform specific config file, these <code>#undef</code> should
       come <em><b>after</b></em> the config file.</p>
-  </li><li> If you're planning to build ACE on multiple platforms, you may
-      want to consider <a href="#cloning">cloning the source tree</a>
-      before you start. <p>
-</p></li></ul>
+  <LI> If you're planning to build ACE on multiple platforms, you may
+      want to consider <A HREF="#cloning">cloning the source tree</A>
+      before you start. <P>
+</UL>
 
-<hr align="left" width="50%">
-<h4><a name="unix">Building and Installing ACE on UNIX</a></h4>
+<hr align=left width="50%">
+<H4><A NAME="unix">Building and Installing ACE on UNIX</A></H4>
 
 As of ACE 5.4, you can choose between two methods of building ACE on
 UNIX:
-<ol>
-  <li><a href="#unix_autoconf">GNU Autoconf</a></li>
-  <li><a href="#unix_traditional">Traditional ACE/GNU Make Configuration</a></li>
-</ol>
-The <a href="#win32">build process</a> for Windows is different from both of
+<OL>
+  <LI><A HREF="#unix_autoconf">GNU Autoconf</A></LI>
+  <LI><A HREF="#unix_traditional">Traditional ACE/GNU Make Configuration</A></LI>
+</OL>
+The <A HREF="#win32">build process</A> for Windows is different from both of
 the UNIX methods.
 
-<h5><a name="unix_autoconf">Building ACE with GNU Autoconf</a></h5>
-<p>
+<H5><A NAME="unix_autoconf">Building ACE with GNU Autoconf</A></H5>
+<P>
 GNU Autoconf support is available in the ACE only distribution in the
 DOC group website. More, precisely support for Autoconf will be
 missing in distributions that have TAO and CIAO bundled along.
@@ -960,138 +1009,140 @@ your applications. The traditional configuration method is still more
 reliable. Any help you can
 lend to improve the ACE build process using GNU Autoconf would be very much
 appreciated. Please send any fixes to the
-<a href="mailto:ace-users@cs.wustl.edu">ACE users</a> mailing list.</p>
-<p>
+<A HREF="mailto:ace-users@cs.wustl.edu">ACE users</A> mailing list.</P>
+<P>
 The ACE only kit has been bootstrapped so you do not need to install
 the GNU Autotools (autoconf, automake, libtool) unless you want to
 participate in testing and developing this process further. To simply
 configure and build ACE, do:
-</p><ol>
-  <li><code>cd</code> to the top-level <code>ACE_wrappers</code> directory.</li>
-  <li>Create a subdirectory to hold your build's configuration and built
+<OL>
+  <LI><CODE>cd</CODE> to the top-level <CODE>ACE_wrappers</CODE> directory.</LI>
+  <LI>Create a subdirectory to hold your build's configuration and built
       ACE version, and then change to the new directory:
-       <pre>       mkdir build
+       <pre>
+       mkdir build
        cd build
        </pre>
       Note that you do not run the <code>create_ace_build</code> utility
-      mentioned in the <a href="#cloning">Cloning the Source Tree</a>
+      mentioned in the <A HREF="#cloning">Cloning the Source Tree</A>
       section. The configure script takes care of creating all files
-      and links that are needed.</li>
-  <li>Configure ACE for your platform by issuing the following command:
-       <pre>       ../configure [options]
+      and links that are needed.</LI>
+  <LI>Configure ACE for your platform by issuing the following command:
+       <pre>
+       ../configure [options]
        </pre>
       <code>options</code> can be a variable setting (such as setting
       <code>CXX</code> to your C++ compiler command) any standard GNU
       configure options, or any of the following ACE configure options
       (default values are in parentheses):
-      <ul>
-        <li><code>--enable-alloca</code> (no): Enable <code>alloca()</code>
-          support.</li>
-        <li><code>--enable-debug</code> (yes): Build ACE with debugging
-          support.</li>
-        <li><code>--enable-exceptions</code> (yes): Build ACE with C++
-          exception support compiled in.</li>
-        <li><code>--enable-fast</code> (no): Use the Sun C++ <code>-fast</code>
-          option to build. Only used on Solaris.</li>
-        <li><code>--enable-ipv4-ipv6</code> (no): Enable IPv4/IPv6 migration support.</li>
-        <li><code>--enable-ipv6</code> (no): Enable IPv6 support.</li>
-        <li><code>--enable-inline</code> (yes): Enable inline functions.</li>
-        <li><code>--enable-optimize</code> (yes): Enable building optimized.</li>
-        <li><code>--enable-prof</code> (no): Enable profiling support.</li>
-        <li><code>--enable-purify</code> (no): Build with support for
-          IBM Rational Purify.</li>
-        <li><code>--enable-quantify</code> (no): Build with support for
-          IBM Rational Quantify.</li>
-        <li><code>--enable-repo</code> (no): Enable the GNU g++
-          <code>-frepo</code> option. Only useful for pre-3.0 g++ and egcs.</li>
-        <li><code>--enable-rtti</code> (yes): Compile with C++ run-time type
-          information RTTI support.</li>
-        <li><code>--enable-stdcpplib</code> (yes): Build with support for the
-          standard C++ library, as opposed to the older iostreams library.</li>
-        <li><code>--enable-log-msg-prop</code> (yes): Enable
+      <UL>
+        <LI><code>--enable-alloca</code> (no): Enable <code>alloca()</code>
+          support.</LI>
+        <LI><code>--enable-debug</code> (yes): Build ACE with debugging
+          support.</LI>
+        <LI><code>--enable-exceptions</code> (yes): Build ACE with C++
+          exception support compiled in.</LI>
+        <LI><code>--enable-fast</code> (no): Use the Sun C++ <code>-fast</code>
+          option to build. Only used on Solaris.</LI>
+        <LI><code>--enable-ipv4-ipv6</code> (no): Enable IPv4/IPv6 migration support.</LI>
+        <LI><code>--enable-ipv6</code> (no): Enable IPv6 support.</LI>
+        <LI><code>--enable-inline</code> (yes): Enable inline functions.</LI>
+        <LI><code>--enable-optimize</code> (yes): Enable building optimized.</LI>
+        <LI><code>--enable-prof</code> (no): Enable profiling support.</LI>
+        <LI><code>--enable-purify</code> (no): Build with support for
+          IBM Rational Purify.</LI>
+        <LI><code>--enable-quantify</code> (no): Build with support for
+          IBM Rational Quantify.</LI>
+        <LI><code>--enable-repo</code> (no): Enable the GNU g++
+          <code>-frepo</code> option. Only useful for pre-3.0 g++ and egcs.</LI>
+        <LI><code>--enable-rtti</code> (yes): Compile with C++ run-time type
+          information RTTI support.</LI>
+        <LI><code>--enable-stdcpplib</code> (yes): Build with support for the
+          standard C++ library, as opposed to the older iostreams library.</LI>
+        <LI><code>--enable-log-msg-prop</code> (yes): Enable
           <code>ACE_Log_Msg</code> property propagation to ACE-created
-          threads.</li>
-        <li><code>--enable-logging</code> (yes): Enable the ACE logging
-          macros.</li>
-        <li><code>--enable-malloc-stats</code> (no): Compile in additional code
-          for collecting memory allocation statistics.</li>
-        <li><code>--enable-pi-pointers</code> (yes): Enable
-          position-independent pointers for shared memory classes.</li>
-        <li><code>--enable-probe</code> (no): Enable the
-          <code>ACE_Timeprobe</code> class.</li>
-        <li><code>--enable-reentrant</code> (yes): Enable use of platform's
-          reentrant functions.</li>
-        <li><code>--enable-static-obj-mgr</code> (yes): Enable use of a
-          static <code>ACE_Object_Manager</code>.</li>
-        <li><code>--enable-threads</code> (yes): Enable threading support.</li>
-        <li><code>--enable-verb-not-sup</code> (no): Enable verbose ENOTSUP
-          reports at run time.</li>
-        <li><code>--enable-trace</code> (no): Enable ACE execution tracing
-          support.</li>
-        <li><code>--enable-xt-reactor</code> (no): Enable support for the
-          <code>ACE_XtReactor</code> class.</li>
-        <li><code>--enable-fl-reactor</code> (no): Enable support for the
-          <code>ACE_FlReactor</code> class.</li>
-        <li><code>--with-gperf</code> (yes): Build the implementation of
-          gperf that comes with ACE.</li>
-        <li><code>--with-rmcast</code> (yes): Include the ACE_RMCast library
-          when building ACE.</li>
-        <li><code>--with-qos</code> (no): Include the ACE_QoS library when
-          building ACE.</li>
-        <li><code>--with-ssl</code> (yes): Include the ACE_SSL library when
+          threads.</LI>
+        <LI><code>--enable-logging</code> (yes): Enable the ACE logging
+          macros.</LI>
+        <LI><code>--enable-malloc-stats</code> (no): Compile in additional code
+          for collecting memory allocation statistics.</LI>
+        <LI><code>--enable-pi-pointers</code> (yes): Enable
+          position-independent pointers for shared memory classes.</LI>
+        <LI><code>--enable-probe</code> (no): Enable the
+          <code>ACE_Timeprobe</code> class.</LI>
+        <LI><code>--enable-reentrant</code> (yes): Enable use of platform's
+          reentrant functions.</LI>
+        <LI><code>--enable-static-obj-mgr</code> (yes): Enable use of a
+          static <code>ACE_Object_Manager</code>.</LI>
+        <LI><code>--enable-threads</code> (yes): Enable threading support.</LI>
+        <LI><code>--enable-verb-not-sup</code> (no): Enable verbose ENOTSUP
+          reports at run time.</LI>
+        <LI><code>--enable-trace</code> (no): Enable ACE execution tracing
+          support.</LI>
+        <LI><code>--enable-xt-reactor</code> (no): Enable support for the
+          <code>ACE_XtReactor</code> class.</LI>
+        <LI><code>--enable-fl-reactor</code> (no): Enable support for the
+          <code>ACE_FlReactor</code> class.</LI>
+        <LI><code>--with-gperf</code> (yes): Build the implementation of
+          gperf that comes with ACE.</LI>
+        <LI><code>--with-rmcast</code> (yes): Include the ACE_RMCast library
+          when building ACE.</LI>
+        <LI><code>--with-qos</code> (no): Include the ACE_QoS library when
+          building ACE.</LI>
+        <LI><code>--with-ssl</code> (yes): Include the ACE_SSL library when
           building ACE. Requires the SSL components to be available using the
-          compiler's and linker's default search directories.</li>
-        <li><code>--with-tli-device</code> (/dev/tcp): Specifies the device
-          name for opening a TLI device at run time.</li>
-      </ul>
-  </li>
-  <li>Build ACE by typing <code>make</code>.
-  </li><li>(Optional) Install ACE by typing <code>make install</code>.
-</li></ol>
-
-<h5><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></h5>
-<p>
+          compiler's and linker's default search directories.</LI>
+        <LI><code>--with-tli-device</code> (/dev/tcp): Specifies the device
+          name for opening a TLI device at run time.</LI>
+      </UL>
+  </LI>
+  <LI>Build ACE by typing <code>make</code>.
+  <LI>(Optional) Install ACE by typing <code>make install</code>.
+</OL>
+
+<H5><A NAME="unix_traditional">Using the Traditional ACE/GNU Configuration</A></H5>
+<P>
 Here's what you need to do to build ACE using GNU Make and ACE's traditional
-per-platform configuration method:</p>
+per-platform configuration method:</P>
 
-<ol>
-  <li>Install <a href="http://ftp.gnu.org/pub/gnu/make/">GNU make</a>
+<OL>
+  <LI>Install <A HREF="http://ftp.gnu.org/pub/gnu/make/">GNU make</A>
   3.79.1 or greater on your system (available via <code>http</code>
       anonymous <code>ftp</code> from <code>ftp.gnu.org</code> in the
       <code>pub/gnu/make/</code> directory).
-      You <em>must</em> use GNU make when using ACE's traditional
-        per-platform configuration method or ACE won't compile.<p>
+      You <EM>must</EM> use GNU make when using ACE's traditional
+        per-platform configuration method or ACE won't compile.<P>
 
-  </p></li><li>Add an environment variable called ACE_ROOT that contains the
+  <LI>Add an environment variable called ACE_ROOT that contains the
       name of the root of the directory where you keep the ACE wrapper
       source tree.  The ACE recursive Makefile scheme needs this information.
       There are several ways to set the ACE_ROOT variable.  For
-      instance, in my .login file for TSCH/CSH I have the following entry:<p>
+      instance, in my .login file for TSCH/CSH I have the following entry:<P>
 
-      </p><pre><code>
+      <pre><code>
       setenv ACE_ROOT /home/cs/faculty/schmidt/ACE_wrappers
-      </code></pre><p>
+      </code></pre><P>
 
       BTW, if you're running BASH or Bourne Shell you'll need to do the following:
 
-      </p><pre><code>
+      <pre><code>
       ACE_ROOT=/home/cs/faculty/schmidt/ACE_wrappers; export ACE_ROOT
-      </code></pre><p>
+      </code></pre><P>
 
       If you're building a number of versions of ACE, however, (e.g., for
       different OS platforms or for different releases of ACE) you might use
       the following approach (again assuming TCSH/CSH):
 
-      </p><pre><code>
+      <pre><code>
       setenv ACE_ROOT $cwd
       </code></pre>
 
-  </li><li>Create a configuration file, <code>$ACE_ROOT/ace/config.h</code>,
+  <LI>Create a configuration file, <code>$ACE_ROOT/ace/config.h</code>,
       that includes the appropriate platform/compiler-specific
       header configurations from the ACE source directory. For example:
-<blockquote><code>
+<BLOCKQUOTE><CODE>
 #include "ace/config-sunos5-sunc++-4.x.h"
-</code></blockquote>
+</CODE></BLOCKQUOTE>
       The platform/compiler-specific configuration file
       contains the #defines that are used throughout ACE to indicate
       which features your system supports. See the
@@ -1099,170 +1150,173 @@ per-platform configuration method:</p>
       macro settings. If you desire to add some site-specific or build-specific
       changes, you can add them to your config.h file; place them
       <strong>before</strong> the inclusion of the platform-specific
-      header file.<p>
+      header file.<P>
 
       There are config files for most versions of UNIX.  If there
       isn't a version of this file that matches your
       platform/compiler, you'll need to make one.  Please send me
       email if you get it working so I can add it to the master ACE
-      release.</p><p>
+      release.<P>
 
-  </p></li><li>Create a build configuration file,
+  <LI>Create a build configuration file,
       <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code>,
       that contains the appropriate platform/compiler-specific
       Makefile configurations, e.g.,
-<blockquote><code>
+<BLOCKQUOTE><CODE>
 include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU
-</code></blockquote>
+</CODE></BLOCKQUOTE>
       This file contains the compiler and Makefile directives that are
       platform/compiler-specific. If you'd like to add make options, you
-      can add them before including the paltform-specific configuration.<p>
+      can add them before including the paltform-specific configuration.<P>
 
-  </p></li><li>Note that because ACE builds shared libraries, you'll need to set
+  <LI>Note that because ACE builds shared libraries, you'll need to set
       LD_LIBRARY_PATH to whereever you put the binary version of the
       ACE library.  For example, you probably want to do something
-      like the following<p>
+      like the following<P>
 
-      </p><pre><code>
+      <pre><code>
       % setenv LD_LIBRARY_PATH $ACE_ROOT/ace:$ACE_ROOT/lib:$LD_LIBRARY_PATH
-      </code></pre><p>
+      </code></pre><P>
 
-  </p></li><li>When all this is done, hopefully all you'll need to do is type:<p>
+  <LI>When all this is done, hopefully all you'll need to do is type:<P>
 
-      </p><pre><code>
+      <pre><code>
       % make
-      </code></pre><p>
+      </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="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace">$ACE_ROOT/ace/</a> directory and
-      running <code>make</code> there to build just the ACE library.
+      cd'ing into the <A HREF="ace">$ACE_ROOT/ace/</a> directory and
+      running <CODE>make</CODE> there to build just the ACE library.
       As a sanity check, you might also want to build and run the
-      automated <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/tests/README">"one-button" tests</a> in <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/tests/">$ACE_ROOT/tests/</a>.  Finally, if you're also
-      planning on building <a href="http://www.cs.wustl.edu/%7Eschmidt/TAO.html">TAO</a>, you
-      should build the <a href="http://www.cs.wustl.edu/%7Eschmidt/PDF/gperf.pdf">gperf</a>
-      perfect hash function generator application in <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/apps/gperf">$ACE_ROOT/apps/gperf/</a>.</p><p>
+      automated <A HREF="tests/README">&quot;one-button&quot; 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/PDF/gperf.pdf">gperf</A>
+      perfect hash function generator application in <A
+      HREF="apps/gperf">$ACE_ROOT/apps/gperf/</A>.<P>
 
-  </p></li><li>If you need to regenerate the Svc_Conf_y.cpp file, you'll need to
-      get <a href="http://ftp.gnu.org/pub/gnu/bison/">GNU Bison</a>.
-        However, you should rarely, if ever, need to do this.<p>
+  <LI>If you need to regenerate the Svc_Conf_y.cpp file, you'll need to
+      get <A HREF="http://ftp.gnu.org/pub/gnu/bison/">GNU Bison</A>.
+        However, you should rarely, if ever, need to do this.<P>
 
-</p></li></ol>
+</OL>
 
 
-<p></p><hr align="left" width="50%"><p>
-</p><h4><a name="win32">Building and Installing ACE on Windows</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="win32">Building and Installing ACE on Windows</A></H4>
 
-Below are instructions for building ACE with <a href="#borland">Borland C++Builder</a>, <a href="#msvc">Microsoft
-Visual C++</a>, <a href="#mingw">MinGw</a>, and <a href="#cygwin">Cygwin</a>.<p>
+Below are instructions for building ACE with <A
+HREF="#borland">Borland C++Builder</A>, <A HREF="#msvc">Microsoft
+Visual C++</A>, <A HREF="#mingw">MinGw</A>, and <A HREF="#cygwin">Cygwin</A>.<P>
 
 First, if you are upgrading from an older release, clean up everything
 and rebuild from scratch to ensure that everything is rebuilt
 correctly.  You might have to manually go through the ACE directories
 and delete all *.obj, *.dll, *.lib, *.ilk, *.pdb, *.idb, *.ncb, *.opt,
 and *.exp files in order to start over from scratch (the Clean command
-in MSVC may not do this).  </p><p>
+in MSVC may not do this).  <P>
 
 ACE contains project files for Microsoft Visual C++ 6.0 (*.dsp/.dsw)
 and Visual C++ .NET 2003 (*.vcproj/.sln).  There are also
 Makefile.bor files to compile ACE, and the ACE one-button tests with
-Borland C++ Builder. </p><p>
+Borland C++ Builder. <P>
 
-</p><p></p><hr align="left" width="50%"><p>
-</p><h4><a name="borland">Building and Installing ACE on Windows with Borland
-C++</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="borland">Building and Installing ACE on Windows with Borland
+C++</A></H4>
 
 If you are building for a machine without a network card, you may want
-to check <a href="#win32nonic">here</a> first. <p>
+to check <A HREF="#win32nonic">here</A> first. <P>
 
-</p><ol>
-  <li>Uncompress the ACE distribution into a directory, where it will
+<OL>
+  <LI>Uncompress the ACE distribution into a directory, where it will
       create an
       ACE_wrappers directory containing the source.  The ACE_wrappers
       directory will be referred to as ACE_ROOT in the following steps -- so
       ACE_ROOT\ace would be C:\ACE_wrappers\ace if you uncompressed into the
-      root directory.<br>
-      <br>
-  </li><li>Create a file called <code>config.h</code> in the ACE_ROOT\ace
-      directory that contains: <br>
-      <br>
-      <code>#include "ace/config-win32.h"</code><br>
-      <br>
+      root directory.<BR>
+      <BR>
+  <LI>Create a file called <code>config.h</code> in the ACE_ROOT\ace
+      directory that contains: <BR>
+      <BR>
+      <CODE>#include "ace/config-win32.h"</CODE><BR>
+      <BR>
       If you are building for Windows NT 4, Windows 2000, or Windows XP,
       then you can start without any more changes.  If you are building
-      on Windows 9x/Me, then you should add the line <br>
-      <br>
-      <code>#define ACE_HAS_WINNT4 0</code><br>
-      <br>
+      on Windows 9x/Me, then you should add the line <BR>
+      <BR>
+      <CODE>#define ACE_HAS_WINNT4 0</CODE><BR>
+      <BR>
       before the #include statement in ACE_ROOT\ace\config.h and it
-      will turn off some WinNT/Win2K-specific code in ACE.<br>
-      <br>
-  </li><li>Open a Command Prompt (DOS Box).<br>
-      <br>
-  </li><li>Set the ACE_ROOT environment variable to point to the ACE_wrappers
-      directory. For example:<br>
-      <br>
-      <code>set ACE_ROOT=C:\ACE_wrappers</code><br>
-      <br>
-  </li><li>Set the BCBVER environment vairable to the main version of your Borland C++ compiler.
-      Currently only 6 is supported, 4 and 5 are options but not supported. For example:<br>
-      <br>
-      <code>set BCBVER=6</code><br>
-      <br>
-  </li><li>Change to the ACE_ROOT\ace directory.<br>
-      <br>
-  </li><li>Build release DLLs for ACE by going:<br>
-      <br>
-      <code>make -f Makefile.bor all</code><br>
-      <br>
-  </li><li>You can build several different versions of ACE by setting environment
+      will turn off some WinNT/Win2K-specific code in ACE.<BR>
+      <BR>
+  <LI>Open a Command Prompt (DOS Box).<BR>
+      <BR>
+  <LI>Set the ACE_ROOT environment variable to point to the ACE_wrappers
+      directory. For example:<BR>
+      <BR>
+      <CODE>set ACE_ROOT=C:\ACE_wrappers</CODE><BR>
+      <BR>
+  <LI>Set the BCBVER environment vairable to the main version of your Borland C++ compiler.
+      Currently only 6 is supported, 4 and 5 are options but not supported. For example:<BR>
+      <BR>
+      <CODE>set BCBVER=6</CODE><BR>
+      <BR>
+  <LI>Change to the ACE_ROOT\ace directory.<BR>
+      <BR>
+  <LI>Build release DLLs for ACE by going:<BR>
+      <BR>
+      <CODE>make -f Makefile.bor all</CODE><BR>
+      <BR>
+  <LI>You can build several different versions of ACE by setting environment
 variables
-      before you run make:<br>
-      <br>
-      Set the environment variable below to build a debug version of ACE<br>
-      <code>set DEBUG=1</code><br>
-      <br>
-      Set the environment variable below to build a static version of ACE<br>
-      <code>set STATIC=1</code><br>
-      <br>
-      Set the environment variable below to build a unicode version of ACE<br>
-      <code>set UNICODE=1</code><br>
-      <br>
-Set the environment variable below to build a version of ACE with
-Codeguard support. Should only be used when DEBUG is also set<br>
-      <code>set CODEGUARD=1</code><br>
-      <br>
-Set the environment variable below to build a version of ACE that is
-build against the VCL-compatible run-time library. This can only be
-used with BCB version 4<br>
-      <code>set PASCAL=1</code><br>
-      <br>
+      before you run make:<BR>
+      <BR>
+      Set the environment variable below to build a debug version of ACE<BR>
+      <CODE>set DEBUG=1</CODE><BR>
+      <BR>
+      Set the environment variable below to build a static version of ACE<BR>
+      <CODE>set STATIC=1</CODE><BR>
+      <BR>
+      Set the environment variable below to build a unicode version of ACE<BR>
+      <CODE>set UNICODE=1</CODE><BR>
+      <BR>
+      Set the environment variable below to build a version of ACE with Codeguard support. Should only be used when DEBUG is also set<BR>
+      <CODE>set CODEGUARD=1</CODE><BR>
+      <BR>
+      Set the environment variable below to build a version of ACE that is build against the VCL-compatible run-time library. This can only be used with BCB version 4<BR>
+      <CODE>set PASCAL=1</CODE><BR>
+      <BR>
       Set the environment variable below to build a version of ACE using the
       C++BuilderX preview compiler. This compiler isn't supported at this moment
       but by setting this environment variable the new compiler is used and
-      you can expirement with this compiler.<br>
-      <code>set CBX=1</code><br>
-      <br>
+      you can expirement with this compiler.<BR>
+      <CODE>set CBX=1</CODE><BR>
+      <BR>
       You can then start the build with the command
-      <br><code>make -f Makefile.bor</code><br>
-      <br>
-      You may also enable the options by passing them as command line options to make, for example:<br>
-      <code>make -f Makefile.bor -DDEBUG -DPASCAL</code><br>
-      <br>
-  </li><li>Optionally install the ACE header files, libraries and executables
+      <BR><CODE>make -f Makefile.bor</CODE><BR>
+      <BR>
+      You may also enable the options by passing them as command line options to make, for example:<BR>
+      <CODE>make -f Makefile.bor -DDEBUG -DPASCAL</CODE><BR>
+      <BR>
+  <LI>Optionally install the ACE header files, libraries and executables
 for use
-      in your applications. Here we are installing them into C:\ACETAO: <br>
-      <br>
-      <code>make -f Makefile.bor -DINSTALL_DIR=C:\ACETAO install</code><br>
-      <br>
-</li></ol>
+      in your applications. Here we are installing them into C:\ACETAO: <BR>
+      <BR>
+      <CODE>make -f Makefile.bor -DINSTALL_DIR=C:\ACETAO install</CODE><BR>
+      <BR>
+</OL>
 
 These instructions do not cover all possible build configurations. Please
-see <a href="http://www.tenermerx.com/tao_bcb/index.html">http://www.tenermerx.com/tao_bcb/index.html</a>
+see <A
+HREF="http://www.tenermerx.com/tao_bcb/index.html">http://www.tenermerx.com/tao_bcb/index.html</A>
 for more detailed information on building and using ACE+TAO with Borland C++
-Builder. <p>
+Builder. <P>
 
 If you are using C++Builder 4, then the libraries built using the above
 instructions are intended for use with generic console or windows applications
@@ -1271,82 +1325,85 @@ created using BCB4's RAD environment must link against the VCL-compatible (ie
 pascal-compatible) runtime library.  To tell the difference between these
 libraries the VCL-compatible ones have a 'p' in the suffix (i.e., 'p' for
 pascal).  To build VCL compatible libraries try
-</p><blockquote><pre><code>set PASCAL=1
+<BLOCKQUOTE><PRE><CODE>set PASCAL=1
 make -f Makefile.bor
-</code></pre></blockquote> <p>
+</CODE></PRE></BLOCKQUOTE> <P>
 
-The Borland C++ Builder 4.0/5.0/6.0 port has been done by <a href="mailto:jody@atdesk.com">Jody Hagins</a>, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p>
+The Borland C++ Builder 4.0/5.0/6.0 port has been done by <A
+HREF="mailto:jody@atdesk.com">Jody Hagins</A>, <A
+HREF="mailto:chris@kohlhoff.com">Christopher Kohlhoff</A> and <A
+HREF="mailto:jwillemsen@remedy.nl">Johnny Willemsen</A>. <P>
 
-<b>ACE TESTS</b></p><p>
+<B>ACE TESTS</B><P>
 
 The tests are located in ACE_ROOT\tests.  You build the tests using the
-Makefile.bor file, that is:</p><p>
-</p><blockquote><code>
+Makefile.bor file, that is:<P>
+<BLOCKQUOTE><CODE>
 make -f Makefile.bor
-</code></blockquote><p>
+</CODE></BLOCKQUOTE><P>
 
-Once you build all the tests, you can run the perl script:</p><p>
-</p><blockquote><code>run_test.pl</code></blockquote><p> in the
+Once you build all the tests, you can run the perl script:<P>
+<BLOCKQUOTE><CODE>run_test.pl</CODE></BLOCKQUOTE><P> in the
 <code>tests</code> directory to try all the tests. You need to make
 sure the ACE bin and lib directory (in this case
-<code>ACE_ROOT\bin</code> and <code>ACE_ROOT\lib</code>)
-are on the path before you try to run the tests.</p><p>
+<CODE>ACE_ROOT\bin</CODE> and <CODE>ACE_ROOT\lib</CODE>)
+are on the path before you try to run the tests.<p>
 
-</p><p></p><hr align="left" width="50%"><p>
-</p><h4><a name="msvc">Building and Installing ACE on Windows with
-Microsoft Visual C++</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="msvc">Building and Installing ACE on Windows with
+Microsoft Visual C++</A></H4>
 
-<ol>
-  <li>Uncompress the ACE distribution into a directory, where it will
+<OL>
+  <LI>Uncompress the ACE distribution into a directory, where it will
   create a ACE_wrappers directory containing the distribution.  The
   ACE_wrappers directory will be referred to as ACE_ROOT in the
   following steps -- so  ACE_ROOT\ace would be C:\ACE_wrappers\ace if
-  you uncompressed into the root directory.<br>
-      <br>
-  </li><li>Create a file called <code>config.h</code> in the ACE_ROOT\ace
-      directory that contains: <br>
-      <br>
-      <code>#include "ace/config-win32.h"</code><br>
-      <br>
-
-  </li><li>The static, DLL and MFC library builds are kept in
+  you uncompressed into the root directory.<BR>
+      <BR>
+  <LI>Create a file called <code>config.h</code> in the ACE_ROOT\ace
+      directory that contains: <BR>
+      <BR>
+      <CODE>#include "ace/config-win32.h"</CODE><BR>
+      <BR>
+
+  <LI>The static, DLL and MFC library builds are kept in
   different workspaces. Files with names *_Static contain project
   files for static builds. Workspaces for static and DLL builds will be
   available through the stock release at DOC group's website. The
   workspaces for MFC are not available and have to be generated using
-  MPC. Please see <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/MPC/README">MPC's README</a> for
-  details.<br>
-  </li><li>Now load the workspace file for ACE (ACE_ROOT/ACE.dsw).<br>
-      <br>
-  </li><li>Make sure you are building the configuration (i.e, Debug/Release)
+  MPC. Please see <A HREF=MPC/README>MPC's README</A> for
+  details.<BR>
+  <LI>Now load the workspace file for ACE (ACE_ROOT/ACE.dsw).<BR>
+      <BR>
+  <LI>Make sure you are building the configuration (i.e, Debug/Release)
   the one you'll use (for example, the debug tests need the debug
   version of ACE, and so on).  All these different configurations are
   provided for your convenience.  You can either adopt the scheme to
   build your applications with different configurations, or use
   <code>ace/config.h</code> to tweak with the default settings on
-  NT.<br>  <strong>Note:</strong> If you use the dynamic libraries,
+  NT.<BR>  <STRONG>Note:</STRONG> If you use the dynamic libraries,
   make sure you include ACE_ROOT\lib in your PATH whenever you run
   programs that uses ACE.  Otherwise you may experience problems
-  finding ace.dll or aced.dll.<br>
-      <br>
-  </li><li>If you are building for Windows NT 4 or later (Windows 2000, XP, etc.)
+  finding ace.dll or aced.dll.<BR>
+      <BR>
+  <LI>If you are building for Windows NT 4 or later (Windows 2000, XP, etc.)
       then you can start building without anymore changes. If you are building
-      on Windows 9x/Me, then you should add the line <br>
-      <br>
-      <code>#define ACE_HAS_WINNT4 0</code><br>
-      <br>
+      on Windows 9x/Me, then you should add the line <BR>
+      <BR>
+      <CODE>#define ACE_HAS_WINNT4 0</CODE><BR>
+      <BR>
       before the #include statement in ACE_ROOT\ace\config.h and it
-      will turn off some WinNT/Win2K-specific code in ACE.<br>
-      <br>
-  </li><li>If you want to use the standard C++ headers (iostream, cstdio, ...
+      will turn off some WinNT/Win2K-specific code in ACE.<BR>
+      <BR>
+  <li>If you want to use the standard C++ headers (iostream, cstdio, ...
       as defined by the C++ Standard Draft 2) that comes with MSVC,
-      then add the line: <br>
-      <br>
-      <code>#define ACE_HAS_STANDARD_CPP_LIBRARY 1</code><br>
-      <br>
-      before the #include statement in ACE_ROOT\ace\config.h.<br>
+      then add the line: <BR>
+      <BR>
+      <CODE>#define ACE_HAS_STANDARD_CPP_LIBRARY 1</CODE><BR>
+      <BR>
+      before the #include statement in ACE_ROOT\ace\config.h.<BR>
       <br>
-  </li><li>To use ACE with MFC libraries, also add the following to
+  <li>To use ACE with MFC libraries, 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>
@@ -1363,424 +1420,446 @@ Microsoft Visual C++</a></h4>
       <code>config.h</code> file.  However, if you would like to link
       everything (including the MSVC run-time libraries) statically,
       you'll need to modify the project files in ACE yourself.<p>
-  </p></li><li>Static version of ACE libraries are built with
+  <li>Static version of ACE libraries are built with
       <code>ACE_AS_STATIC_LIBS</code><br> defined.  This macro should
       also be used in application projects that link to static ACE
-      libraries<br>
-      <br>
-      Optionally you can also add the line <br>
-      <br>
-      <code>#define ACE_NO_INLINE</code><br>
-      <br>
+      libraries<BR>
+      <BR>
+      Optionally you can also add the line <BR>
+      <BR>
+      <CODE>#define ACE_NO_INLINE</CODE><BR>
+      <BR>
       before the #include statement in ACE_ROOT\ace\config.h to disable
       inline function and reduce the size of static libraries (and your
-      executables.)<br>
-      <br>
-  </li><li>ACE DLL and LIB naming scheme:<br>
+      executables.)<BR>
+      <BR>
+  <li>ACE DLL and LIB naming scheme:<br>
       <br>
       We use the following rules to name the DLL and LIB files in ACE
       when using MSVC.<br>
       <br>
-      "Library/DLL name" + (Is static library ? "s" :
-      "") + (Is Debugging enable ? "d" : "")
-      + {".dll"|".lib"}<br>
+      &quot;Library/DLL name&quot; + (Is static library ? &quot;s&quot; :
+      &quot;&quot;) + (Is Debugging enable ? &quot;d&quot; : &quot;&quot;)
+      + {&quot;.dll&quot;|&quot;.lib&quot;}<br>
       <br>
-</li></ol>
+</Ol>
 
-<p>More information for ACE/TAO on MSVC can be found
-<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/msvc_notes.txt">here</a>.  The doxygen version of this
-document is available under Related Topics in the ACE Library.</p>
+<P>More information for ACE/TAO on MSVC can be found
+<A HREF="docs/msvc_notes.txt">here</A>.  The doxygen version of this
+document is available under Related Topics in the ACE Library.</P>
 
-<b>ACE TESTS</b><p>
+<B>ACE TESTS</B><P>
 
 The tests are located in ACE_ROOT\tests.  There is also a workspace in
-that directory to build all the tests (tests.dsw)</p><p>
+that directory to build all the tests (tests.dsw)<P>
 
 Once you build all the tests (Batch Build works well for this), you
 can run perl script <code>run_test.pl</code> in the
-<code>tests</code> directory to try all the tests.</p><p>
+<code>tests</code> directory to try all the tests.<p>
 
-<a name="win32nonic">
-<b> BUILDING ACE ON A WIN32 MACHINE THAT LACKS A NETWORK CARD </b></a></p><p>
+<A NAME="win32nonic">
+<B> BUILDING ACE ON A WIN32 MACHINE THAT LACKS A NETWORK CARD </B><P>
 
-<a name="win32nonic">You may want to run ACE on a non-networked machine. To do so, you must
+You may want to run ACE on a non-networked machine. To do so, you must
 install TCP/IP and configure it to ignore the absence of a network
 card.  This is one method:
 
-</a></p><ol>
-<a name="win32nonic">  <li>Run Control Panel
-  </li><li>Choose Network from Control Panel
-  </li><li>Add Adapter: MS Loopback Adapter
-  </li><li>Configure MS Loopback Adapter with 802.3 (default)
-  </li><li>Add Protocol: TCP/IP Protocol
-  </li><li>Configure TCP/IP Protocol with a valid IP address and subnet mask.
+<OL>
+  <LI>Run Control Panel
+  <LI>Choose Network from Control Panel
+  <LI>Add Adapter: MS Loopback Adapter
+  <LI>Configure MS Loopback Adapter with 802.3 (default)
+  <LI>Add Protocol: TCP/IP Protocol
+  <LI>Configure TCP/IP Protocol with a valid IP address and subnet mask.
       Leave everything else at the default settings.
-  </li><li>Add Service: Workstation
-  </li><li>Exit and Restart System
-  </li><li>Run Control Panel again
-  </li><li>Choose Services from Control Panel
-  </li><li>The following services are not necessary and may
-      be set to Disabled Startup: <br>
-      Alerter<br>
-      Computer Browser<br>
-      Net logon<br>
-      Messanger<br>
-  </li><li>Choose Network from Control Panel
-  </li><li>Confirm the following setup. This is all you need to run ACE:<br>
-      Installed Software:<br>
-      Computer Browser<br>
-      MS Loopback Adapter Driver<br>
-      TCP/IP Protocol<br>
-      Workstation<br>
-      Installed Adapter Cards:<br>
-      MS Loopback Adapter<p>
-</p></li></a></ol>
-
-<a name="win32nonic"><b>WIN32 ALPHA CONFIGURATIONS</b>
-
-</a><p><a name="win32nonic">The project files for Visual C++ no longer contain any configurations
+  <LI>Add Service: Workstation
+  <LI>Exit and Restart System
+  <LI>Run Control Panel again
+  <LI>Choose Services from Control Panel
+  <LI>The following services are not necessary and may
+      be set to Disabled Startup: <BR>
+      Alerter<BR>
+      Computer Browser<BR>
+      Net logon<BR>
+      Messanger<BR>
+  <LI>Choose Network from Control Panel
+  <LI>Confirm the following setup. This is all you need to run ACE:<BR>
+      Installed Software:<BR>
+      Computer Browser<BR>
+      MS Loopback Adapter Driver<BR>
+      TCP/IP Protocol<BR>
+      Workstation<BR>
+      Installed Adapter Cards:<BR>
+      MS Loopback Adapter<P>
+</OL>
+
+<B>WIN32 ALPHA CONFIGURATIONS</B>
+
+<P>The project files for Visual C++ no longer contain any configurations
 targetted to Windows NT on the DEC Alpha.  Below are the steps needed to
-recreate the Alpha configurations:</a></p>
-
-<ol>
-<a name="win32nonic">  <li>Load the project on the Alpha machine.
-  </li><li>Go to the Build menu and then select Configurations.
-  </li><li>Select the project that you want to convert.
-  </li><li>Click on Add.
-  </li><li>Select the x86 configuration to "Copy settings from"
+recreate the Alpha configurations:</P>
+
+<OL>
+  <LI>Load the project on the Alpha machine.
+  <LI>Go to the Build menu and then select Configurations.
+  <LI>Select the project that you want to convert.
+  <LI>Click on Add.
+  <LI>Select the x86 configuration to &quot;Copy settings from&quot;
       (either Debug or Release versions).
-  </li><li>Prepend "Alpha " to the beginning of the name under
-      "Configuration".
-  </li><li>Click OK.
-  </li><li>Close the "Configurations" window.
-  </li><li>Now go to the Project settings.
-  </li><li>For the General Settings, change the output directories to standard ACE
-      output directories. Intermediate Directories are "Debug" and
-          "Release" in most cases.  The Output Directories are blank,
+  <LI>Prepend &quot;Alpha &quot; to the beginning of the name under
+      &quot;Configuration&quot;.
+  <LI>Click OK.
+  <LI>Close the &quot;Configurations&quot; window.
+  <LI>Now go to the Project settings.
+  <LI>For the General Settings, change the output directories to standard ACE
+      output directories. Intermediate Directories are &quot;Debug&quot; and
+          &quot;Release&quot; in most cases.  The Output Directories are blank,
           except for Release versions of executables, in which it is also
-          "Release".
-  </li><li>For the C/C++ Settings, make sure that the Code Generation's runtime
-      library is set to "Multithreaded DLL" or "Debug Multithreaded
-          DLL".
-</li></a></ol>
+          &quot;Release&quot;.
+  <LI>For the C/C++ Settings, make sure that the Code Generation's runtime
+      library is set to &quot;Multithreaded DLL&quot; or &quot;Debug Multithreaded
+          DLL&quot;.
+</OL>
 
-<p><a name="win32nonic"><b>Note:</b> MSVC 6 has a bug where if a .dsp is converted from version 5 to 6 on
+<P><B>Note:</B> MSVC 6 has a bug where if a .dsp is converted from version 5 to 6 on
 x86, the Alpha configuration can get corrupted.  This seems to happen when additional
 include or library directories are specified using backslashes instead of forward
-slashes.  If this occurs, the easiest way to fix it is to recreate it.</a></p>
+slashes.  If this occurs, the easiest way to fix it is to recreate it.</P>
 
 
-<p></p><hr align="left" width="50%"><p>
-</p><h4><a name="mingw">Building and Installing ACE on Win32 with MinGW/ MSYS</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="mingw">Building and Installing ACE on Win32 with MinGW/ MSYS</A></H4>
 
 <p>
 If you are building for a machine without a network card, you may want
-to check <a href="#win32nonic">here</a> first.
+to check <A HREF="#win32nonic">here</A> first.
 
-</p><p>
-Building and installing ACE on <a href="http://www.mingw.org/">MinGW</a>
-uses a mix of a <a href="#unix">UNIX</a> building process and
-<a href="#win32">Win32</a> configuration files.
+<p>
+Building and installing ACE on <A HREF="http://www.mingw.org">MinGW</A>
+uses a mix of a <A HREF="#unix">UNIX</A> building process and
+<A HREF="#win32">Win32</A> configuration files.
 Also, as MinGW uses GNU g++, you may want to take
-a look at the <a href="#g++">Compiling ACE with GNU g++</a> section.
+a look at the <A HREF="#g++">Compiling ACE with GNU g++</A> section.
 
-</p><p>
+<p>
 You will need the MinGW build tools and libraries, downloable from
-<a href="http://www.mingw.org/"><tt>http://www.mingw.org</tt></a>.
+<A HREF="http://www.mingw.org"><TT>http://www.mingw.org</TT></A>.
 
-<br>
+<BR>
 For our build we require the packages
-<b><tt>MinGW</tt></b> and <b><tt>MSYS</tt></b>.
+<B><TT>MinGW</TT></B> and <B><TT>MSYS</TT></B>.
 
-</p><ol>
+<OL>
 
-  <li> Install the MinGW tools into a common directory, say c:/mingw.
-      <br><br>
+  <LI> Install the MinGW tools into a common directory, say c:/mingw.
+      <BR><BR>
 
-  </li><li> Install the MSYS tools into a common directory, say c:/msys.
-       <br><br>
+  <LI> Install the MSYS tools into a common directory, say c:/msys.
+       <BR><BR>
 
-  </li><li> Open a MSYS shell. Set your <tt>PATH</tt> environment variable so
-       your MinGW's <tt>bin</tt> directory is first:
+  <LI> Open a MSYS shell. Set your <TT>PATH</TT> environment variable so
+       your MinGW's <TT>bin</TT> directory is first:
 
-       <blockquote><code></code><pre>       % export PATH=/c/mingw/bin:$PATH
-       </pre></blockquote>
+       <blockquote><code><pre>
+       % export PATH=/c/mingw/bin:$PATH
+       </pre></code></blockquote>
 
-  </li><li> Add an <tt>ACE_ROOT</tt> environment variable pointing to the
+  <LI> Add an <TT>ACE_ROOT</TT> environment variable pointing to the
        root of your ACE wrappers source tree:
 
-       <blockquote><code></code><pre>       % export ACE_ROOT=/c/work/mingw/ACE_wrappers
-       </pre></blockquote>
+       <blockquote><code><pre>
+       % export ACE_ROOT=/c/work/mingw/ACE_wrappers
+       </pre></code></blockquote>
 
        From now on, we will refer to the root directory of the ACE
-       source tree as <tt>$ACE_ROOT</tt>.
-       <br><br>
+       source tree as <TT>$ACE_ROOT</TT>.
+       <BR><BR>
 
-  </li><li> Create a file called <tt>config.h</tt> in the
-       <tt>$ACE_ROOT/ace</tt> directory that contains:
+  <LI> Create a file called <TT>config.h</TT> in the
+       <TT>$ACE_ROOT/ace</TT> directory that contains:
 
-       <blockquote><code></code><pre>       #include "ace/config-win32.h"
-       </pre></blockquote>
+       <blockquote><code><pre>
+       #include "ace/config-win32.h"
+       </pre></code></blockquote>
 
-       If you are building for Windows 9X/Me (ie, <em>not</em> WinNT or
+       If you are building for Windows 9X/Me (ie, <EM>not</EM> WinNT or
        Win2K), you will need to add:
 
-       <blockquote><code></code><pre>       #define ACE_HAS_WINNT4 0
-       </pre></blockquote>
+       <blockquote><code><pre>
+       #define ACE_HAS_WINNT4 0
+       </pre></code></blockquote>
 
-       before the <code>#include</code> line.
-       <br><br>
+       before the <CODE>#include</CODE> line.
+       <BR><BR>
 
-  </li><li> Create a file called <tt>platform_macros.GNU</tt> in the
-       <tt>$ACE_ROOT/include/makeinclude</tt> directory containing:
+  <LI> Create a file called <TT>platform_macros.GNU</TT> in the
+       <TT>$ACE_ROOT/include/makeinclude</TT> directory containing:
 
-       <blockquote><code></code><pre>       include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
-       </pre></blockquote>
+       <blockquote><code><pre>
+       include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
+       </pre></code></blockquote>
 
-       In the above text, don't replace <tt>$(ACE_ROOT)</tt> with the
+       In the above text, don't replace <TT>$(ACE_ROOT)</TT> with the
        actual directory, GNU make will take the value from the
        environment variable you defined previously.
 
        <p>
        If you lack Winsock 2, add the line
 
-       </p><blockquote><code></code><pre>       winsock2 = 0
-       </pre></blockquote>
+       <blockquote><code><pre>
+       winsock2 = 0
+       </pre></code></blockquote>
 
        before the previous one.
-       <br><br>
+       <BR><BR>
 
-  </li><li> In the MSYS shell, change to the $ACE_ROOT/ace directory and
+  <LI> In the MSYS shell, change to the $ACE_ROOT/ace directory and
        run make:
 
-       <blockquote><code></code><pre>       % cd $ACE_ROOT/ace
+       <blockquote><code><pre>
+       % cd $ACE_ROOT/ace
        % make
-       </pre></blockquote>
+       </pre></code></blockquote>
 
        <p>
-       This should create <tt>libACE.dll</tt> (the Win32 shared library) and
-       <tt>libACE.dll.a</tt> (the Win32 import library for the DLL).
+       This should create <TT>libACE.dll</TT> (the Win32 shared library) and
+       <TT>libACE.dll.a</TT> (the Win32 import library for the DLL).
        Note that the name for the ACE DLL follows the MinGW convention, which itself
        resembles UNIX.
 
-       </p><p>
+       <p>
        If you want static libs also, you may run:
 
-       </p><blockquote><code></code><pre>       % make static_libs=1
-       </pre></blockquote>
+       <blockquote><code><pre>
+       % make static_libs=1
+       </pre></code></blockquote>
 
-  </li><li> <a name="mingwrunpath">
+  <LI> <A NAME="mingwrunpath">
        The same rules for Win32 search of DLLs apply for MinGW. If you
        want to run some ACE programs from the MSYS shell, you may
-       need to add the directory for <tt>libACE.dll</tt> to your PATH:
+       need to add the directory for <TT>libACE.dll</TT> to your PATH:
 
-       </a><blockquote><code></code><pre><a name="mingwrunpath">       % export PATH=/c/work/mingw/ACE_wrappers/ace:$PATH
-       </a></pre></blockquote>
+       <blockquote><code><pre>
+       % export PATH=/c/work/mingw/ACE_wrappers/ace:$PATH
+       </pre></code></blockquote>
 
-</li></ol>
+</OL>
 
-<a name="mingwrunpath"><b>ACE TESTS</b></a><p>
+<B>ACE TESTS</B><P>
 
-<a name="mingwrunpath">The tests are located in <tt>$ACE_ROOT/tests</tt>.
+The tests are located in <TT>$ACE_ROOT/tests</TT>.
 After building the library, you can change to that directory and run
 make:
 
-       </a></p><blockquote><code></code><pre><a name="mingwrunpath">       % cd $ACE_ROOT/tests
+       <blockquote><code><pre>
+       % cd $ACE_ROOT/tests
        % make
-       </a></pre></blockquote>
+       </pre></code></blockquote>
 
 <p>
-<a name="mingwrunpath">Once you build all the tests, you can run
+Once you build all the tests, you can run
 <code>run_tests.pl</code> in the
 <code>tests</code> directory to try all the tests:
 
-       </a></p><blockquote><code></code><pre><a name="mingwrunpath">       % perl run_test.pl
-       </a></pre></blockquote>
+       <blockquote><code><pre>
+       % perl run_test.pl
+       </pre></code></blockquote>
 
 <p>
-<a name="mingwrunpath">If you are using ACE as a DLL, you will need to modify your PATH
-variable as explained </a><a href="#mingwrunpath">above</a>.
+If you are using ACE as a DLL, you will need to modify your PATH
+variable as explained <A HREF="#mingwrunpath">above</A>.
 
-</p><p>
+<p>
 You may want to check <tt>$ACE_ROOT/tests/README</tt> for the status
 of the various tests on MinGW and the different Windows flavors.
 
-</p><p></p><hr align="left" width="50%"><p>
-</p><h4><a name="cygwin">Building and Installing ACE on Win32 with Cygwin</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="cygwin">Building and Installing ACE on Win32 with Cygwin</A></H4>
 
 <p>
 If you are building for a machine without a network card, you may want
-to check <a href="#win32nonic">here</a> first.
+to check <A HREF="#win32nonic">here</A> first.
 
-</p><p>
-Building and installing ACE on <a href="http://www.cygwin.com/">Cygwin</a>
-uses the <a href="#unix">UNIX</a> building process.
+<p>
+Building and installing ACE on <A HREF="http://www.cygwin.com">Cygwin</A>
+uses the <A HREF="#unix">UNIX</A> building process.
 Also, as Cygwin uses GNU g++, you may want to take
-a look at the <a href="#g++">Compiling ACE with GNU g++</a> section.
+a look at the <A HREF="#g++">Compiling ACE with GNU g++</A> section.
 
-</p><p>
+<p>
 You will need the Cygwin build tools and libraries, downloable from
-<a href="http://www.cygwin.com/"><tt>http://www.cygwin.com</tt></a>.
+<A HREF="http://www.cygwin.com"><TT>http://www.cygwin.com</TT></A>.
 For our build we require the following packages besides the packages the
 setup selects by default:
-<a name="cygwinpacks">
-</a></p><blockquote>
-<a name="cygwinpacks"><b><tt>gcc (version 3.3.3), cygipc, make, perl</tt></b>.
-</a></blockquote>
+<A NAME="cygwinpacks">
+<blockquote>
+<B><TT>gcc (version 3.2.3), cygipc, make, perl</TT></B>.
+</blockquote>
 
-<ol>
+<OL>
 
-<a name="cygwinpacks">  <li> Install Cygwin (this can be easy downloading and running
-       </li></a><a href="http://cygwin.com/setup.exe"><tt>setup.exe</tt></a>
+  <LI> Install Cygwin (this can be easy downloading and running
+       <A HREF="http://cygwin.com/setup.exe"><tt>setup.exe</tt></A>
        from the Cygwin site). For working with ACE we recommend
        to select <code>DOS</code> as default text file type.
-       <br><br>
+       <BR><BR>
 
-  <li> Open a Cygwin shell. Set your <tt>PATH</tt> environment variable so
-       your CYgwin <tt>bin</tt> directory is first:
+  <LI> Open a Cygwin shell. Set your <TT>PATH</TT> environment variable so
+       your CYgwin <TT>bin</TT> directory is first:
 
-       <blockquote><code></code><pre>       % export PATH=//c/cygwin/bin:$PATH
-       </pre></blockquote>
+       <blockquote><code><pre>
+       % export PATH=//c/cygwin/bin:$PATH
+       </pre></code></blockquote>
 
        <p>
-       Note Cygwin uses ``<tt>/</tt>'' as directory separator,
-       and ``<tt>//X</tt>'' as a notation for Win32 drive <tt>X</tt>.
-       Note also that you <em>can't</em> use ``<tt>c:/cygwin/bin</tt>''
+       Note Cygwin uses ``<TT>/</TT>'' as directory separator,
+       and ``<TT>//X</TT>'' as a notation for Win32 drive <TT>X</TT>.
+       Note also that you <EM>can't</EM> use ``<TT>c:/cygwin/bin</TT>''
        because, for Cygwin,
-       ``<tt>:</tt>'' is path separator character, as in UNIX.
-       <br><br>
+       ``<TT>:</TT>'' is path separator character, as in UNIX.
+       <BR><BR>
 
-  </p></li><li> Add an <tt>ACE_ROOT</tt> environment variable pointing to the
+  <LI> Add an <TT>ACE_ROOT</TT> environment variable pointing to the
        root of your ACE wrappers source tree:
 
-       <blockquote><code></code><pre>       % export ACE_ROOT=c:/work/cygwin/ACE_wrappers
-       </pre></blockquote>
+       <blockquote><code><pre>
+       % export ACE_ROOT=c:/work/cygwin/ACE_wrappers
+       </pre></code></blockquote>
 
        <p>
-       Note here you <em>can't</em> use the ``<tt>//X</tt>'' Cygwin
+       Note here you <EM>can't</EM> use the ``<TT>//X</TT>'' Cygwin
        notation as this is seen by Cygwin's compiler and it doesn't
-       support that (it <em>does</em> support ``<tt>/</tt>'' as directory
+       support that (it <EM>does</EM> support ``<TT>/</TT>'' as directory
        separator however).
 
-       </p><p>
+       <p>
        From now on, we will refer to the root directory of the ACE
-       source tree as <tt>$ACE_ROOT</tt>.
-       <br><br>
+       source tree as <TT>$ACE_ROOT</TT>.
+       <BR><BR>
 
-  </p></li><li> Create a file called <tt>config.h</tt> in the
-       <tt>$ACE_ROOT/ace</tt> directory that contains:
+  <LI> Create a file called <TT>config.h</TT> in the
+       <TT>$ACE_ROOT/ace</TT> directory that contains:
 
-       <blockquote><code></code><pre>       #include "ace/config-cygwin32.h"
-       </pre></blockquote>
+       <blockquote><code><pre>
+       #include "ace/config-cygwin32.h"
+       </pre></code></blockquote>
 
-  </li><li> Create a file called <tt>platform_macros.GNU</tt> in the
-       <tt>$ACE_ROOT/include/makeinclude</tt> directory containing:
+  <LI> Create a file called <TT>platform_macros.GNU</TT> in the
+       <TT>$ACE_ROOT/include/makeinclude</TT> directory containing:
 
-       <blockquote><code></code><pre>       include $(ACE_ROOT)/include/makeinclude/platform_cygwin32.GNU
-       </pre></blockquote>
+       <blockquote><code><pre>
+       include $(ACE_ROOT)/include/makeinclude/platform_cygwin32.GNU
+       </pre></code></blockquote>
 
-       In the above text, don't replace <tt>$(ACE_ROOT)</tt> with the
+       In the above text, don't replace <TT>$(ACE_ROOT)</TT> with the
        actual directory, GNU make will take the value from the
        environment variable you defined previously.
 
-  </li><li> On the Cygwin shell, change to the $ACE_ROOT/ace directory and
+  <LI> On the Cygwin shell, change to the $ACE_ROOT/ace directory and
        run make:
 
-       <blockquote><code></code><pre>       % cd $ACE_ROOT/ace
+       <blockquote><code><pre>
+       % cd $ACE_ROOT/ace
        % make
-       </pre></blockquote>
+       </pre></code></blockquote>
 
        <p>
-       This should create <tt>libACE.dll</tt> (the Win32 shared library) and
-       <tt>libACE.dll.a</tt> (the Win32 import library for the DLL).
+       This should create <TT>libACE.dll</TT> (the Win32 shared library) and
+       <TT>libACE.dll</TT> (the Win32 import library for the DLL).
        Note the name for the ACE DLL on Cygwin follows the UNIX convention.
-       <br><br>
+       <BR><BR>
 
-       </p><p>
+       <p>
        If you want static libs also, you may run:
 
-       </p><blockquote><code></code><pre>       % make static_libs=1
-       </pre></blockquote>
+       <blockquote><code><pre>
+       % make static_libs=1
+       </pre></code></blockquote>
 
-  </li><li> <a name="cygwinrunpath">
+  <LI> <A NAME="cygwinrunpath">
        The same rules for Win32 search of DLLs apply for Cygwin. If you
        want to run some ACE programs from the Cygwin shell, you may
-       need to add the directory for <tt>libACE.dll</tt> to your PATH:
+       need to add the directory for <TT>libACE.dll</TT> to your PATH:
 
-       </a><blockquote><code></code><pre><a name="cygwinrunpath">       # export PATH=//c/work/cygwin/ACE_wrappers/ace:$PATH
-       </a></pre></blockquote>
+       <blockquote><code><pre>
+       # export PATH=//c/work/cygwin/ACE_wrappers/ace:$PATH
+       </pre></code></blockquote>
 
-<a name="cygwinrunpath">       If you are using MPC-generated Makefiles, then the DLLs have been
+       If you are using MPC-generated Makefiles, then the DLLs have been
        placed in the lib directory instead of ace and thus your PATH
        addition would need to look like this:
 
-       </a><blockquote><code></code><pre><a name="cygwinrunpath">       # export PATH=//c/work/mingw/ACE_wrappers/lib:$PATH
-       </a></pre></blockquote>
+       <blockquote><code><pre>
+       # export PATH=//c/work/mingw/ACE_wrappers/lib:$PATH
+       </pre></code></blockquote>
 
 
-</li></ol>
+</OL>
 
-<a name="cygwinrunpath"><b>ACE TESTS</b></a><p>
+<B>ACE TESTS</B><P>
 
-<a name="cygwinrunpath">The tests are located in <tt>$ACE_ROOT/tests</tt>.
+The tests are located in <TT>$ACE_ROOT/tests</TT>.
 After building the library, you can change to that directory and run
 make:
 
-       </a></p><blockquote><code></code><pre><a name="cygwinrunpath">       % cd $ACE_ROOT/tests
+       <blockquote><code><pre>
+       % cd $ACE_ROOT/tests
        % make
-       </a></pre></blockquote>
+       </pre></code></blockquote>
 
 <p>
-<a name="cygwinrunpath">Once you build all the tests, you can run
+Once you build all the tests, you can run
 <code>run_tests.pl</code> in the
 <code>tests</code> directory to try all the tests:
 
-       </a></p><blockquote><code></code><pre><a name="cygwinrunpath">       % perl run_test.pl
-       </a></pre></blockquote>
+       <blockquote><code><pre>
+       % perl run_test.pl
+       </pre></code></blockquote>
 
 <p>
-<a name="cygwinrunpath">If you are using ACE as a DLL, you will need to modify your PATH
-variable as explained </a><a href="#cygwinrunpath">above</a>.
+If you are using ACE as a DLL, you will need to modify your PATH
+variable as explained <A HREF="#cygwinrunpath">above</A>.
 
-</p><p>
+<p>
 You may want to check <tt>$ACE_ROOT/tests/README</tt> for the status
 of the various tests on Cygwin and the different Windows flavors.
 
-</p><p></p><hr align="left" width="50%"><p>
-</p><h4><a name="vxworks">Building and Installing ACE on VxWorks</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="vxworks">Building and Installing ACE on VxWorks</A></H4>
 For the most part, you should be able to follow the instructions above
 to build ACE and applications that use it.  Start with the
 <a href="#unix">Unix instructions</a> above to build ACE and the
 applications that use it.  Please see below for more information on
-<a href="#VxWorks/NT">building ACE on NT hosts for VxWorks targets</a>.<p>
+<a href="#VxWorks/NT">building ACE on NT hosts for VxWorks targets</a>.<P>
 
 A few notes on VxWorks builds (thanks to
 <a href="mailto:Paul_von_Behren@stortek.com">Paul von Behren</a>
-for these notes):</p><p>
-</p><ul>
-  <li>VxWorks builds are done with a cross compiler, i.e., the compiles
+for these notes):<p>
+<UL>
+  <LI>VxWorks builds are done with a cross compiler, i.e., the compiles
       are done on a workstation creating object modules which are
       downloaded and loaded into the VxWorks target system.<p>
-  </p></li><li>C++ object modules must be post-processed by a VxWorks
-      utility called "munch."  ACE includes a perl script called
-      <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/bin/ace_ld">$ACE_ROOT/bin/ace_ld</a>,
+  <LI>C++ object modules must be post-processed by a VxWorks
+      utility called &quot;munch.&quot;  ACE includes a perl script called
+      <A
+      HREF="bin/ace_ld">$ACE_ROOT/bin/ace_ld</A>,
       which is called from the Makefiles, replacing
       the traditional <code>ld</code> step.  You must have perl installed
       to use <code>ace_ld</code>.  If perl is not on your path, you'll
       have to set <code>PERL_PATH</code> to the full path (including
       perl.exe), either in your
       <code>$(ACE_ROOT)/include/makeinclude/platform_macros.GNU</code>
-      or in your environment.<p>
-  </p></li><li>Wind River provides GCC/G++ cross-compilers for the
+      or in your environment.<P>
+  <LI>Wind River provides GCC/G++ cross-compilers for the
       supported target platforms.  The executables are named cc&lt;target&gt;
       and g++&lt;target&gt;; for example, ccppc and g++cpp for PowerPC
       targets.<p>
-</p></li></ul>
+</UL>
 
 You'll have to let ACE know the target type at compile time.  There
 are several ways to do this; please see the
 <code>$ACE_ROOT/include/makeinclude/platform_vxworks5.x_g++.GNU</code>
-platform file for detailed information.<p>
+platform file for detailed information.<P>
 
 The VxWorks platform_vxworks*.GNU files are set up so that shared
 libraries are not built on VxWorks, by default.  Only static
@@ -1789,16 +1868,17 @@ necessary to set the LD_LIBRARY_PATH environment variable on your host
 system when building for VxWorks targets.  Please note, however, if
 you use TAO on VxWorks that you will need to set your LD_LIBRARY_PATH
 to find the TAO IDL compiler libraries (installed in the ace
-directory) on the host.</p><p>
+directory) on the host.<P>
 
 With g++, $ACE_ROOT/bin/ace_ld is used to munch object files and
 libraries to set up calls to static constructors and destructors.
-bin/ace_ld requires perl on the host platform.</p><p>
+bin/ace_ld requires perl on the host platform.<P>
 
 These non-default VxWorks kernel configuration <code>#defines</code>
-are required with ACE:</p><p>
+are required with ACE:<P>
 
-</p><pre>#define INCLUDE_CPLUS           /* include C++ support */
+<pre>
+#define INCLUDE_CPLUS           /* include C++ support */
 #define INCLUDE_CPLUS_IOSTREAMS /* include iostreams classes */
 #define INCLUDE_POSIX_ALL       /* include all available POSIX functions */
 </pre>
@@ -1806,7 +1886,8 @@ are required with ACE:</p><p>
 For completeness, here are the non-default <code>#defines</code> that
 we used for VxWorks 5.3.1/g++ 2.7.2:
 
-<pre>#define INCLUDE_CPLUS           /* include C++ support */
+<pre>
+#define INCLUDE_CPLUS           /* include C++ support */
 #define INCLUDE_CPLUS_IOSTREAMS /* include iostreams classes */
 #define INCLUDE_CONFIGURATION_5_2 /* pre-tornado tools */
 #define INCLUDE_DEBUG           /* pre-tornado debugging */
@@ -1835,58 +1916,58 @@ should be enabled.<p>
 
 If you use TAO, it's also a good idea to increase the
 <code>NUM_FILES</code> parameter from its default of 50 to,
-say, 1000.</p><p>
+say, 1000.<p>
 
 Please note that those VxWorks kernel configuration parameters
 are set in the VxWorks configAll.h file.  You must rebuild your
-VxWorks kernel after modifying that file.</p><p>
+VxWorks kernel after modifying that file.<p>
 
 If you're first getting started with ACE and/or VxWorks, I recommend
 just building the ACE library and tests first.  (Some of the ACE
 examples, in System_V_IPC, don't build on VxWorks yet.)  Then try
 running the tests.  Please see $ACE_ROOT/tests/README for the latest
-status of the ACE tests on VxWorks.</p><p>
+status of the ACE tests on VxWorks.<P>
 
 Please note that the <code>main</code> entry point is renamed to
 <code>ace_main</code> (configurable via ACE_MAIN) on VxWorks with g++,
 to comply with its restriction against using <code>main</code>.
 In addition, ACE_HAS_NONSTATIC_OBJECT_MANAGER is enabled by default
 to cleanly support construction and destruction of static objects.
-Please see the <a href="#Non-static%20Object%20Manager">Non-static
-ACE_Object_Manager</a> discussion for the important implication
-of this feature.</p><p>
+Please see the <A HREF="#Non-static Object Manager">Non-static
+ACE_Object_Manager</A> discussion for the important implication
+of this feature.<p>
 
 ACE threads (VxWorks tasks) can be named, for example, by supplying a
 non-null argument to the Thread_Manager spawn routines.  However,
 names beginning with <code>"==ace_t=="</code> are forbidden because
-that prefix is used internally by ACE.</p><p>
+that prefix is used internally by ACE.<p>
 
 You can spawn a new task to run <code>ace_main</code>, using either
-VxWorks <code>sp</code>, or ACE'S <a name="spa"><code>spa</code></a>.
+VxWorks <code>sp</code>, or ACE'S <A NAME="spa"><code>spa</code></A>.
 <code>spa</code> can be used from the VxWorks shell to pass arguments
 to <code>ace_main</code>.  Its usage is:
 
-</p><pre><code>
+<pre><code>
 spa ace_main, "arg1" [, ...]
 </code></pre>
 
 All arguments must be quoted, even numbers.<p>
 
-The ACE <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/tests/">tests</a> write their output files in a
+The ACE <a href="tests/">tests</a> write their output files in a
 directory named <code>log/</code>, below the current
 (<code>tests</code>) directory.  If you don't have NFS included in
 your VxWorks kernel, you can use these steps, provided by
 <a href="mailto:clarence_m_weaver@md.northgrum.com">Clarence M. Weaver</a>,
-to run the tests and capture their output:</p><p>
-</p><ol>
+to run the tests and capture their output:<p>
+<ol>
   <li>What I did was create a log directory on the boot NT host of my vxworks
     target.<p>
-  </p></li><li>I copied all the test applications and the run_tests.vxworks script to
+  <li>I copied all the test applications and the run_tests.vxworks script to
     the parent of the log directory.<p>
-  </p></li><li>Using the target shell not the host shell, I "cd" to the directory
+  <li>Using the target shell not the host shell, I "cd" to the directory
     containing the script and test programs.<p>
-  </p></li><li>Invoked the script &lt; run_tests.vxworks from this target shell.<p>
-</p></li></ol>
+  <li>Invoked the script &lt; run_tests.vxworks from this target shell.<p>
+</ol>
 
 <a href="mailto:Kirk.Davies@pobox.com">Kirk Davies</a> provided this
 approach for running the ACE tests on Tornado II:
@@ -1894,10 +1975,11 @@ approach for running the ACE tests on Tornado II:
 <ul>
   <li>Under Tornado II, I set up the Target Server File System (TSFS), and
     the test logs get written to the log subdirectory under that.<p>
-  </p></li><li>You have to set an environment variable before running the tests:
-<pre>putenv("ACE_TEST_DIR=/tgtsvr")
+  <li>You have to set an environment variable before running the tests:
+<pre>
+putenv("ACE_TEST_DIR=/tgtsvr")
 </pre><p>
-</p></li></ul>
+</ul>
 
 <h5><a name="VxWorks/SharedLibs">Building Shared Libraries for VxWorks</a>.</h5>
 
@@ -1913,12 +1995,12 @@ A shared library for VxWorks uses the same code as for a static
 (non-shared) library.  However, calls to static constructors/
 destructors are added.  The code in the shared library <strong>must</strong>
 be reentrant if you shared it between programs (tasks).  The
-ACE library meets this requirement.</p><p>
+ACE library meets this requirement.<p>
 
 Shared libraries reduce build time, executable size, and load
 time of the executable.  But, you must manually load the shared
 library before loading your executable(s) with a command such as:
-</p><pre><code>
+<pre><code>
 -&gt; ld &lt; libACE.so
 </code></pre>
 Shared libraries can be unloaded the same way an executable
@@ -1930,14 +2012,15 @@ no support for creating copies of writeable global (static) data in
 the shared library.  This includes the singleton ACE_Object_Manager
 instance pointer.  If you share global data between separate programs,
 they may not work properly.  See the discussion of shared code and
-reentrancy in the VxWorks' <em>Programmers Guide</em>.</p><p>
+reentrancy in the VxWorks' <em>Programmers Guide</em>.<p>
 
 Instead of trying to run separate programs onto a VxWorks target, we
 recommend creating just one program, and spawning a thread for each
-task.  The TAO IDL_Cubit test <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp">collocation
-test</a> is a good example.</p><p>
+task.  The TAO IDL_Cubit test <a
+href="TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp">collocation
+test</a> is a good example.<p>
 
-</p><h5><a name="VxWorks/LinkToKernel">Linking ACE and/or TAO Libraries into the VxWorks Kernel</a>.</h5>
+<h5><a name="VxWorks/LinkToKernel">Linking ACE and/or TAO Libraries into the VxWorks Kernel</a>.</h5>
 
 It's easy to link your ACE and/or TAO libraries into the VxWorks kernel.
 Just build <a href="#VxWorks/SharedLibs">shared versions</a>, but
@@ -1945,14 +2028,15 @@ disable the munch step.  The easiest way to do that is to set the
 <code>LD</code> make variable to the name of your linker.  For
 example, to build a libACE.so for PowerPC that can be linked into
 the kernel:
-<pre>% cd $ACE_ROOT/ace
+<pre>
+% cd $ACE_ROOT/ace
 % make LD=ldppc shared_libs=1
 </pre>
 After building the shared lib, link it into the kernel by setting
 the <code>MACH_EXTRA</code> make variable in the kernel configuration
 Makefile.  Then, build the kernel using <code>make exe</code>.<p>
 
-</p><h5><a name="VxWorks/NT">Building ACE on Tornado/NT hosts for VxWorks targets</a>.</h5>
+<h5><a name="VxWorks/NT">Building ACE on Tornado/NT hosts for VxWorks targets</a>.</h5>
 The following, very useful information was contributed by
 <a href="http://people.qualcomm.com/cryan">Chris Ryan</a>
 and <a href="mailto:Paul_von_Behren@stortek.com">Paul von Behren</a>.
@@ -1961,69 +2045,71 @@ the <a href="mailto:ace-users@cs.wustl.edu">ACE mailing list</a>.<p>
 
 <strong>NOTE:</strong>The make (version 3.74) that is provided with
 Tornado II cannot be used to build ACE.  Use Cygnus' make (version 3.75)
-instead.)</p><p>
+instead.)<p>
 
 <strong>NOTE:</strong>Optimization is enabled be default in
-<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_vxworks5.x_g++.GNU">platform_vxworks5.x_g++.GNU</a>.  However, the compiler that is shipped with Tornado II has
+<a href=include/makeinclude/platform_vxworks5.x_g++.GNU>platform_vxworks5.x_g++.GNU</a>.  However, the compiler that is shipped with Tornado II has
 trouble compiling some files with -O2.  To disable optimization
 for an individual file, just add <code>optimize=0</code> to your
-make invocation when compiling that file.</p><p>
+make invocation when compiling that file.<p>
 
 Using the Cygnus tools, this approach works:
-</p><ul>
+<ul>
   <li>You'll build both your NT and VxWorks executables in the same
     workspace (directory hierarchy).  This works because the NT
     compiler and ACE's Makefiles put their output in different
     directories.<p>
-  </p></li><li>Set up your
+  <li>Set up your
     <code>ACE_wrappers/include/makeinclude/platform_macros.GNU</code>
     as usual for VxWorks.  See
-    <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_vxworks5.x_g++.GNU">the
+    <a href="include/makeinclude/platform_vxworks5.x_g++.GNU">the
     g++/VxWorks platform file</a> for more information.<p>
-  </p></li><li>Create an <code>ACE_wrappers/ace/config.h</code> file that looks
+  <li>Create an <code>ACE_wrappers/ace/config.h</code> file that looks
     something like the following.  tao_idl should be built to not support
     native exception handling, because that's not available on VxWorks.
-<pre>#if defined (_MSC_VER)  ||  defined (__BORLANDC__)
+<pre>
+#if defined (_MSC_VER)  ||  defined (__BORLANDC__)
 # include "ace/config-win32.h"
 # undef ACE_HAS_EXCEPTIONS
 #else
 # include "ace/config-vxworks.h"
 #endif
 </pre><p>
-   </p></li><li>Set your <code>ACE_ROOT</code>, <code>CPP_LOCATION</code>,
+   <li>Set your <code>ACE_ROOT</code>, <code>CPP_LOCATION</code>,
      <code>WIND_BASE</code>, and <code>WIND_HOST_TYPE</code> environment
      variables.<p>
-   </p></li><li>Build for NT, then build for VxWorks.<p>
-</p></li></ul>
+   <li>Build for NT, then build for VxWorks.<p>
+</ul>
 
 A few additional Windows Notes, from Paul von Behren:<p>
-</p><ul>
+<ul>
   <li>Cygnus has created a Win32 API which is compatible with a
-      "generic" Unix environment.  Using this library, they have ported a
+      &quot;generic&quot; Unix environment.  Using this library, they have ported a
       large collection of GNU tools to WinNT/95 - including a port of
-      gcc/g++.  See <a href="http://www.cygnus.com/misc/gnu-win32/">http://www.cygnus.com/misc/gnu-win32/</a>
+      gcc/g++.  See <A href="http://www.cygnus.com/misc/gnu-win32/">http://www.cygnus.com/misc/gnu-win32/</A>
       A related link is <a href="ftp://ftp.cygnus.com/pub/gnu-win32/latest/">ftp://ftp.cygnus.com/pub/gnu-win32/latest/</a><p>
-  </p></li><li>To set up the command-prompt build environemnt, run
+  <li>To set up the command-prompt build environemnt, run
       <code>Tornado\host\x86-win32\bin\TorVars.bat</code>.  This is done
       implicitly within the Tornado IDE.<p>
-  </p></li><li>To run <code>ace_ld</code>, you still need perl installed -
-      see <a href="http://www.activestate.com/software/default.htm">http://www.activestate.com/software/default.htm</a>
+  <li>To run <code>ace_ld</code>, you still need perl installed -
+      see <A href="http://www.activestate.com/software/default.htm">http://www.activestate.com/software/default.htm</A>
       for Windows perl.<p>
-  </p></li><li>The Tornado IDE will use a standard Makefile for project
+  <li>The Tornado IDE will use a standard Makefile for project
       builds, but does not have a GUI interface for managing the
       Makefile.  By default, it will use rules from Makefile in the current
       directory and you can configure it to add certain Makefile
       targets to the project.  If you have <code>ACE_ROOT</code> defined
       before starting Tornado, you can specify an ACE Makefile as a Tornado
       target and Tornado will then call make from the menu.<p>
-</p></li></ul>
+</ul>
 
 And Chris Ryan's instructions for building for VxWorks targets
 on Windows NT hosts:
 
 <ol>
   <li>Path setting that seems to be working is:<p>
-      </p><pre>      /tornado/host/x86-win32/bin:
+      <pre>
+      /tornado/host/x86-win32/bin:
       /tornado/host/x86-win32/lib/gcc-lib/i386-wrs-vxworks/cygnus-2.7.2-960126:
       /tornado/host/x86-win32/i386-wrs-vxworks/bin:
       /ace/ace_wrappers/bin:
@@ -2036,7 +2122,8 @@ on Windows NT hosts:
       </pre>
 
       Other environment variables:<p>
-      </p><pre>      WIND_BASE=/tornado
+      <pre>
+      WIND_BASE=/tornado
       SHELL=/bin/sh.exe
       TERM=pcbios
       TAO_ROOT=/ace/ACE_wrappers.vxworks/TAO
@@ -2046,13 +2133,14 @@ on Windows NT hosts:
       ACE_ROOT=/ace/ACE_wrappers.vxworks
       </pre>
 
-  </li><li><code>/tornado</code> is the root of the Tornado install
+  <li><code>/tornado</code> is the root of the Tornado install
       (<code>$WIND_BASE</code>).
 
-  </li><li><code>/gnuwin32</code> is the root of a Cygnus GNU download and install.
+  <li><code>/gnuwin32</code> is the root of a Cygnus GNU download and install.
 
-  </li><li><code>/bin</code> content is:<p>
-      </p><pre>      aced.dll
+  <li><code>/bin</code> content is:<p>
+      <pre>
+      aced.dll
       cygwin.dll
       perl.exe
       rm.exe
@@ -2065,27 +2153,30 @@ on Windows NT hosts:
 
       <code>cygwin.dll</code> is from the Cygnus GNU software download and install.
 
-  </li><li>Basically, follow documented procedure for ACE build/install on UNIX
+  <li>Basically, follow documented procedure for ACE build/install on UNIX
       platform.  Create a <code>$ACE_ROOT/ace/config.h</code> that looks
       like:<p>
-      </p><pre>      #include "config-vxworks5.x.h"
+      <pre>
+      #include "config-vxworks5.x.h"
       </pre>
 
       And create a
       <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code>
       that looks like:<p>
-      </p><pre>      WIND_BASE = /tornado
+      <pre>
+      WIND_BASE = /tornado
       WIND_HOST_TYPE = x86-win32
       CPU = I80486
       include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU
       </pre>
 
- </li><li>When using cygnus windows GNUTools on WinNT you have to start
+ <LI>When using cygnus windows GNUTools on WinNT you have to start
  make with "--unix" option, otherwise WinNT shell cmd.exe is responded and
  not sh.exe, i.e.,
- <pre> make --unix static_libs=1
- </pre>
-</li></ol>
+ <PRE>
+ make --unix static_libs=1
+ </PRE>
+</ol>
 
 <h5>TAO on NT Tornado host, VxWorks target.</h5>
 
@@ -2095,212 +2186,221 @@ on Windows NT hosts:
       Be sure to build ACE's gperf on NT, in
       <code>ACE_wrappers/apps/gperf/src</code>.<p>
 
-  </p></li><li>Build $TAO_ROOT/tao
-      <pre>      CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
+  <li>Build $TAO_ROOT/tao
+      <pre>
+      CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
       cd $TAO_ROOT/tao
       /gnuwin32/b18/H-i386-cygwin32/bin/make
       </pre>
 
-  </li><li>Build orbsvcs.
-      <pre>      CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
+  <li>Build orbsvcs.
+      <pre>
+      CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
       cd $TAO_ROOT/orbsvcs/orbsvcs
       /gnuwin32/b18/H-i386-cygwin32/bin/make
       </pre>
 
-  </li><li>Build $TAO_ROOT/tests<p>
-</p></li></ol>
+  <li>Build $TAO_ROOT/tests<p>
+</ol>
 
 
-<h4><a name="vxworks">�</a>
+<H4><A NAME="vxworks">&nbsp;</a>
 <a href="mailto:Jaffar_Shaikh@Mitel.COM">Jaffar Shaikh's</a>
-Notes for Building ACE and TAO for VxWorks on NT host</h4>
-<b></b><p><b>Scenario:</b>  I was building the ACE and TAO for VxWorks
+Notes for Building ACE and TAO for VxWorks on NT host</H4>
+<B><P>Scenario:</B>  I was building the ACE and TAO for VxWorks
 on NT. The target system was a PPC860 based chassis and another a NT
-host based card.</p>
-<b><p>Host System:</p>
-</b><p>NT 4.0 workstation with 128 M RAM, 266MHz Pentium.</p>
+host based card.</P>
+<B><P>Host System:</P>
+</B><P>NT 4.0 workstation with 128 M RAM, 266MHz Pentium.</P>
 
-<b><p>Software Needed For Building TAO</p>
-</b><p>1) PERL: Active State's ActivePerl 5.6.0.618 for NT available as
+<B><P>Software Needed For Building TAO</P>
+</B><P>1) PERL: Active State's ActivePerl 5.6.0.618 for NT available as
 freeware from
 http://www.ActiveState.com/download/contrib/Microsoft/NT/InstMsi.exe
-</p>
-
-<p>2) Tornado II .Release V 9904 from Windriver.</p>
-
-<p>3) Cygwin GNU to build TAO. It is available for NT as a freeware
-from </p>
-<p>http://www.cygwin.com/</p>
-<p>The Cygwin Make (version 3.75) can only build the TAO not the
-Tornado II make (version 3.74)</p>
-
-<b><p>Environment Variables:</p>
-</b><p>On NT the environment Variables are set as follows, (from
-Control Panel-&gt; System -&gt; Environment)</p>
-<p>I added following Environment variable entries to PATH </p>
-
-<p>C:\Perl\bin\;</p>
-<p>C:\tornado\host\x86-win32\bin;</p>
-<p>C:\tornado\host\x86-win32\powerpc-wrs-vxworks\bin;</p>
-<p>C:\tornado\host\x86-win32\lib\gcc-lib\powerpc-wrs-vxworks\cygnus-2.7.2-960126;</p>
-<p>C:\Corba\Ace_wrappers\bin;</p>
-<p>C:\Cygwin\bin;</p>
-<p>C:\Cygwin\usr\bin;</p>
-<p>C:\bin</p>
-
-<p>Additional Environmental variables and the values,</p>
-<p>CPU=PPC860</p>
-<p>LD_LIBRARY_PATH=</p>
-<p>SHELL=/bin/sh.exe</p>
-
-<p>ACE_ROOT=/Corba/ACE_wrappers</p>
-<p>WIND_BASE=/tornado</p>
-<p>SHELL=/bin/sh.exe</p>
-<p>TERM=pcbios</p>
-<p>TAO_ROOT=/Corba/ACE_wrapper/Tao</p>
-<p>CPP_LOCATION=/Program Files/Microsoft Visual Studio/VC98/Bin/CL.exe</p>
-<p>GCC_EXEC_PREFIX=/tornado/host/x86-win32/lib/gcc-lib/</p>
-<p>WIND_HOST_TYPE=x86-win32</p>
-<p>PERL_PATH=/perl/bin/perl.exe</p>
-
-<b><p>Directories of importance</p>
-</b><p>C:\Corba 	&lt;-- Ace_wrappers (uzipped)</p>
-<p>C:\tornado 	&lt;-- Tornado installed</p>
-<p>C:\Perl 	&lt;-- Perl installed</p>
-<p>C:\Cygwin  	&lt;-- Cygwin installed</p>
-<p>C:\bin        &lt;-- Copy these files,</p>
-<p>		 Ace.dll, 	&lt;-- After you build Ace</p>
-<p>		gperf.exe     	&lt;-- After you build gperf</p>
-<p>		Cygwin1.dll, 	&lt;-- After you install Cygwin</p>
-<p>		perl.exe,      	&lt;-- After you install Perl</p>
-<p>		rm.exe		&lt;-- After you install Cygwin</p>
-<p>		sh.exe		&lt;-- After you install Cygwin</p>
-<p>		true		&lt;-- After you install Cygwin</p>
-<b><p>Create Files</p>
-</b><p>1) C:\Corba\ACE_Wrappers\ace\config.h</p>
-<p>with entry</p>
-<p>#if defined (_MSC_VER) || (__BORLANDC__)</p>
-<p>	#include "ace/config-win32.h"</p>
-<p>	#undef ACE_HAS_EXCEPTIONS</p>
-<p>#else</p>
-<p>	#include "ace/config-vxworks5.x.h"</p>
-<p>	#define ACE_HAS_IP_MULTICAST </p>
-<p>#endif</p>
-
-<p>2) C:\Corba\ACE_wrappers\include\makeinclude\platform_macros.GNU</p>
-<p>WIND_BASE = /tornado</p>
-<p>WIND_HOST_TYPE = x86-win32</p>
-<p>include
-$(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU</p>
-<p>ACE_COMPONENTS=FOR_TAO (you may choose this option to build ACE
-library that supports TAO)</p>
-
-<p>�</p>
-<b><p>Steps to Build</p>
-</b><p>1) Build Ace.dll under NT</p>
-<p>In  MS Visual C++ open C:\Corba\ACE_wrappers\ace.dsw And build Ace
-DLL</p>
-<p>Copy Ace.dll in C:\bin</p>
-
-<p>2) Build gperf utility under NT</p>
-<p>In MS Visual C++ open
-C:\Corba\ACE_wrappers\apps\gperf\src\gperf.dsw. Build gperf.exe</p>
-<p>Copy gperf.exe to C:\bin</p>
-
-<p>3) Mount Directries in Cygwin</p>
-<p>Click on Cygnus Solutions -&gt; Cygwin Bash Shell</p>
-<p>Mount following directories by using mount command.</p>
-<p>create respective directories first then use mount command </p>
-
-<p>e.g. Create /Corba directory then use $mount -s "C:\Corba"
-/Corba</p>
-
-<p>C:\Corba  mount to /Corba</p>
-<p>C:\tornado mount to /tornado</p>
-<p>C:\Perl  mount to /perl</p>
-<p>C:\Cygwin  mount to /cygwin</p>
-<p>C:\bin  mount to /bin</p>
-<p>C:\Program Files mount to /Program Files </p>
-
-<p>4) Build ACE in Cygwin</p>
-<p>$cd /Corba/ACE_wrappers/ace </p>
-<p>$make static_libs=1</p>
-<p>This will build your ace library libACE.a for VxWorks. If you use
+</P>
+
+<P>2) Tornado II .Release V 9904 from Windriver.</P>
+
+<P>3) Cygwin GNU to build TAO. It is available for NT as a freeware
+from </P>
+<P>http://www.cygwin.com/</P>
+<P>The Cygwin Make (version 3.75) can only build the TAO not the
+Tornado II make (version 3.74)</P>
+
+<B><P>Environment Variables:</P>
+</B><P>On NT the environment Variables are set as follows, (from
+Control Panel-&gt; System -&gt; Environment)</P>
+<P>I added following Environment variable entries to PATH </P>
+
+<P>C:\Perl\bin\;</P>
+<P>C:\tornado\host\x86-win32\bin;</P>
+<P>C:\tornado\host\x86-win32\powerpc-wrs-vxworks\bin;</P>
+<P>C:\tornado\host\x86-win32\lib\gcc-lib\powerpc-wrs-vxworks\cygnus-2.7.2-960126;</P>
+<P>C:\Corba\Ace_wrappers\bin;</P>
+<P>C:\Cygwin\bin;</P>
+<P>C:\Cygwin\usr\bin;</P>
+<P>C:\bin</P>
+
+<P>Additional Environmental variables and the values,</P>
+<P>CPU=PPC860</P>
+<P>LD_LIBRARY_PATH=</P>
+<P>SHELL=/bin/sh.exe</P>
+
+<P>ACE_ROOT=/Corba/ACE_wrappers</P>
+<P>WIND_BASE=/tornado</P>
+<P>SHELL=/bin/sh.exe</P>
+<P>TERM=pcbios</P>
+<P>TAO_ROOT=/Corba/ACE_wrapper/Tao</P>
+<P>CPP_LOCATION=/Program Files/Microsoft Visual Studio/VC98/Bin/CL.exe</P>
+<P>GCC_EXEC_PREFIX=/tornado/host/x86-win32/lib/gcc-lib/</P>
+<P>WIND_HOST_TYPE=x86-win32</P>
+<P>PERL_PATH=/perl/bin/perl.exe</P>
+
+<B><P>Directories of importance</P>
+</B><P>C:\Corba &#9;&lt;-- Ace_wrappers (uzipped)</P>
+<P>C:\tornado &#9;&lt;-- Tornado installed</P>
+<P>C:\Perl &#9;&lt;-- Perl installed</P>
+<P>C:\Cygwin  &#9;&lt;-- Cygwin installed</P>
+<P>C:\bin        &lt;-- Copy these files,</P>
+<P>&#9;&#9; Ace.dll, &#9;&lt;-- After you build Ace</P>
+<P>&#9;&#9;gperf.exe     &#9;&lt;-- After you build gperf</P>
+<P>&#9;&#9;Cygwin1.dll, &#9;&lt;-- After you install Cygwin</P>
+<P>&#9;&#9;perl.exe,      &#9;&lt;-- After you install Perl</P>
+<P>&#9;&#9;rm.exe&#9;&#9;&lt;-- After you install Cygwin</P>
+<P>&#9;&#9;sh.exe&#9;&#9;&lt;-- After you install Cygwin</P>
+<P>&#9;&#9;true&#9;&#9;&lt;-- After you install Cygwin</P>
+<B><P>Create Files</P>
+</B><P>1) C:\Corba\ACE_Wrappers\ace\config.h</P>
+<P>with entry</P>
+<P>#if defined (_MSC_VER) || (__BORLANDC__)</P>
+<P>&#9;#include "ace/config-win32.h"</P>
+<P>&#9;#undef ACE_HAS_EXCEPTIONS</P>
+<P>#else</P>
+<P>&#9;#include "ace/config-vxworks5.x.h"</P>
+<P>&#9;#define ACE_HAS_IP_MULTICAST </P>
+<P>#endif</P>
+
+<P>2) C:\Corba\ACE_wrappers\include\makeinclude\platform_macros.GNU</P>
+<P>WIND_BASE = /tornado</P>
+<P>WIND_HOST_TYPE = x86-win32</P>
+<P>include
+$(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU</P>
+<P>ACE_COMPONENTS=FOR_TAO (you may choose this option to build ACE
+library that supports TAO)</P>
+
+<P>&nbsp;</P>
+<B><P>Steps to Build</P>
+</B><P>1) Build Ace.dll under NT</P>
+<P>In  MS Visual C++ open C:\Corba\ACE_wrappers\ace.dsw And build Ace
+DLL</P>
+<P>Copy Ace.dll in C:\bin</P>
+
+<P>2) Build gperf utility under NT</P>
+<P>In MS Visual C++ open
+C:\Corba\ACE_wrappers\apps\gperf\src\gperf.dsw. Build gperf.exe</P>
+<P>Copy gperf.exe to C:\bin</P>
+
+<P>3) Mount Directries in Cygwin</P>
+<P>Click on Cygnus Solutions -&gt; Cygwin Bash Shell</P>
+<P>Mount following directories by using mount command.</P>
+<P>create respective directories first then use mount command </P>
+
+<P>e.g. Create /Corba directory then use $mount -s "C:\Corba"
+/Corba</P>
+
+<P>C:\Corba  mount to /Corba</P>
+<P>C:\tornado mount to /tornado</P>
+<P>C:\Perl  mount to /perl</P>
+<P>C:\Cygwin  mount to /cygwin</P>
+<P>C:\bin  mount to /bin</P>
+<P>C:\Program Files mount to /Program Files </P>
+
+<P>4) Build ACE in Cygwin</P>
+<P>$cd /Corba/ACE_wrappers/ace </P>
+<P>$make static_libs=1</P>
+<P>This will build your ace library libACE.a for VxWorks. If you use
 option shared_libs=1 then the build will be libACE.so. The other
-options are same as follows.</p>
-
-<p>5) Build TAO in Cygwin</p>
-<p>$cd $TAO_ROOT/tao</p>
-<p>$make debug=0 optimize=1 static_libs_only=1 minimum_orb=1
-</p>
-<p>for shared libs use shared_libs=1</p>
-
-<p>The minimum Tao does not have following components,</p>
-<p>Dynamic Skeleton Interface</p>
-<p>Dynamic Invocation Interface</p>
-<p>Dynamic Any</p>
-<p>Interceptors</p>
-<p>Interface Repository</p>
-<p>Advanced POA features</p>
-<p>CORBA/COM interworking</p>
-
-<p>You may play around with above options to find suitable build for
+options are same as follows.</P>
+
+<P>5) Build TAO in Cygwin</P>
+<P>$cd $TAO_ROOT/tao</P>
+<P>$make debug=0 optimize=1 static_libs_only=1 minimum_orb=1
+</P>
+<P>for shared libs use shared_libs=1</P>
+
+<P>The minimum Tao does not have following components,</P>
+<P>Dynamic Skeleton Interface</P>
+<P>Dynamic Invocation Interface</P>
+<P>Dynamic Any</P>
+<P>Interceptors</P>
+<P>Interface Repository</P>
+<P>Advanced POA features</P>
+<P>CORBA/COM interworking</P>
+
+<P>You may play around with above options to find suitable build for
 your needs. For example when you give option debug=1 all the debug
 symbols will be created and the build will huge in size. The debug
-symbols are necessary when you want to debug your code.</p>
+symbols are necessary when you want to debug your code.</P>
 
 
-<hr>
-<h3><a name="svcsinstall">Building and Installing ACE Network Services</a></h3>
+<HR>
+<H3><A NAME="svcsinstall">Building and Installing ACE Network Services</A></H3>
 
-The following explains how to build the ACE <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE-netsvcs.html">network services</a> on <a href="#unixsvcs">UNIX</a> and <a href="#win32svcs">Win32</a>.
+The following explains how to build the ACE <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">network services</A> on <A
+HREF="#unixsvcs">UNIX</A> and <A HREF="#win32svcs">Win32</A>.
 
-<p></p><hr align="left" width="50%"><p>
-</p><h4><a name="unixsvcs">Building and Installing ACE Network Services on UNIX</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="unixsvcs">Building and Installing ACE Network Services on UNIX</A></H4>
 
 Building and installing ACE Network Services on UNIX is relatively
-simple (the <a href="#win32svcs">process</a> for Win32 is different).
-Here's what you need to do:<p>
+simple (the <A HREF="#win32svcs">process</A> for Win32 is different).
+Here's what you need to do:<P>
 
-</p><ol>
+<OL>
 
-  <li>Build and install ACE on UNIX as described <a href="#unix">earlier</a>.  If ACE is built at the root of the ACE
+  <LI>Build and install ACE on UNIX as described <A
+      HREF="#unix">earlier</A>.  If ACE is built at the root of the ACE
       source tree (and ACE has been ported to your platform, of course) the
       netsvcs static and shared object libraries should be built
       automatically.  In addition, the server driver program
-      (<code>main</code>) contained in <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/netsvcs/servers/main.cpp">$ACE_ROOT/netsvcs/servers/main.cpp</a>
-      should also be compiled and ready to run.<p>
+      (<CODE>main</CODE>) contained in <A
+      HREF="netsvcs/servers/main.cpp">$ACE_ROOT/netsvcs/servers/main.cpp</A>
+      should also be compiled and ready to run.<P>
 
-  </p></li><li>Set your <code>LD_LIBRARY_PATH</code> environment variable to
+  <LI>Set your <CODE>LD_LIBRARY_PATH</CODE> environment variable to
       where the binary version of the ACE netsvcs library.  For
-      example, you probably want to do something like the following<p>
+      example, you probably want to do something like the following<P>
 
-      </p><pre><code>
+      <pre><code>
       % setenv LD_LIBRARY_PATH $ACE_ROOT/ace:$ACE_ROOT/lib:$LD_LIBRARY_PATH
-      </code></pre><p>
+      </code></pre><P>
 
-  </p></li><li>By default, if the shared object library is built, the services
-      are linked into the <code>main</code> driver program dynamically.
+  <LI>By default, if the shared object library is built, the services
+      are linked into the <CODE>main</CODE> driver program dynamically.
       To specify which services should be linked in and executed, edit the
-      <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/netsvcs/servers/svc.conf">$ACE_ROOT/netsvcs/servers/svc.conf</a>
+      <A
+      HREF="netsvcs/servers/svc.conf">$ACE_ROOT/netsvcs/servers/svc.conf</A>
       file.  During your editing, you should update information (such as the
       default service port numbers) that affects the initialization of
       services in this file.  Refer to the
-      <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ACE-papers.html#config">Service Configurator</a>
+      <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/%7Eschmidt/ACE-netsvcs.html">Network
-      Services</a> documentation to learn more about how to configure
-      each network service.<p>
+      addition, refer to the <A
+      HREF="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">Network
+      Services</A> documentation to learn more about how to configure
+      each network service.<P>
 
-  </p></li><li>If you only want to link the services statically, simply remove
-      or rename the svc.conf file.<p>
-</p></li></ol>
+  <LI>If you only want to link the services statically, simply remove
+      or rename the svc.conf file.<P>
+</OL>
 
-<p></p><hr align="left" width="50%"><p>
-</p><h4><a name="rtems">Building and Installing ACE on RTEMS</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="rtems">Building and Installing ACE on RTEMS</A></H4>
 
-<pre>export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP
+<PRE>
+export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP
 # setup the build structure
 cd ACE_wrappers
 
@@ -2347,85 +2447,92 @@ make -f  ../include/makeinclude/Makefile.rtems rtems_init.o
 make
 cd ../TAO
 make
-</pre>
+</PRE>
 
-<p></p><hr align="left" width="50%"><p>
-</p><h4><a name="win32svcs">Building and Installing ACE Network Services on Win32</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="win32svcs">Building and Installing ACE Network Services on Win32</A></H4>
 
 Once again, there are supplied project for MSVC 6.0 or later for
-the Network Services.<p>
+the Network Services.<P>
 
-</p><hr>
-<h3><a name="sslinstall">Building and Installing The ACE_SSL Library</a></h3>
+<HR>
+<H3><A NAME="sslinstall">Building and Installing The ACE_SSL Library</A></H3>
 
 <p>The first step for all platforms is to build and install the
-<a href="http://www.openssl.org/">OpenSSL</a> distribution.  The
-ACE_SSL library must then be built according to the instructions
+<A HREF="http://www.openssl.org/">OpenSSL</A> distribution.  Then the
+ACE_SSL library must be built according to the instructions
 below.</p>
 <h3>Unix</h3>
-<ol>
-  <li>Make sure the OpenSSL header file directory is in your compiler's
+<OL>
+  <LI>Make sure the OpenSSL header file directory is in your compiler's
       include path, and that OpenSSL libraries are in your library link/load
       path (e.g.
       <font face="Courier New, Courier, mono">LD_LIBRARY_PATH</font>). If you
       installed OpenSSL into a set of directories unknown by the compiler,
-      set the <code>SSL_ROOT</code> environment variable to point to the
-      top level directory of your OpenSSL distribution, i.e. the one
-      containing OpenSSL's <code>include</code> and <code>lib</code>
-      directories.</li>
-  <li>Add <code>ssl=1</code> to your MPC
-      <code>$ACE_ROOT/bin/MakeProjectCreator/config/default.features</code>
-      or <code>$ACE_ROOT/local.features</code> file, and re-run MPC to add
-      support for building the ACE_SSL library to your GNUmakefiles.
-  <li>Build ACE as described above. When building ACE, add
-      "<font face="Courier New, Courier, mono">ssl=1</font>"
+      then set the following variables in your
+      <font face="Courier New, Courier, mono">platform_macros.GNU</font>
+      file:
+    <P><table width="75%" border="0" align="center">
+      <tr>
+        <td><font face="Courier New, Courier, mono">PLATFORM_SSL_CPPFLAGS</font></td>
+        <td>Platform preprocessor options for OpenSSL (e.g. -I...)</td>
+      </tr>
+      <tr>
+        <td><font face="Courier New, Courier, mono">PLATFORM_SSL_LDFLAGS</font></td>
+        <td>Platform linker options for OpenSSL (e.g. -L...)</td>
+      </tr>
+      <tr>
+        <td><font face="Courier New, Courier, mono">PLATFORM_SSL_LIBS</font></td>
+        <td>Platform libraries required with OpenSSL (e.g. -lssl -lcrypto)</td>
+      </tr>
+    </table>
+    <br>
+  </LI>
+  <LI>Build ACE as described above. When building ACE, add
+      &quot;<font face="Courier New, Courier, mono">ssl=1</font>&quot;
       to your <font face="Courier New, Courier, mono">make</font>
       command line invocation, or add it to your
       <font face="Courier New, Courier, mono">platform_macros.GNU</font>
-      file.</li>
-  <li>Build the ACE_SSL library in the <tt>$ACE_ROOT/ace/SSL</tt>
-      directory. The <tt>ACE_ROOT</tt> environment variable should be set
+      file.</LI>
+  <li>Build the ACE_SSL library in the <TT>$ACE_ROOT/ace/SSL</TT>
+      directory. The <TT>ACE_ROOT</TT> environment variable should be set
       prior to this point.</li>
-</ol>
+</OL>
 <h3>Microsoft Visual Studio</h3>
 <ol>
-  <li>Set the <code>SSL_ROOT</code> environment variable to the location
-      of the directory containing the OpenSSL <code>inc32</code> and
-      <code>out32dll</code> directories.
-  <li>Add <code>ssl=1</code> to your MPC
-      <code>$ACE_ROOT/bin/MakeProjectCreator/config/default.features</code>
-      or <code>$ACE_ROOT/local.features</code> file, and re-run MPC to add
-      support for building the ACE_SSL library to your MSVC++
-      workspaces and projects.
+  <li>Set the OpenSSL include/header directory path under the
+      <b><i>Directories</i></b> tab - <i><b>Include Files</b></i> setting in
+      the <i><b>Tools-&gt;Options</b></i> dialog. A typical value would be
+      something like: <code>openssl-0.9.6\inc32</code></li>
+  <li>Set the OpenSSL library directory path under the
+      <b><i>Directories</i></b> tab - <i><b>Library Files</b></i> setting in
+      the <i><b>Tools-&gt;Options</b></i> dialog. A typical value would be
+      something like: <code>openssl-0.9.6\out32dll</code></li>
   <li>Open the <code>ACE.dsw</code> workspace, and refer to the ACE build
       and installation instructions above for details on creating a
       <code>config.h</code> configuration header for this platform.  Once
-      the <code>config.h</code> file has been created, build the
+      the <CODE>config.h</CODE> file has been created, build the
       <code>ACE_SSL</code> project.</li>
 </ol>
 <h3>Borland C++</h3>
-<p>Support for building ACE's ACE_SSL library and TAO's SSLIOP
-   pluggable protocol with Borland C++ does exist. 
-<ol>
-  <li>Set the <code>SSL_ROOT</code> environment variable to the location
-      of the directory containing the OpenSSL <code>inc32</code> and
-      <code>out32</code> directories.
-  <li>Add <code>ssl=1</code> to your MPC
-      <code>$ACE_ROOT/bin/MakeProjectCreator/config/default.features</code>
-      or <code>$ACE_ROOT/local.features</code> file, and re-run MPC to add
-      support for building the ACE_SSL library to your Borland C++ makefiles.
-  <li>Build ACE and TAO.
-</ol>
+<p>Support for building TAO's SSLIOP pluggable protocol with Borland C++
+   does exist. First get a patch for the Open SSL makefile from <A
+   HREF="http://www.tenermerx.com/tao_bcb/index.html">
+   http://www.tenermerx.com/tao_bcb/index.html</A>. Then build the OpenSSL
+   library. When you use the DLL version of ACE+TAO you have to build a DLL
+   version of OpenSSL. Then you must set the environment variable SSL_ROOT
+   to the location of your OpenSSL and then build ACE and TAO as normally.
 </p>
 
 
-<hr><p>
-</p><h3><a name="minimum_build">What Do I Need to Build for TAO?</a></h3>
+<HR><P>
+<H3><A NAME="minimum_build">What Do I Need to Build for TAO?</A></H3>
 Toshio Hori &lt;toshi@etl.go.jp&gt; provided these suggestions on building
 just what's needed for (a subset of) TAO:<p>
 
 I usually make:
-</p><pre>    $ACE_ROOT/ace,
+<pre>
+    $ACE_ROOT/ace,
     $ACE_ROOT/apps/gperf,
     $TAO_ROOT/tao,
     $TAO_ROOT/TAO_IDL, and
@@ -2436,72 +2543,75 @@ Pentium-III/550MHz, 256MB memory, 512MB swap machine.  (Top secret: I
 renice the 'make' process to the highest priority, -20... ;-)
 
 To save time and space, I set
-<pre>    TAO_ORBSVCS = Naming Time Trader ImplRepo
+<pre>
+    TAO_ORBSVCS = Naming Time Trader ImplRepo
 </pre>
-in <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code> also.  See
-<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/docs/configurations.html#orbsvcs">TAO's orbsvcs
+in $ACE_ROOT/include/makeinclude/platform_macros.GNU also.  See
+<a href="TAO/docs/configurations.html#orbsvcs">TAO's orbsvcs
 library customization instructions</a> for more information.<p>
 
 
-</p><hr><p> </p><h3><a name="resource_requirements">System Resource
-Requirements</a></h3> The amount of system resources required to build
+<HR><P> <H3><A NAME="resource_requirements">System Resource
+Requirements</A></H3> The amount of system resources required to build
 ACE and TAO varies greatly.  The required system resources are
 influenced by OS and compiler platform, build options, and component
 configurations.  As a rough guide, the typical peak memory requirement
-can be well over 512 MB (notably, for TAO's orbsvcs).  Depending on
+can be well over 256 MB (notably, for TAO's orbsvcs).  Depending on
 your OS and compiler configuration, an <strong>entire</strong> build
-of ACE and TAO can use well over 4 GB of disk space.  It's usually not
+of ACE and TAO can use well over 2 MB of disk space.  It's usually not
 necessary to build <strong>all</strong> of ACE and TAO, though.<p>
 
 Much less disk space is required for just the libraries.  For example,
-see the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-subsets.html#ACE%20Library%20Size%20Breakdown">ACE
-library subset sizes</a>.</p><p>
+see the <a href="docs/ACE-subsets.html#ACE Library Size Breakdown">ACE
+library subset sizes</a>.<p>
 
 If you run out of memory when building, you might consider trying
-some or all of these suggestions:</p><p>
-</p><ul>
-  <li>Enable or increase virtual memory.  If you're on a <a href="#Linux">Linux</a> or <a href="#LynxOS">LynxOS</a> platform,
+some or all of these suggestions:<p>
+<ul>
+  <li>Enable or increase virtual memory.  If you're on a <a
+    href="#Linux">Linux</a> or <a href="#LynxOS">LynxOS</a> platform,
     please see the appropriate sections above.<p>
-  </p></li><li>Disable/enable optimization and/or debugging.  See the
+  <li>Disable/enable optimization and/or debugging.  See the
     <a href="#flags">Makefile Flags</a> discussion for information
     on how to do that via ACE's Makefiles.<p>
-  </p></li><li>If you're using g++, try removing <code>-pipe</code> from
+  <li>If you're using g++, try removing <code>-pipe</code> from
     <code>CFLAGS</code> in your
     <code>include/makeinclude/platform_macros.GNU</code> file.<p>
-  </p></li><li>Restrict the components that you build.  For ACE and TAO, see the
+  <li>Restrict the components that you build.  For ACE and TAO, see the
     discussion of <code>ACE_COMPONENTS</code> in the
-    <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-subsets.html">ACE subsets</a> page.  For TAO's
+    <a href="docs/ACE-subsets.html">ACE subsets</a> page.  For TAO's
     orbsvcs, see the discussion of <code>TAO_ORBSVCS</code> in
-    <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/docs/configurations.html#orbsvcs">orbsvcs Library configuration information</a>.<p>
+    <a href="TAO/docs/configurations.html#orbsvcs">orbsvcs Library configuration information</a>.<p>
 
 If disk space is a problem, disabling debugging should greatly
 reduce object code, and therefore, library size.  This is especially
-true with g++.</p><p>
+true with g++.<p>
 
 Toshio Hori &lt;toshi@etl.go.jp&gt; provided these tips for reducing
-disk space usage:</p><p>
+disk space usage:<p>
 
 To save space on a Unix machine, I usually run
     'find . -name \*.dsw -o -name \*.dsp -o -name \*.bor | xargs rm -f'
 in $ACE_ROOT at first after I untar the distribution.  They are
 meaningless in my environment (Files named '*.dsw' and '*.dsp' are
 used for MSVC++ and files named '*.bor' are for Borland C++
-Builder.)</p><p>
+Builder.)<p>
 
 Finally, to save space, may want to run 'make clean' after 'make'.  It
 removes generated object files and leaves libraries/executables
 intact.  If you want to remove any of the libraries/executables, as
-well, try 'make realclean'.</p><p>
+well, try 'make realclean'.<p>
 
-</p></li></ul>
+</ul>
 
-<p></p><hr><p>
-</p><h3><a name="MPC">General MPC information</a></h3>
+<P><HR><P>
+<H3><A NAME="MPC">General MPC information</A></H3>
 
 If you are attempting to generate project files using MPC, and you get
 the following error message:<br>
 
-<pre>ERROR: Unable to find the MPC modules in /builds/ACE_wrappers/MPC.
+<pre>
+ERROR: Unable to find the MPC modules in /builds/ACE_wrappers/MPC.
 You can set the MPC_ROOT environment variable to the location of MPC.
 </pre>
 
@@ -2518,7 +2628,8 @@ anonymous CVS server and set your MPC_ROOT environment variable.</li>
 If you do not have access to the DOC Group CVS repository, you can check
 out MPC from the OCI anonymous CVS server using the following command.
 
-<pre>cvs -d :pserver:anonymous@anoncvs.ociweb.com:/cvs co MPC
+<pre>
+cvs -d :pserver:anonymous@anoncvs.ociweb.com:/cvs co MPC
 </pre>
 
 The README and USAGE files in the MPC directory are an up-to-date source
@@ -2532,89 +2643,50 @@ http://downloads.ociweb.com/MPC/</a>, however much of MPC has changed
 since it's writing.  It will be updated as newer versions of the
 TAO Developer's Guide is released.
 
-</p>
-<p>
-</p><h3><a name="eclipse">Working with ACE in Eclipse</a></h3>
-
-
-<p>
-The Eclipse CDT C++ development environment can be used to develop ACE applications. You can configure a new CDT project to build ACE using either a local source distribution or checking out ACE from CVS in Eclipse. These are the steps to create the CDT project to build ACE.
-</p>
-
-<p>
-<h4>To create an Eclipse project for ACE starting from CVS:</h4>
-<ol>
-<li>In the "CVS Repository Exploring" perspective, navigate to the module containing ACE.</li>
-<li>Checkout the module using "Check Out As" and select the "project configured using the New Project Wizard" option.</li>
-<li>Select "Standard Make C++ Project" for the project type.</li>
-<li>Follow the steps outlined above, up to the point of running make, for building ACE on your platform. Use "path_to_your_eclipse_workspace"/"project_name" as your $ACE_ROOT.
-<li>If you had to regenerate the makefiles using MPC, select the root folder for your poject and use the import wizard to add them to your project.</li>
-<li>Select the root folder for the project and use the "Create Make Target" wizard to setup the appropriate make command and options.</li>
-<li>Select the root folder and run "Build Make Target." This will build ACE.</li>
-</ol>
-</p>
-
-
-
-<p>
-<h4>To create an Eclipse project for ACE from a local source distribution:</h4>
-<ol>
-<li>Launch the "New Project Wizard" in Eclipse.</li>
-<li>Select "Standard Make C++ Project" for the project type.</li>
-<li>On the project name page, uncheck the "use default" location option and replace the default path with the path to your source distribution.</li>
-<li>Follow the steps, up to the point of running make, for building ACE on your platform.
-<li>If you had to regenerate the makefiles using MPC, select the root folder for your poject and use the import wizard to add them to your project.</li>
-<li>Select the root folder for the project and use the "Create Make Target" wizard to setup the appropriate make command and options.</li>
-<li>Select the root folder and run "Build Make Target." This will build ACE.</li>
-
-
-</ol>
-</p>
-
-</p>
-
-<hr><p>
-</p><h3><a name="advanced">Advanced Topics</a></h3>
-
-<ul>
-  <li><a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-porting.html">Porting ACE and TAO to a New OS Platform</a>
-  </li><li><a href="#Non-static%20Object%20Manager">Non-static ACE_Object_Manager</a>
-  </li><li><a href="#cloning">Cloning the Source Tree</a>
-  </li><li><a href="#mvs">Additional Build Tips for MVS</a>
-  </li><li><a href="#flags">Makefile Flags</a>
-  </li><li><a href="http://www.cs.wustl.edu/%7Elevine/CVS.html">Version Control</a>
-  </li><li><a href="http://www.cs.wustl.edu/%7Ecleeland/ace/makefile-hints.html">ACE Makefile hints</a>
-  </li><li><a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-SSL.html">ACE SSL effort</a>
-</li></ul>
-
-<p></p><hr align="left" width="50%"><p>
-</p><h4><a name="Non-static Object Manager">Non-static
-ACE_Object_Manager</a></h4> The ACE_Object_Manager can be instantiated
+<HR><P>
+<H3><A NAME="advanced">Advanced Topics</A></H3>
+
+<UL>
+  <LI><A
+      HREF="docs/ACE-porting.html">Porting ACE and TAO to a New OS Platform</A>
+  <LI><A HREF="#Non-static Object Manager">Non-static ACE_Object_Manager</A>
+  <LI><A HREF="#cloning">Cloning the Source Tree</A>
+  <LI><A HREF="#mvs">Additional Build Tips for MVS</A>
+  <LI><A HREF="#flags">Makefile Flags</A>
+  <LI><A HREF="http://www.cs.wustl.edu/~levine/CVS.html">Version Control</A>
+  <LI><A HREF="http://www.cs.wustl.edu/~cleeland/ace/makefile-hints.html">ACE Makefile hints</a>
+  <LI><A HREF="docs/ACE-SSL.html">ACE SSL effort</a>
+</UL>
+
+<P><hr align=left width="50%"><P>
+<H4><A NAME="Non-static Object Manager">Non-static
+ACE_Object_Manager</A></H4> The ACE_Object_Manager can be instantiated
 as a static object, can be instantiated on the stack of the main
 program thread, or can be explicitly instantiated and destroyed by the
 application with <code>ACE::init ()</code> and <code>ACE::fini
-()</code>.  The comments in the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/Object_Manager.h">header
+()</code>.  The comments in the <a href="ace/Object_Manager.h">header
 file, <code>ace/Object_Manager.h</code></a>, as well as Section 1.6.3 in
 <a href="http://www.riverace.com/docs">The ACE Programmer's Guide</a>
-provide more detail.<p>
+provide more detail.<P>
 
 <strong><blink><font color="#ff0000">NOTE:</font></blink></strong>
 Special requirements are imposed on applications if the
 ACE_Object_Manager is instantiated, by ACE, on the stack of the main
 thread.  This behavior is selected by defining
 <code>ACE_HAS_NONSTATIC_OBJECT_MANAGER</code> in
-<code>ace/config.h</code>.  Again, see the ACE Object_Manager <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/Object_Manager.h">header file,
+<code>ace/config.h</code>.  Again, see the ACE Object_Manager <a
+href="ace/Object_Manager.h">header file,
 <code>ace/Object_Manager.h</code></a> for more information.  One of
 these requirements is discussed here, because it is so important.
 Please note that <code>ACE_HAS_NONSTATIC_OBJECT_MANAGER</code> is
 defined in the distributed ACE <code>config.h</code> headers for
-VxWorks and Win32.</p><p>
+VxWorks and Win32.<p>
 
 The important requirement is that the program <strong>must</strong>
 declare its <code>main</code> function with two arguments, even if
 they're not used, and with <code>int</code> return type:
 
-</p><pre><code>
+<pre><code>
 int
 main (int, char *[])
 </code></pre>
@@ -2629,7 +2701,7 @@ Alternatively, this feature can be disabled by commenting out the
 difficult on VxWorks.  And, you'd either have to call static
 constructors and destructors manually or unload/load the program
 between runs.  On Win32, disabling the feature can possibly lead to
-shutdown difficulties.</p><p>
+shutdown difficulties.<p>
 
 <strong><blink><font color="#ff0000">WARNING:</font></blink></strong>
 <code>ACE_HAS_NONSTATIC_OBJECT_MANAGER</code> assumes that your
@@ -2639,11 +2711,11 @@ entry point something other than <code>main</code>, you'll need to
 construct and destroy the ACE_Object_Manager.  The best way to do that
 is to call <code>ACE::init ()</code> and <code>ACE::fini ()</code>.
 Or, see the <code>#define</code> of <code>main (int, char *[])</code>
-in <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/OS.h"><code>ace/OS.h</code></a> to see how ACE does
+in <a href="ace/OS.h"><code>ace/OS.h</code></a> to see how ACE does
 that for entry points named <code>main</code>.
 
-</p><p></p><hr align="left" width="50%"><p>
-</p><h4><a name="cloning">Cloning the Source Tree</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="cloning">Cloning the Source Tree</A></H4>
 
 On UNIX platforms, we typically like to support multiple platform
 builds using the same ACE source tree.  This idiom is supported by ACE
@@ -2651,43 +2723,45 @@ using the $ACE_ROOT/bin/create_ace_build script or
 $ACE_ROOT/bin/clone.cpp program.
 
 To use build and use the clone program, first make sure there's a file
-called <code>platform_macros.GNU</code> that contains the correct platform-specific
-Makefile configurations in the <code>$ACE_ROOT/include/makeinclude/</code>
+called platform_macros.GNU that contains the correct platform-specific
+Makefile configurations in the $ACE_ROOT/include/makeinclude/
 directory, as well as making sure there's a $ACE_ROOT/ace/config.h
 file that includes the desired platform/compiler specific
-configuration header.  Then perform the following steps:<p>
+configuration header.  Then perform the following steps:<P>
 
-</p><pre>% cd $ACE_ROOT/bin
+<pre>
+% cd $ACE_ROOT/bin
 % make
 % mv clone ~/bin
 % rehash
-</pre><p>
+</pre><P>
 
 Then create a ./build subdirectory someplace, e.g., under $ACE_ROOT.
 Once this is done, then invoke the top-level Makefile with the
-"clone" target, e.g.:</p><p>
+&quot;clone&quot; target, e.g.:<P>
 
-</p><pre>% cd $ACE_ROOT
+<pre>
+% cd $ACE_ROOT
 % mkdir build-SunOS5
 % cd build-SunOS5
 % make -f ../Makefile clone
 % setenv ACE_ROOT $cwd
 % make
-</pre><p>
+</pre><P>
 
 This will establish a complete tree of links.  In addition, make sure
-you set your <code>LD_LIBRARY_PATH</code> to
-<code>$ACE_ROOT/ace:$ACE_ROOT/lib:$LD_LIBRARY_PATH</code> on SVR4 UNIX
-platforms.</p><p>
+you set your <CODE>LD_LIBRARY_PATH</CODE> to
+<CODE>$ACE_ROOT/ace:$ACE_ROOT/lib:$LD_LIBRARY_PATH</CODE> on SVR4 UNIX
+platforms.<P>
 
 When you do a make in the $ACE_ROOT directory you will be producing
 object code that is not stored in the same place as the original
 source tree.  This way, you can easily build another platform in a
-parallel tree structure.</p><p>
+parallel tree structure.<P>
 
-<b> VERY IMPORTANT! </b></p><p>
+<B> VERY IMPORTANT! </B><P>
 
-If you use the "clone trick" discussed above, make sure that the
+If you use the &quot;clone trick&quot; discussed above, make sure that the
 symbolic links are correctly in place before starting the build.  In
 particular, if you plan to clone the tree, it is preferable to do so
 before you start a build procedure on the original tree.  This is
@@ -2697,7 +2771,7 @@ You would end up with links pointing to object files of another
 platform.  If you clone the tree after you've done a build on the
 original tree, make sure to remove all ".obj", ".shobj" and (any other
 files or directories) in all subdirectories before starting the build
-on your cloned tree.</p><p>
+on your cloned tree.<P>
 
 Alternatively, the perl script
 <code>ACE_wrappers/bin/create_ace_build</code> can be used to create
@@ -2706,24 +2780,24 @@ It filters out all but the necessary files, so the warning above does
 not apply.  See the comments at the top of the script itself for usage
 information.
 
-</p><p></p><hr align="left" width="50%"><p>
-</p><h4><a name="mvs">Additional Build Tips for MVS</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="mvs">Additional Build Tips for MVS</A></H4>
 
 For all intents and purpose, MVS OpenEdition (OE) is another flavor of
-UNIX, therefore, the instructions under <a href="#aceinstall">Building
-and Installing ACE on Unix</a> can be used along with the following
-additional tips:<p>
+UNIX, therefore, the instructions under <A HREF="#aceinstall">Building
+and Installing ACE on Unix</A> can be used along with the following
+additional tips:<P>
 
 You can get a copy of GNU make that has been ported to MVS OpenEdition from
-the <a href="http://www.s390.ibm.com/products/oe/index.html">IBM OpenEdition web site</a>.
+the <A HREF="http://www.s390.ibm.com/products/oe/index.html">IBM OpenEdition web site</A>.
 ACE's make scheme generates compile commands that have options and
 operands interspersed.  By default, the c89/cc/c++ compiler expects all options to
 precede all operands.  To get around this, you must set a special
 compiler environment variable (_CXX_CCMODE) to 1 which tells the compiler
-to allow options and operands to be interspersed.</p><p>
+to allow options and operands to be interspersed.<P>
 
-Note that the environment variable <code>LD_LIBRARY_PATH</code> is
-called <code>LIBPATH</code> on MVS.</p><p>
+Note that the environment variable <CODE>LD_LIBRARY_PATH</CODE> is
+called <CODE>LIBPATH</CODE> on MVS.<P>
 
 Shared objects are built a little different on MVS than on
 other UNIX implementations.  This has been accounted for in the makefiles
@@ -2733,7 +2807,7 @@ side-deck file and it must be included in subsequent link edits with
 application code.  For more information on this see the C/C++ MVS
 Programming Guide.  If you want to build your application statically,
 i.e., using libACE.a instead of libACE.so, you can set ACELIB to
-ACELIB_STATIC in platform_mvs.GNU.</p><p>
+ACELIB_STATIC in platform_mvs.GNU.<P>
 
 When the libACE.so file is built (via the MVS pre-linker and binder), you
 will get a rc=4 from the pre-linker.  This is ok.  This is due to some
@@ -2742,43 +2816,43 @@ link step.  Note, however, there shouldn't be any unresolved references
 from the binder (linkage editor).   You can get pre-link and link maps by
 uncommenting the PMAP and LMAP lines in the platform_mvs.GNU file.
 
-</p><p></p><hr align="left" width="50%"><p>
-</p><h4><a name="flags">Makefile Flags</a></h4>
+<P><hr align=left width="50%"><P>
+<H4><A NAME="flags">Makefile Flags</A></H4>
 
 GNU make provides many options to customize its operation.  See its
 documentation for more information.  One example is that for multi-cpu
-UNIX machines you will be able to build faster if you use:<p>
+UNIX machines you will be able to build faster if you use:<P>
 
-</p><pre><code>
+<pre><code>
 % make -j <em>n</em>
 </code></pre><p>
 
 which allows parallel compilation. The number <i>n</i> should
 typically be the number of CPUs.  It is likely that builds will be
 faster even on single-CPU UNIX machines with <code>make -j
-2</code>.</p><p>
+2</code>.<P>
 
 ACE further supports the following flags.  They can be enabled either
 on the command line, e.g., "make purify=1", or added to your
-<code>platform_macros.GNU</code>.  To disable the option, 
-set the flag to null,
+platform_macros.GNU.  To disable the option, set the flag to null,
 e.g., "make debug=".  Some flags support setting to 0 disable, e.g.,
 "make debug=0".  debug=1 is enabled in the platform files that are
-released with ACE.</p><p>
+released with ACE.<P>
 
 Please note that the effects of a flag may be platform specific.
 Also, combinations of certain flags may or may not be allowed on
 specific platforms, e.g., debug=1 opt=1 is supported by g++ but
-not all other C++ compilers.</p><p>
+not all other C++ compilers.<P>
 
 If you use Purify or Quantify:  purify or quantify <strong>must</strong>
 be on your <code>PATH</code>.  By default, ACE puts the Purify/Quantify
 caches below <code>/tmp</code>.  To override that, set the
 <code>PURE_CACHE_BASE_DIR</code> variable, either in your environment
 or on the <code>make</code> make command line, to the destination
-directory for your instrumented libraries.</p><p>
+directory for your instrumented libraries.<p>
 
-</p><pre>Flag             Description
+<PRE>
+Flag             Description
 ----             -----------
 debug            Enable debugging; see DCFLAGS and DCCFLAGS.
 exceptions       Enable exception handling (not supported by all platforms).
@@ -2830,7 +2904,7 @@ split            Build the library by first splitting up the ACE source
                    to 1 overrides debug to 0.
 
 Usually, users do not need to be concerned with make targets.
-Just enter "make" on the command line to build.  A few notable
+Just enter &quot;make&quot; on the command line to build.  A few notable
 targets are listed below.
 
 Target             Description
@@ -2840,60 +2914,51 @@ show_statics       Lists all static objects in object files built for
 show_uninit        Lists all uninitialized in object files built for
                      current directory.  Only supported for g++.
 
-</pre>
-<hr><p>
+</PRE>
+<HR><P>
 
-</p><hr><p>
-</p><h3><a name="power">Building from anonymous CVS</a></h3>
-If users are building from our <a href="http://cvs.doc.wustl.edu/anoncvs.html"> anon cvs </a> the
+<HR><P>
+<H3><A NAME="power">Building from anonymous CVS</A></H3>
+If users are building from our <a
+href="http://cvs.doc.wustl.edu/anoncvs.html"> anon cvs </a> the
 GNUmakefiles, and project files for building on various platforms will
 not be available. Users from anon cvs are expected to generate them
-using <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/MPC/README">MPC </a> before building ACE, TAO or
+using <a href="MPC/README">MPC </a> before building ACE, TAO or
 CIAO. We point out some suggestions below to get bootstrapped
-quickly.
+quickly. 
 
-<ul>
-  <li> Please see <a href="#MPC"> instructions </a> above to  download
-  MPC from anon cvs repository <p>
-  </p></li><li>Please make sure that you have <a href="http://www.perl.org/">
-  perl</a> installed, preferably perl
+<UL>
+  <LI> Please see <a href="#MPC"> instructions </a> above to  download
+  MPC from anon cvs repository <p>       
+  <LI>Please make sure that you have <a href="http://www.perl.org">
+  perl</a> installed, preferably perl 
   5.8 or higher. Users on Win32 based platforms are recommended to use
   <a href="http://www.activestate.com/Products/ActivePerl/"> Active
   State Perl </a>. We use active state perl without problems. We have
   ran into problems trying to use the cygwin version of perl on Win32
   based platforms. <p>
-  </p></li><li>If you just want to build ACE and associated tests, examples,
+  <LI>If you just want to build ACE and associated tests, examples,
   and associated utility libraries, we recommend that you do <p>
-  <code> $ACE_ROOT/bin/mwc.pl ACE.mwc </code> </p><p>
+  <CODE> $ACE_ROOT/bin/mwc.pl ACE.mwc </CODE> <p>
+  
+  from <CODE> $ACE_ROOT </CODE> to generate GNUmakefiles. Please use  
 
-  from <code> $ACE_ROOT </code> to generate GNUmakefiles. Please use
+  <CODE> $ACE_ROOT/bin/mwc.pl -type vc6 ACE.mwc </CODE> <p>
 
-  <code> $ACE_ROOT/bin/mwc.pl -type vc6 ACE.mwc </code> </p><p>
+  to generate VC6 project and workspace files. Please use <CODE>-type
+  vc71</CODE> to generate VC71 project and solution files. 
 
-  to generate VC6 project and workspace files. Please use <code>-type
-  vc71</code> to generate VC71 project and solution files.
+  <LI>If you want to build TAO+CIAO and its associated libraries
+  please see <a href="TAO/TAO-INSTALL.html"> TAO-INSTALL <a> and <a
+  href="TAO/CIAO/CIAO-INSTALL.html"> CIAO-INSTALL </a> for details. 
+</UL>
 
-  </p></li><li>If you want to build TAO+CIAO and its associated libraries
-  please see <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/TAO-INSTALL.html"> TAO-INSTALL </a><a> and </a><a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/CIAO/CIAO-INSTALL.html"> CIAO-INSTALL </a> for details.
-</li></ul>
+<HR><P>
 
-<hr><p>
-
-Back to the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE.html">ACE</a>
+Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</A>
 home page.
 
 
-
-
-</p><p>
-<!--<EM>
-Visitor #
-from
-<EM><br> -->
-
-<!-- hhmts start -->
-Last modified: Wed Aug 25 11:18:59 PDT 2004
-<!-- hhmts end -->
-
-
-</p></body></html>
+<!--#include virtual="/~schmidt/cgi-sig.html" -->
+</BODY>
+</HTML>
diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog
index d1685d6b5a1..51e110a9178 100644
--- a/ACEXML/ChangeLog
+++ b/ACEXML/ChangeLog
@@ -1,12 +1,3 @@
-Tue Aug 17 19:07:11 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* common/NamespaceSupport.cpp:
-
-	  Changed ACE_NEW_RETURN to use "NS_Node_T" instead of "struct
-	  NS_Node_T" --- the latter triggers a gcc 3.3 parser bug when
-	  used with the "new (std::nothrow)" version of ACE_NEW_RETURN.
-	  Fortunately, the "struct" is unnecessary.
-
 Sat Feb 21 23:51:25 2004  .  <.@isis.vanderbilt.edu>
 
         * common/Exception.h:
@@ -783,7 +774,3 @@ Wed Oct 23 17:27:14 2002  Krishnakumar B  <kitty@cs.wustl.edu>
           simpler. Removed try_grow_cdata() as it is no longer needed.
           Handle the case when the parser was accepting invalid character
           references().
-
-Local Variables:
-add-log-time-format: current-time-string
-End:
diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp
index 5e049ca9cd4..d89a02d8c51 100644
--- a/ACEXML/common/NamespaceSupport.cpp
+++ b/ACEXML/common/NamespaceSupport.cpp
@@ -32,7 +32,7 @@ int
 ACEXML_Namespace_Context_Stack::push (ACEXML_NS_CONTEXT *nsc)
 {
   struct NS_Node_T *temp = 0;
-  ACE_NEW_RETURN (temp, NS_Node_T, -1);
+  ACE_NEW_RETURN (temp, struct NS_Node_T, -1);
 
   temp->item_ = nsc;
   temp->next_ = this->head_;
diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h
index 5a55d6b7754..1693253b0db 100644
--- a/ACEXML/common/XML_Types.h
+++ b/ACEXML/common/XML_Types.h
@@ -23,7 +23,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Basic_Types.h"
 #include "ace/SString.h"
 #include "ace/Functor_String.h"
 
@@ -54,12 +53,11 @@ typedef char ACEXML_UTF8;
  * using the built-in conversion functions as they only perform simple
  * copy without any encoding conversion.
  */
-typedef ACE_TCHAR ACEXML_Char;
 # if defined (ACE_USES_WCHAR)
-//typedef ACEXML_UTF16 ACEXML_Char;
+typedef ACEXML_UTF16 ACEXML_Char;
 typedef ACE_WString ACEXML_String;
 # else
-//typedef ACEXML_UTF8 ACEXML_Char;
+typedef ACEXML_UTF8 ACEXML_Char;
 typedef ACE_CString ACEXML_String;
 # endif /* ACE_USES_WCHAR */
 
diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp
index d60a9b35c31..7eb09e744e4 100644
--- a/ACEXML/parser/parser/Parser.cpp
+++ b/ACEXML/parser/parser/Parser.cpp
@@ -2225,15 +2225,9 @@ ACEXML_Parser::parse_char_reference (ACEXML_Char *buf, size_t& len)
   if (!this->isChar (sum))
     return -1;
   int clen;
-#if defined (ACE_USES_WCHAR)
-#  if (ACE_SIZEOF_WCHAR == 2)    // UTF-16
+#if defined (ACE_USES_WCHAR)    // UTF-16
   if ((clen = ACEXML_Transcoder::ucs42utf16 (sum, buf, len)) < 0)
     return -1;
-#  elif (ACE_SIZEOF_WCHAR == 4)  // UCS 4
-  buf [0] = sum;
-  buf [1] = 0;
-  clen = 2;
-#  endif /* ACE_SIZEOF_WCHAR */
 
 #else                          // or UTF-8
   if ((clen = ACEXML_Transcoder::ucs42utf8 (sum, buf, len)) < 0)
diff --git a/ASNMP/ChangeLog b/ASNMP/ChangeLog
index 980b2e7a824..df494ddf3bb 100644
--- a/ASNMP/ChangeLog
+++ b/ASNMP/ChangeLog
@@ -1,9 +1,3 @@
-Fri Aug  6 08:14:12 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* asnmp/transaction.{h,cpp}: Added a get_handle() call to
-	  session.  Thanks to Geo Sebastian <geosebastian@onmobile.com>
- 	  for this fix.
-
 Fri May  7 14:42:22 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* tests/Counter_Test.cpp (TestCounter):
diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp
index 1396ea3e488..e7c703aa865 100644
--- a/ASNMP/asnmp/transaction.cpp
+++ b/ASNMP/asnmp/transaction.cpp
@@ -201,9 +201,3 @@ int transaction::send()
 }
 
 transaction_result::~transaction_result() {}
-
-ACE_HANDLE 
-transaction::get_handle () const 
-{
-  return session_.get_handle ();
-}
diff --git a/ASNMP/asnmp/transaction.h b/ASNMP/asnmp/transaction.h
index 98d5890913e..eba2d51f4bb 100644
--- a/ASNMP/asnmp/transaction.h
+++ b/ASNMP/asnmp/transaction.h
@@ -35,40 +35,37 @@ class ASNMP_Export transaction : public ACE_Event_Handler
   //       two SNMP agents. Uses SnmpTarget class to implement retry/timeout
 
 {
-  int retry_counter_;
-  transaction_result * result_;
+    int retry_counter_;
+    transaction_result * result_;
 
-public:
+ public:
   transaction(const Pdu& pdu, const UdpTarget& target, ACE_SOCK_Dgram& io);
   transaction(ACE_SOCK_Dgram& io);
   // constructor
   ~transaction();
   // destructor
 
-  int run();
-  int run(transaction_result *r); // Async interface, with callback object
-  // begin polling for values
+   int run();
+   int run(transaction_result *r); // Async interface, with callback object
+   // begin polling for values
 
-  int result(Pdu& pdu, char *comm_str = 0, ACE_INET_Addr *from_addr = 0);
-  // return pdu with result from agent after run() is completed rc = 0
-  // optionally get community str
+   int result(Pdu& pdu, char *comm_str = 0, ACE_INET_Addr *from_addr = 0);
+   // return pdu with result from agent after run() is completed rc = 0
+   // optionally get community str
 
-  virtual int handle_input (ACE_HANDLE fd);
-  // called by reactor when data is ready to be read in from OS memory
-  virtual int handle_timeout (const ACE_Time_Value &, const void *);
-  // used for resend in asynchronous run()
+   virtual int handle_input (ACE_HANDLE fd);
+   // called by reactor when data is ready to be read in from OS memory
+   virtual int handle_timeout (const ACE_Time_Value &, const void *);
+   // used for resend in asynchronous run()
 
-  int send();
-  // transmit buffer command to network...
+   int send();
+   // transmit buffer command to network...
 
-  const ACE_INET_Addr& get_from_addr() const;
-  // pre: handle_input called
-  // retrieve the sender's from address from the last pkt
+   const ACE_INET_Addr& get_from_addr() const;
+   // pre: handle_input called
+   // retrieve the sender's from address from the last pkt
 
-  ACE_HANDLE get_handle () const;
-  // Return session_ handle.
-
-private:
+ private:
   transaction(const transaction&);
   // disallow copy construction
 
diff --git a/ChangeLog b/ChangeLog
index d78a83d74af..eb54deb79b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3048 +1,32 @@
-Thu Sep 16 14:14:31 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* bin/MakeProjectCreator/config/event_serv.mpb:
-
-	  Changed to inherit from svc_utils.
-
-Thu Sep 16 12:36:29 2004  Steve Huston  <shuston@riverace.com>
-
-	* ace/POSIX_Proactor.{h cpp}: Change the SystemType enumerator value
-	  names to begin with ACE_. This avoids conflicts with other facilities
-	  that use an OS_ prefix.
-
-Thu Sep 16 09:22:08 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * ace/OS_NS_Thread.cpp:
-          In ACE_TSS_Cleanup::exit, defer deleting TSS objects
-          until it is no longer necessary to access the ACE_TSS_Cleanup
-          itself.  One of the objects to be deleted is a Thread_Exit
-          which may eventually cause (or at least allow) the deletion
-          of the ACE_TSS_Cleanup.
-          The original code worked like this but I changed it when
-          I added additional cleanup operations to the exit method.
-
-Thu Sep 16 08:14:14 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ace/Memory_Pool.cpp:
-        * ace/config-hpux-11.00.h:
-
-          Removed a bug workaround for aCC A.03.04.  It is no longer a
-          problem to specify other mmap base addresses when running
-          64-bit HP-UX applications.
-
-Thu Sep 16 07:47:09 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
-
-          Added a CUSTOM_TARGETS macro that will allow users to access
-          custom targets that can be generated with the use of the
-          'verbatim' clause in mpc files.
-
-Thu Sep 16 10:07:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * apps/Gateway/Peer/peer.mpc:
-        * apps/Gateway/Peer/svc.conf:
-        * apps/Gateway/Gateway/gateway.mpc:
-        * apps/Gateway/Gateway/svc.conf:
-
-          Changed MPC configuration to generate the correct makefiles/project
-          files for building a separate daemon executable and service object
-          shared library.
-          Changed service configurator files to use correct PATH specification.
-
-Thu Sep 16 08:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/os_limits.h:
-          Added special include for VxWorks, it defines _POSIX_TIMER_MAX
-          in time.h
-
-Thu Sep 16 08:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-cygwin32.h:
-          Added ACE_HAS_POSIX_SEM and ACE_LACKS_NAMED_POSIX_SEM
-
-        * ace/OS_NS_sys_mman.{h,inl}:
-          Moved include ace/os_include/sys/os_mman.h from inl to header
-          file, so that we get all the needed constants when building
-          with Cygwin and inlining disabled
-
-Thu Sep 16 07:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * m4/config_h.m4:
-          Removed ACE_HAS_CYGWIN32_SOCKET_H
-
-Thu Sep 16 07:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added the new orbsvcs libs
-
-Wed Sep 15 15:32:59 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added checks for fgetws and fputws.
-
-        * ace/OS_NS_stdio.h:
-        * ace/OS_NS_stdio.inl:
-
-          Added feature test macros ACE_LACKS_FGETWS and ACE_LACKS_FPUTWS
-          and disable wide character versions of fgets and fputs if they
-          are not present.  Thanks to Johnny Willemsen for reporting this
-          bug.
-
-Wed Sep 15 15:17:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/OS_NS_string.h:
-
-          Changed preprocessor conditional for the declaration of the wide
-          character version of strtok_r_emulation() to use ACE_WCHAR and
-          ACE_LACKS_WCSTOK instead of ACE_HAS_REENTRANT_FUNCTIONS.  Thanks
-          to Johnny Willemsen for reporting this bug.
-
-Wed Sep 15 11:41:53 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/ACE.cpp (set_handle_limit): Removed the
-
-          ACE_NOTREACHED (return 0);
-
-          and replaced it with
-
-          return 0;
-
-          Thanks to Martin Corino <mcorino@remedy.nl> for reporting this.
-
-Wed Sep 15 10:46:07 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * ace/Log_Msg.cpp:
-
-          Explicitly initialize a static int to zero to make it clear that
-          the initial value is important.
-
-Wed Sep 15 12:51:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * configure.ac:
-          Removed check for ACE_HAS_CYGWIN32_SOCKET_H, this is not needed
-          anymore
-
-Tue Sep 14 22:44:39 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * ace/Inet_Addr.cpp:
-
-          Fix for the problem reported by Charlie Duke, which is that
-          ACE_INET_Addr::string_to_addr cannot accept an address string
-          produced by ACE_INET_Addr::addr_to_string method. The output of
-          addr_to_string method is of the form "[ipv4]:port" while the
-          string_to_addr accepts "ipv4:port" i.e. cannot handle "[]".
-
-          The fix for this is not to include "[]" in
-          string_to_addr. Thanks to Charlie Duke <cduke at fvc dot com>.
-
-        * THANKS: Updated Charlie's email address.
-
-Tue Sep 14 15:02:05 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * NEWS:
-          Updated: TSS leak has been conquered.
-
-Tue Sep 14 11:07:25 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/Malloc_T.{h inl}: Added ACE_Cached_Allocator<>::pool_depth()
-          and ACE_Dynamic_Cached_Allocator<>::pool_depth(). Each returns the
-          number of items in the cache available for allocating. Thank you to
-          Jeff Jones <jjones@zonetrading.com> for this addition.
-
-        * tests/Cached_Allocator_Test.cpp: Added tests of the new pool_depth()
-          method.
-
-        * THANKS: Added Jeff Jones to the Hall of Fame.
-
-Tue Sep 14 11:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Dynamic_Service.h:
-          Doxygen improvement
-
-Tue Sep 14 10:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_icc.GNU:
-          Added support for the Intel 8.1 C++ Compiler
-
-Tue Sep 14 07:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added TAO/orbsvcs/orbsvcs/CosNaming_Skel to the list of projects
-          to build first.
-
-Mon Sep 13 19:09:23 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-        * m4/config_h.m4:
-
-          Changed to use ACE_CHECK_HAS_FUNC([scandir]) and get rid of
-          explicit definition, autoconf template macro, etc.
-
-Mon Sep 13 20:33:25 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Select_Reactor_Base.cpp: Changed the
-          ACE_Select_Reactor_Handler_Repository::open() method so that it
-          uses the generalized ACE::set_handle_limit() method to not lower
-          the handles, which caused problems for applications that want to
-          use small reactor sizes but not limit the number of handles in
-          the process.  Thanks to Eider Oliveira <eider at oliveira dot
-          gmail at com> for suggesting this.
-
-        * ace/ACE.cpp,
-          ace/ACE.h: Generalized ACE::set_handle_limit() so
-          it can be told not to lower the handle limit.
-
-Mon Sep 13 18:15:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ACE_wrappers/m4/platform.m4:
-
-          Added new ACE_FUNC_IOCTL_ARGTYPES macro, used to set
-          ACE_IOCTL_TYPE_ARG2.
-
-        * ACE_wrappers/ace/config-netbsd.h:
-
-          Added ACE_IOCTL_TYPE_ARG2 definition.
-
-        * ACE_wrappers/ace/OS_NS_stropts.h:
-        * ACE_wrappers/ace/OS_NS_stropts.inl:
-
-          Added feature test macro ACE_IOCTL_TYPE_ARG2 (which defaults to
-          int) so that ACE_OS::ioctl uses the same type as ::ioctl.  This
-          help avoid sign extension problems on 64 bit platforms that use
-          unsigned long.
-
-Mon Sep 13 15:52:04 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-        * ace/TSS_T.cpp:
-          Bugzilla Bug 1542 TSS Leak revisited.
-          The goal is for each thread's TSS object to be
-          deleted at thread exit time, and for the TSS
-          key itself to be released when:
-            the last thread stops using it, or
-            the ACE_TSS<X> (if any) is deleted
-          which ever comes *last*.
-
-Mon Sep 13 14:56:53 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * ace/RB_Tree.h (class ACE_RB_Tree):
-        * ace/RB_Tree.cpp:
-
-          Added a special constructor useful for providing a valid vtable
-          and allocator if the tree is reconstructed from shared
-          memory. Thanks to Lothar Werzinger for the patches.
-
-Mon Sep 13 12:49:22 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Alter the value of ACE_SIZEOF_WCHAR based
-          on whether or not __64BIT__ is set (4 if yes, 2 if no). See
-          /usr/include/sys/types.h for verification.
-
-        * apps/Gateway/Gateway/Connection_Handler.cpp: Add missing #include
-          "ace/OS_NS_string.h".
-
-Mon Sep 13 12:39:11 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/DLL_Manager.cpp: Added explicit template instantiations for
-          Wed Sep  8 17:13:41 2004  Steve Huston  <shuston@riverace.com>
-
-Mon Sep 13 06:50:46 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/dslogadmin_serv.mpb:
-
-          Changed to inherit from svc_utils.
-
-Mon Sep 13 12:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added TAO/orbsvcs/orbsvcs/CosNotification_Skel
-
-Mon Sep 13 10:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_icc.GNU:
-          When using the 8.0 compiler, disable certain warnings about padding
-
-Mon Sep 13 09:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_icc.GNU:
-          The intel compiler on Itanium is called icc, not ecc anymore
-
-Mon Sep 13 09:46:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.inl:
-          Fixed compile error in VxWorks specific code
-
-Mon Sep 13 09:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-icc-common.h:
-          Added ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-
-Mon Sep 13 09:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * configure.ac:
-          Added ACE_CHECK_LACKS_HEADERS for wchar.h.
-
-Mon Sep 13 09:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added TAO/orbsvcs/orbsvcs/CosNaming_Serv to the list of projects
-          to build first.
-
-Sun Sep 12 17:20:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/rteventlogadmin.mpb
-
-          Update *.mpb files to reflect new libraries.
-
-        * bin/MakeProjectCreator/config/dseventlogadmin.mpb
-        * bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb
-        * bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb
-        * bin/MakeProjectCreator/config/dslogadmin.mpb
-        * bin/MakeProjectCreator/config/dslogadmin_serv.mpb
-        * bin/MakeProjectCreator/config/dslogadmin_skel.mpb
-        * bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
-        * bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb
-        * bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb
-
-          Split Logging, Event Logging, and Notify Logging Services into
-          client stub, servant skeleton, and service implementation
-          libraries.
-
-        * bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb:
-        * bin/MakeProjectCreator/config/event_serv.mpb
-        * bin/MakeProjectCreator/config/event_skel.mpb
-
-          Updated dependencies.
-
-        * bin/MakeProjectCreator/config/ec_use_typed_events_skel.mpb:
-
-          Removed file, events skeleton w/typed events does not require
-          any additional dependencies.  They have been moved to _serv.
-
-Sun Sep 12 17:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.cpp (log):
-          In then handling of %Z replaced an ACE_NEW_RETURN with a
-          ACE_NEW_NORETURN, so that when allocation fails, we just do
-          a break instead of return. Seems this code was written before
-          the existence of ACE_NEW_NORETURN. This also fixes the crashing
-          of the Intel 8.0 C++ Compiler on Itanium on this file, no idea
-          why this caused a crash, that is one for Intel to sort out.
-
-Sat Sep 11 11:41:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/Gateway/Peer/Peer.cpp:
-        * apps/Gateway/Peer/peerd.cpp:
-          Added missing includes to fix compile problems in Cygwin build
-
-Fri Sep 10 22:54:55 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_server.mpb:
-        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb:
-
-          Added utils to the list of projects that are inherited.
-
-Sat Sep 11 00:49:39 2004  Olli Savia  <ops@iki.fi>
-
-        * ace/IOStream.h:
-          Changed NULL to 0 to silence compile time warning.
-
-Fri Sep 10 15:39:22 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/High_Res_Timer.{h inl cpp}: Added a new static method that
-          calculates the difference between two ACE_hrtime_t quantities.
-          Takes into account that the time counter may have wrapped around
-          between the start and end. Changed all time difference calculations
-          to use the new elapsed_hrtime() method.
-
-Fri Sep 10 13:53:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Time_Value.h:
-        * ace/Time_Value.inl:
-
-      Moved '#include "ace/Basic_Types.h"' from Time_Value.cpp to
-      Time_Value.h because it's needed there since ACE_UINT64 is
-      introduced (see below).
-
-Thu Sep 09 18:29:17 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Time_Value.h (msec):
-        * ace/Time_Value.inl (msec):
-
-          Even though MSVC++ 6 supports 64 bit integers, it does not
-          support the "long long" syntax.  Instead it supports its own
-          "__int64" built-in type.  Use "ACE_UINT64" instead of "unsigned
-          long long".  Fixes syntax errors exhibited by MSVC++ 6.
-
-Thu Sep  9 16:40:27 2004  Steve Huston  <shuston@riverace.com>
-
-        * apps/Gateway/Gateway/Connection_Handler.cpp:
-        * apps/Gateway/Gateway/Connection_Handler_Connector.cpp:
-        * apps/Gateway/Gateway/File_Parser.{h cpp}:
-        * apps/Gateway/Gateway/Gateway.cpp:
-        * apps/Gateway/Gateway/gatewayd.cpp:
-        * apps/Gateway/Peer/Options.{h cpp}:
-        * apps/Gateway/Peer/Peer.{h cpp}: Narrow/wide char fixes.
-
-        * apps/Gateway/Gateway/Options.h: Removed const char *connector_host()
-          method because it's not ever defined or referenced.
-
-        * apps/Gateway/Peer/peer.mpc: New project definition.
-
-Thu Sep  9 16:17:38 2004  Olli Savia  <ops@iki.fi>
-
-        * apps/JAWS3/jaws3/Templates.cpp:
-          Added explicit static template member instantiations.
-
-Thu Sep  9 05:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.cpp:
-          Implemented num_processors and num_processors_online for Cygwin
-
-Wed Sep  8 21:50:13 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * ace/Time_Value.h:
-        * ace/Time_Value.inl:
-
-          The change added in this checkin
-
-          Wed Sep  8 10:17:46 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-          should not be available on platforms that lacks long long.
-
-Wed Sep  8 17:13:41 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/DLL_Manager.{h cpp}: Added new private method,
-          ACE_DLL_Handle::get_dll_names().
-          This builds the list of names to try to dlopen() based on the
-          specified dll_name and the platform's prefix/suffix/decorator
-          configuration. It doesn't try to load anything and doesn't do any
-          search path games like ACE::ldfind(). All of the rules for locating
-          files based on environments and security policy are administered by
-          the OS. This just feeds names to try, allowing for example, svc.conf
-          to continue simply specifying base names like "ACE". This restores
-          basic OS functionality, such as the ability to load a DLL from the
-          same directory as the loading executable, as well as closing
-          potential security loopholes opened by ACE's scanning the search
-          path and passing absolute paths to dlopen().
-          ACE_DLL_Handle::open() now calls get_dll_names() for a list of names
-          to try unless ACE_MUST_HELP_DLOPEN_SEARCH_PATH is defined, in which
-          case it does the old ACE::ldfind() call and dlopen()s the
-          absolute path as it did before this change.
-
-          This also allows DLLs to load on wide-char non-Windows builds without
-          messing with the sprintf() format specs in Lib_Find.cpp.
-
-Wed Sep  8 10:17:46 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Time_Value.{h,inl} Added a new msec() method that uses
-          unsigned long long to compute the value to prevent overflow.
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting this.
-
-Wed Sep  8 08:15:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * tests/FIFO_Test.cpp
-          Fixed one of the failing tests under HPUX requires delay like AIX
-
-Wed Sep  8 08:15:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * tests/IOStream_Test.cpp
-          Sorry, I got the wrong header file yesterday; isspace() is defined in
-          ace/os_include/os_ctype.h  NOT  #include ace/OS_NS_ctype.h
-
-Tue Sep  7 16:39:28 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/dseventlogadmin.mpb
-        * bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
-        * bin/MakeProjectCreator/config/lifecycle.mpb
-        * bin/MakeProjectCreator/config/notifytest.mpb
-        * bin/MakeProjectCreator/config/rtnotify.mpb
-        * bin/MakeProjectCreator/config/time.mpb
-
-          Update *.mpb files to reflect new libraries.  In many cases this
-          required adding inheriting from additional base projects, as
-          libraries were being linked in because of naming -- which was
-          once the service implementation (and thus pulled in lots of
-          other libraries) and is now just the Naming client stubs.
-
-        * bin/MakeProjectCreator/config/ec_use_typed_events.mpb
-        * bin/MakeProjectCreator/config/ec_use_typed_events_skel.mpb
-        * bin/MakeProjectCreator/config/event.mpb
-        * bin/MakeProjectCreator/config/event_serv.mpb
-        * bin/MakeProjectCreator/config/event_skel.mpb
-        * bin/MakeProjectCreator/config/naming.mpb
-        * bin/MakeProjectCreator/config/naming_serv.mpb
-        * bin/MakeProjectCreator/config/naming_skel.mpb
-        * bin/MakeProjectCreator/config/notification.mpb
-        * bin/MakeProjectCreator/config/notification_serv.mpb
-        * bin/MakeProjectCreator/config/notification_skel.mpb
-        * bin/MakeProjectCreator/config/trading.mpb
-        * bin/MakeProjectCreator/config/trading_serv.mpc
-        * bin/MakeProjectCreator/config/trading_skel.mpc
-
-          Split Event, Naming, Notification, and Trading Services into
-          client stub, servant skeleton, and service implementation
-          libraries.
-
-Tue Sep  7 15:45:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * examples/IOStream/server/iostream_server.cpp
-          getpid() from ace/OS_NS_unistd.h actually used in both halves of
-          #ifdef #else #endif guard so the conditional arround the #include
-          is actually wrong and so has been removed.
-
-        * tests/IOStream_Test.cpp
-          isspace() used without #include ace/OS_NS_ctype.h, added this to
-          the guarded section where it is used.
-
-Tue Sep  7 07:08:26 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm:
-
-          As part of the -expand_env option, I moved some functionality out
-          of the ProjectCreator.pm and into this module which was only used
-          by this project creator.
-
-Tue Sep  7 06:41:27 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * include/makeinclude/rules.local.GNU:
-
-          Removed the if check for static_libs_only.  The STATIC_LINK_FLAG
-          option will be added to the LDFLAGS if static_link is set to 1.
-
-Mon Sep  6 10:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          When using VxWorks also include OS_NS_stdio.h
-
-Mon Sep  6 07:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS.h:
-          Removed include of sys/modem.h for HPUX, this is already done in
-          os_include/os_termios.h
-
-Fri Sep  3 15:53:19 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-sunos5.8.h: Added ACE_HAS_TIMEZONE. This may be
-          pertinent to previous Solaris versions, but I don't have any
-          to test on.
-
-Fri Sep  3 12:34:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/OS_NS_sys_mman.inl:
-
-          Removed redundant conditional used to disable madvise for WIN32
-          systems.  Instead use ACE_LACKS_MADVISE feature test macro.
-
-        * ace/config-win32-common.h:
-
-          Added ACE_LACKS_MADVISE definition.
-
-Fri Sep  3 15:10:22 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-5.x.h: Add ACE_HAS_TIMEZONE.
-
-        * ace/OS_NS_time.h: Include "ace/OS_NS_errno.h" - ACE_NOTSUP_RETURN
-          sets errno.
-
-Fri Sep  3 21:36:51 2004  Olli Savia  <ops@iki.fi>
-
-        * apps/drwho/File_Manager.cpp:
-          Use ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-          to check if explicit template instantiation is needed.
-          Thanks to Johnny Willemsen for informing me about this
-          macro.
-
-Fri Sep  3 20:02:20 2004  Olli Savia  <ops@iki.fi>
-
-        * ace/OS_NS_unistd.inl:
-          There is no need to check missing prototype since this has
-          already been taken care by os_unistd.h.
-
-        * ace/os_include/arpa/os_inet.h:
-        * ace/os_include/os_stdlib.h:
-        * ace/os_include/os_strings.h:
-        * ace/os_include/os_unistd.h:
-          To make things easier to maintain use new ACE_LACKS_xxx_PROTOTYPE
-          macros to check whether we need to declare missing function
-          prototype.
-
-        * ace/README:
-          Added new ACE_LACKS_xxx_PROTOTYPE macros
-
-        * ace/config-lynxos.h:
-          Modified to follow changes above.
-
-Fri Sep  3 19:35:48 2004  Olli Savia  <ops@iki.fi>
-
-        * ace/Log_Msg.h:
-          Removed broken macro redefinition code to prevent people
-          thinking that it actually works. Cleaned up #undef's.
-
-Fri Sep  3 19:30:18 2004  Olli Savia  <ops@iki.fi>
-
-        * ace/Global_Macros.h:
-          LynxOS no longer needs special macro handling.
-
-Fri Sep  3 19:13:24 2004  Olli Savia  <ops@iki.fi>
-
-        * apps/drwho/File_Manager.cpp:
-          LynxOS 3.x needs explicit template instantiation.
-
-Fri Sep  3 10:44:27 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/Process_Manager.cpp (append_proc): If the process_table_ needs
-          to be enlarged, make sure it's to a size greater than 0. If the
-          original size is 0, change it to DEFAULT_SIZE, else double it (as
-          was always done).
-          (resize): Changed to not shrink the process_table_ array. Primarily
-          to guard against changing it to 0, but also guards against having to
-          decide what to do with entries that won't fit in the new array.
-
-Fri Sep  3 07:43:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/DLL/test_dll.cpp:
-        * examples/Export/test.cpp:
-          Fixed for unicode builds
-
-Thu Sep  2 16:39:29 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-linux-common.h:
-        * ace/config-netbsd.h:
-
-          Changed to define ACE_HAS_TIMEZONE.
-
-        * ace/OS_NS_time.h:
-
-          Changed ace_timezone() to use ACE_HAS_TIMEZONE feature test
-          macro instead of OS-specific macros to determine whether to
-          use global timezone variable or the gettimeofday() function
-          to obtain the current timezone.
-
-        * configure.ac:
-
-          Changed to call ACE_VAR_TIMEZONE.
-
-        * m4/platform.m4:
-
-          Added new macro, ACE_VAR_TIMEZONE.  Sets new feature test macro
-          ACE_HAS_TIMEZONE if platform supports global timezone variable.
-
-Thu Sep  2 16:43:29 2004  Steve Huston  <shuston@riverace.com>
-
-        * m4/ace.m4: Added AM_CONDITIONAL for BUILD_EXCEPTIONS, BUILD_THREADS,
-          BUILD_ACE_CODECS, BUILD_ACE_FILECACHE, BUILD_ACE_OTHER,
-          BUILD_ACE_TOKEN, BUILD_ACE_UUID, BUILD_RWHO, BUILD_WFMO, and
-          BUILD_WINREGISTRY so the MPC 'requires' feature can properly weed
-          things out without configure- and build-time errors.
-
-Thu Sep  2 12:51:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Process_Manager_Test.cpp:
-
-          Changed commandline buildup of childprocesses to start with './'
-          for non-WIN32 platforms as with other tests.
-          By default test did not run on OpenVMS without this.
-
-Thu Sep  2 12:51:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-openvms.h:
-
-          Added ACE_LACKS_UNIX_SIGNALS since OpenVMS cannot use signals
-          in combination with PTHREAD.
-
-        * ace/Process.cpp:
-        * ace/Process_Manager.cpp:
-
-          Implemented alternatives in timed wait() functions for systems
-          with ACE_LACKS_UNIX_SIGNALS and !WIN32.
-
-Thu Sep  2 07:24:20 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/config/core.mpb:
-        * bin/MakeProjectCreator/templates/bor.mpd:
-
-          Switch the borland template over to use the INSTALL_THIS_TARGET
-          template value instead of a 'verbatim' section to do the same
-          thing.
-
-Thu Sep  2 09:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_gnuwin32_common.GNU:
-          With gcc 3.4.1 -mcpu is deprecated, but -mtune must be used
-
-Thu Sep  2 07:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/FaCE/FaCE.mpc:
-        * apps/FaCE/FaCENOACE.mpc:
-          Added missing Id tag
-
-Wed Sep  1 17:16:29 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/Reverse_Lock_T.inl:
-        * ace/Typed_SV_Message.inl: Added #include "ace/config-all.h" to get
-          missing macros (ACE_NOTSUP_RETURN, ACE_TRACE).
-
-        * apps/JAWS/clients/Caching/http_client.cpp:
-        * apps/JAWS/clients/Caching/http_handler.cpp:
-        * apps/JAWS/server/HTTP_Response.cpp:
-        * apps/JAWS/server/HTTP_Server.{h cpp}:
-        * apps/JAWS/server/IO.cpp:
-        * apps/JAWS3/jaws3/Task_Timer.cpp: Add missing includes.
-
-Wed Sep  1 12:32:31 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/OS_NS_Thread.inl (mutex_init):
-
-          Explicitly cast the unused returned value of an
-          ACE_ADAPT_RETVAL macro call to "void" to address a "right-hand
-          operand of comma has no effect" warning exhibited by GNU g++
-          3.4.x.  Thanks to Bogdan Jeram <bjeram at eso dot org> and
-          Paul Lew <paullew@cisco.com> for reporting the warning.
-
-Wed Sep  1 11:35:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/config_h.m4:
-
-          Removed ACE_UINT64_FORMAT_SPECIFIER autoheader template.  It
-          is now defined within ACE_CHECK_FORMAT_SPECIFIERS.
-
-        * m4/platforms.m4:
-
-          Added new macro ACE_CHECK_FORMAT_SPECIFIERS, which is used to
-          define preprocessor macros that overide the defaults provided
-          for size_t, ssize_t, ACE_INT64, and ACE_UINT64 *printf format
-          specifiers.  I don't think autoconf feature tests are possible,
-          especially if we ever hope to support cross compilation, but at
-          least this pulls everything into one place.
-
-Wed Sep  1 12:52:40 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
-
-          Split out the ACE specific portion of AutomakeWorkspaceCreator.pm
-          into a new helper module.  The helper module is dynamically loaded
-          in by the AutomakeWorkspaceCreator.
-
-Wed Sep  1 10:01:57 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/SOCK_Dgram_Bcast.cpp:
-
-          Added !defined(__NetBSD__) to conditional so sockaddr.sa_len
-          version of the code will be used.  Fixes SOCK_Bcast_Dgram_Test
-          failures.
-
-        * ace/Sock_Connect.cpp:
-
-          Added !defined(__NetBSD__) to conditional so sockaddr.sa_len
-          version of the code will be used.
-
-Wed Sep  1 12:40:28 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Changed the ACE_HAS_3_PARAM_WCSTOK test to
-          include _XOPEN_SOURCE >= 500, not == 500. Fixes compile error
-          on AIX 5.2.
-
-Wed Sep  1 12:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Dump_T.cpp:
-          Added include of config-all.h to get ACE_TRACE
-
-Wed Sep  1 07:43:46 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * tests/Message_Queue_Notifications_Test.cpp (producer): Fixed
-          this test so it works with the changes to
-          ACE_Message_Queue::is_full_i() below.  Thanks to Rick Robinson
-          for this fix, as well.
-
-        * ace/Message_Queue_T.inl: Changed the implementation of
-          is_full_i() so the comparision operator is >= rather than >,
-          which makes it possible to use a 0 high water mark to disable
-          the enqueue side of the queue.  Thanks to Rick Robinson
-          <rick@oyarsa.com> for reporting this.
-
-        * ace/POSIX_Proactor.h: Updated the documentation to use
-          the right names for ACE_POSIX_SIG_Proactor and
-          ACE_POSIX_AIOCB_Proactor.  Thanks to John D. Robertson
-          <john@rrci.com> for motivating this fix.
-
-Wed Sep  1 07:00:39 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/config/global.features:
-
-          Disable the wince feature setting.
-
-        * apps/FaCE/FaCE.mpc:
-        * apps/FaCE/FaCENOACE.mpc:
-
-          Adding mpc files to replace the vcp files.  These projects will
-          only build on wince so they require the wince feature which is
-          disabled by default.
-
-        * apps/FaCE/FaCE.vcp:
-        * apps/FaCE/FaCE.vcw:
-        * apps/FaCE/FaCENOACE.vcp:
-        * apps/FaCE/FaCENOACE.vcw:
-
-          Removed these files.
-
-Wed Sep  1 06:48:34 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc:
-
-          With the current version of MPC, we must specify the exename for
-          this project.  MPC no longer automatically determines that
-          ACE_TMAIN is the entry point.
-
-Wed Sep  1 10:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-hpux-11.00.h:
-          Added several new defines, these are gathered by comparing an
-          autoconf generated config.h and the original file. It seems HPUX
-          has much more stuff than we currently use. Everything is tested
-          on HPUX 11i v2, maybe it breaks older versions, I don't think so
-          but if it will, our daily builds will trigger this and we have
-          to make the defines than dependent on the HPUX version. Added are:
-          ACE_HAS_NEW_NO_H, ACE_HAS_AUTOMATIC_INIT_FINI,
-          ACE_HAS_LONG_MAP_FAILED, ACE_HAS_MEMCHR,
-          ACE_HAS_POSITION_INDEPENDENT_POINTERS, ACE_HAS_POSIX_GETPWNAM_R,
-          ACE_HAS_P_READ_WRITE, ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS,
-          ACE_LACKS_PRI_T, ACE_HAS_SIG_C_FUNC, ACE_HAS_SIGSUSPEND,
-          ACE_HAS_SOCKLEN_T, ACE_HAS_SYS_ERRLIST, ACE_HAS_VOIDPTR_MMAP,
-          ACE_HAS_VOIDPTR_SOCKOPT, ACE_HAS_GETRUSAGE_PROTOTYPE, ACE_HAS_TIMOD_H,
-          ACE_HAS_SYS_XTI_H, ACE_HAS_PTHREAD_RESUME_NP. If you don't agree to
-          one of these defines, let us know, then we also have some work on
-          the autoconf support, because autoconf gave info all these can be
-          setup.
-
-Wed Sep  1 07:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Synch_Options.cpp:
-        * ace/Shared_Object.cpp:
-        * ace/Read_Buffer.cpp:
-        * ace/SV_Message.inl:
-          Added include of config-all.h to get ACE_TRACE
-
-Tue Aug 31 12:18:01 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-
-          Moved ACE_HAS_PENTIUM into "defined(__i386__)" conditional.
-
-Tue Aug 31 14:38:19 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_errno.h:
-        * ace/os_include/os_errno.h: Include config-lite.h instead of
-          config-all.h to minimize re-includes.
-
-        * ace/OS_NS_errno.inl: Include config-all.h to pick up ACE_TRACE.
-
-Tue Aug 31 08:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-hpux-11.00.h:
-          Added ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION for the HP aCC
-          compiler
-
-Tue Aug 31 08:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_time.cpp:
-          When ACE_LACKS_NATIVE_STRPTIME is defined, include
-          os_include/os_ctype.h to get isdigit
-
-Tue Aug 31 00:21:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-unixware-7.1.0.h:
-        * ace/config-unixware-7.1.0.udk.h:
-
-          Removed vestigial ACE_HAS_LAZY_V definition.
-
-Tue Aug 31 00:17:45 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-unixware-7.1.0.h:
-        * ace/config-unixware-7.1.0.udk.h:
-
-          Removed vestigial ACE_HAS_IOMANIP_NO_H definition.
-
-Mon Aug 30 23:57:58 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-        * ace/config-unixware-7.1.0.h:
-        * ace/config-unixware-7.1.0.udk.h:
-
-          Removed vestigial ACE_HAS_SYS_IOCTL_H definition.  ACE now uses
-          ACE_LACKS_SYS_IOCTL_H.
-
-        * ace/config-integritySCA.h:
-
-          Removed vestigial ACE_LACKS_SYS_FILE_H definition.
-
-        * ace/config-integritySCA.h:
-        * ace/config-psos-diab-mips.h:
-        * ace/config-qnx-neutrino.h:
-        * ace/config-rtp-62x.h:
-        * ace/config-rtp-pre62x.h:
-
-          Removed vestigial ACE_LACKS_RPC_H definition.
-
-Mon Aug 30 23:47:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added check for ACE_LACKS_TOWLOWER and ACE_LACKS_TOWUPPER.
-
-Mon Aug 30 23:39:33 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Changed check for libc.h and osfcn.h to not export a feature
-          test macro definition, as the results are only needed within
-          the configure script itself.
-
-Mon Aug 30 23:28:03 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-macos.h:
-        * ace/config-macos-panther.h:
-
-          Removed vestigial ACE_HAS_PTHREAD_CANCEL and ACE_HAS_PTHREAD_KILL
-          definitions.
-
-Mon Aug 30 23:18:51 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-linux-common.h:
-        * ace/config-openbsd.h:
-
-          Removed vestigial ACE_HAS_MKSTEMP definition.  ACE now uses
-          ACE_LACKS_MKSTEMP.
-
-Mon Aug 30 22:39:24 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/TSS_Test.cpp:
-
-          Changed the number of iterations from 100 to 25 so the test will
-          run on systems with pthreads with the minimum required number of
-          thread keys (128).  This should still be sufficient to check the
-          TSS wrappers without exceeding the minimum requirements.
-
-Mon Aug 30 18:31:28 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-
-          Add ACE_SSIZE_T_FORMAT_SPECIFIER and ACE_SIZE_T_FORMAT_SPECIFIER
-          definitions for NetBSD/amd64.
-
-        * netsvcs/clients/Logger/Makefile.am:
-        * netsvcs/clients/Naming/Client/Makefile.am:
-        * netsvcs/clients/Naming/Dump_Restore/Makefile.am:
-        * netsvcs/servers/Makefile.am:
-
-          Fix the _LDADD definitions that MPC doesn't get right yet.
-
-        * configure.ac:
-
-          Added checks for: ACE_LACKS_STRCHR, ACE_LACKS_STRCSPN,
-          ACE_LACKS_STRERROR, ACE_LACKS_STRPBRK, ACE_LACKS_STRSPN,
-          ACE_LACKS_STRTOD, ACE_LACKS_STRTOL, ACE_LACKS_STRTOUL,
-          and ACE_LACKS_SWAB.
-
-          Added check for ACE_HAS_STRNLEN.
-
-          Added checks for: ACE_LACKS_ARPA_INET_H, ACE_LACKS_DIRENT_H,
-          ACE_LACKS_DLFCN_H, ACE_LACKS_ERRNO_H ACE_LACKS_FCNTL_H,
-          ACE_LACKS_NET_IF_H, ACE_LACKS_NETDB_H, ACE_LACKS_NETINET_IN_H,
-          ACE_LACKS_SEARCH_H, ACE_LACKS_SEMAPHORE_H, ACE_LACKS_SIGNAL_H,
-          ACE_LACKS_STDLIB_H, ACE_LACKS_STRING_H, ACE_LACKS_STRINGS_H,
-          ACE_LACKS_SYS_IOCTL_H, ACE_LACKS_SYS_IPC_H, ACE_LACKS_SYS_MMAN_H,
-          ACE_LACKS_SYS_RESOURCE_H, ACE_LACKS_SYS_SEM_H, ACE_LACKS_SYS_SHM_H,
-          ACE_LACKS_SYS_SOCKET_H, ACE_LACKS_SYS_STAT_H, ACE_LACKS_SYS_TIME_H,
-          ACE_LACKS_SYS_UN_H, ACE_LACKS_SYS_WAIT_H, ACE_LACKS_TERMIOS_H, and
-          ACE_LACKS_TIME_H.
-
-          Removed checks for ACE_HAS_SYS_IOCTL_H.
-
-Mon Aug 30 17:38:22 2004  Steve Huston  <shuston@riverace.com>
-
-        Changes that get PocketPC/WinCE back into a state where they build.
-
-        * ace/config-WinCE.h: Add ACE_LACKS_ASSERT_H, ACE_LACKS_SEARCH_H,
-          and ACE_LACKS_WCHAR_H for WinCE 3.
-          Add ACE_LACKS_SWAB for all versions.
-
-        * ace/config-win32-msvc.h: Set (or clear) ACE_LACKS_RTTI based on
-          whether or not the compiler switch to enable rtti is used.
-
-        * ace/OS_Errno.{h inl}:
-        * ace/OS_NS_errno.{h inl}: Moved ACE_CE_Errno from OS_Errno to
-          OS_NS_errno. This seems like a more sensible place for an errno
-          replacement, and avoids having to add includes for OS_Errno.h to
-          a bunch of other files.
-
-        * ace/OS_NS_stdio.inl (rename): In the char* variant, always convert
-          the names to wide-char for WinCE.
-
-        * ace/OS_NS_stdlib.{h cpp inl}: Don't attempt ACE_OS::realpath() for
-          ACE_HAS_WINCE. It has no native support and there's no
-          ACE_OS::getcwd() to fake it with.
-
-        * ace/OS_NS_stropts.{h cpp}: The 9-arg version of ACE_OS::ioctl is
-          ok for WinCE, but the ACE_QoS one is disabled. Changed both files
-          to implement this. They were mismatched for CE.
-
-        * ace/OS_NS_sys_select.inl: Replace #include ace/os_include/os_errno.h
-          with ace/OS_NS_errno.h to pick up errno correctly across all
-          platforms.
-
-        * ace/OS_NS_sys_socket.cpp: Moved #endif closing #ifndef ACE_HAS_WINCE
-          to encompass join_leaf() to match what's done in the class decl.
-
-        * ace/OS_NS_sys_stat.inl (mkdir, stat): Added #include
-          "ace/OS_NS_macros.h" to get ACE_ADAPT_RETVAL.
-          For the char* mkdir() and stat(), CE needs to convert
-          the strings to wide-char.
-
-        * ace/OS_NS_time.h: Moved the day_of_week and month_name const
-          strings into the ACE_OS namespace, as OS_NS_time.cpp desires.
-
-        * ace/OS_NS_time.cpp: Removed the MT-only compile block around the
-          day_of_week and month_name arrays. As suspected by Don Hinton,
-          this is an incorrect condition.
-          Also added #include "ace/OS_NS_stdio.h" for ACE_HAS_WINCE, as the
-          ctime_r emulation needs it.
-
-        * ace/OS_NS_unistd.inl (unlink): Convert path to wide-char for WinCE.
-          (rmdir): RemoveDirectory() takes only 1 arg.
-          wide-char getcwd() is a NOTSUP for WinCE, as is the char* version.
-
-        * ace/Proactor.cpp: Add #include "ace/config-lite.h" since the
-          user config is needed to decide whether to compile this file.
-          Also remove 'tv' param name from the stubbed-out version of
-          run_event_loop(ACE_Time_Value&).
-
-Mon Aug 30 16:24:51 2004  Steve Huston  <shuston@riverace.com>
-
-        * NEWS: Noted that the wide-char stuff is done and autoconf is in
-          progress.
-
-Mon Aug 30 11:54:01 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/security.mpb:
-
-          Added missing "interceptors" and "corba_messaging" base
-          projects.
-
-        * bin/MakeProjectCreator/config/ssliop.mpb:
-
-          Added missing "interceptors" base project.
-
-Mon Aug 30 13:02:22 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/Basic_Types.h: Don't use sizeof() when defining ACE_SIZEOF_WCHAR.
-          Other code (e.g. ACEXML) in ACE uses ACE_SIZEOF_WCHAR in
-          preprocessor tests, so it needs to be a preprocessor constant.
-          If the config file doesn't set it, and on an XPG4 system, set
-          the size to 4. If it's wrong, Basic_Types_Test will catch it.
-
-        * tests/Basic_Types_Test.cpp: Remove the comment that says the check
-          for ACE_SIZEOF_WCHAR is pointless. It's now important.
-
-Mon Aug 30 10:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/amh.mpb:
-        * bin/MakeProjectCreator/config/ami.mpb:
-          Both use idlflags, so add taoidldefaults as base project
-
-Mon Aug 30 06:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/amh.mpb:
-          AMH is dependent on messaging and doesn't require ami
-
-Sun Aug 29 16:53:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * ace/config-linux-common.h:
-
-        Added '__GLIBC_MINOR__ < 2' test for setting ACE_POLL_IS_BROKEN
-        on Alpha platform.
-
-Fri Aug 27 11:40:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/ftrtevent.mpb:
-        * bin/MakeProjectCreator/portablegroup.mpb:
-
-          Changed to inherit from messaging.mpb.
-
-        * bin/MakeProjectCreator/rtsched.mpb:
-
-          Changed to inherit from svc_utils.mpb.
-
-Fri Aug 27 13:38:25 2004  Steve Huston  <shuston@riverace.com>
-
-        * netsvcs/clients/Naming/Client/Client_Test.cpp:
-        * netsvcs/clients/Naming/Client/main.cpp:
-        * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.{h cpp}:
-        * netsvcs/clients/Naming/Dump_Restore/main.cpp:
-        * netsvcs/servers/main.cpp:
-        * websvcs/lib/URL_Addr.cpp: Fix wide-char errors.
-
-Fri Aug 27 12:01:37 2004  Steve Huston  <shuston@riverace.com>
-
-        * netsvcs/lib/Client_Logging_Handler.cpp:
-        * netsvcs/lib/Log_Message_Receiver.{h cpp}:
-        * netsvcs/lib/Name_Handler.{h cpp}:
-        * netsvcs/lib/Server_Logging_Handler_T.{h cpp}:
-        * netsvcs/lib/TS_Server_Handler.{h cpp}:
-        * netsvcs/lib/TS_Clerk_Handler.{h cpp}: Correct Service Configurator
-          framework entrypoints (init(), etc.) to match ACE_TCHAR* instead of
-          char*. Also corrected char-width problems and naked text literals.
-
-        * ACEXML/parser/parser/Parser.cpp: Fixed uninitialized variable.
-
-Fri Aug 27 08:18:21 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * bin/footprint_stats.sh:
-
-          Fixed the path to the libraries. Thanks to Johnny for spotting
-          the error in the scoreboard.
-
-Fri Aug 27 10:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/security.mpb:
-          Security library uses valuetype, so added valuetype as base
-          project.
-
-Fri Aug 27 09:48:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.{h,cpp}:
-        * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp:
-          Fixed unicode build errors
-
-Fri Aug 27 09:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.{h,cpp,i}:
-        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.{h,cpp,i}:
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.{h,cpp}:
-          Fixed unicode build errors
-
-Fri Aug 27 09:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/loadbalancing.mpb:
-          Loadbalancing uses iorinterceptor, so added that as base
-
-Fri Aug 27 08:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Integrated ORTrefactor_2 branch into main. Previously the PortableServer
-        library was dependent on IORInterceptor, ObjRefTemplate and Valuetype,
-        this dependency has been removed. PortableServer doesn't use these libs
-        anymore, but IORInterceptor, ObjRefTemplate and Valuetype are now
-        dependent on PortableServer. This will reduce the size of corba servers
-        which don't use IORInterceptor, ObjRefTemplate and Valuetype.
-
-        This are the needed MPC changes. Without MPC this would have been a
-        hard job to change all makefiles by hand.
-
-        Fri Aug 20 13:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * bin/MakeProjectCreator/config/portableserver.mpb:
-                * tao/PortableServer.mpc:
-                  PortableServer is not dependent on ValueType anymore, so removed it
-                  as base project
-
-        Fri Aug 20 11:47:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * bin/MakeProjectCreator/config/iorinterceptor.mpb:
-                  When using iorinterceptor use portableserver and objreftemplate
-
-                * bin/MakeProjectCreator/config/objreftemplate.mpb:
-                  When using objreftemplate, you must use portableserver
-
-                * bin/MakeProjectCreator/config/portableserver.mpb:
-                  When using portableserver there is no need to use objreftemplate and
-                  iorinterceptor
-
-Fri Aug 27 07:40:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * ace/ace_wchar.h:
-
-        Fixed for broken OpenVMS build because of missing <cwchar>
-        and <cwctype> includes.
-
-Thu Aug 26 19:55:03 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Makefile.am:
-
-          Fixed thinko in last change.  CVS and .svn directories *and*
-          their contents must be pruned in install-local-data target.
-
-Thu Aug 26 19:37:10 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Makefile.am:
-
-          Changed dist-hook and install-local-data targets to skip .svn as
-          well as CVS directories to support subversion.
-
-Thu Aug 26 19:22:31 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Makefile.am:
-
-          Added If_Then_Else.h to HEADER_FILES.
-
-Thu Aug 26 11:53:26 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/Time_Value.h: Added extern "C++" around the ACE_Time_Value class
-          declaration for WinCE. This is a total hack that I hate, but I have
-          not been able to find any other way around it. The same code
-          worked before the great ACE_OS reorg, but I don't know what tickled
-          it to start misbehaving. Without the hack, eVC complains that
-          the operators are C functions and so can't return a class.
-
-        * ace/Dev_Poll_Reactor.{cpp h}: Inserted /**/ in #include directives
-          to silence MSVC warnings that the files are missing dependencies.
-
-Thu Aug 26 11:39:29 2004  Steve Huston  <shuston@riverace.com>
-
-        * ACEXML/common/XML_Types.h: Add #include "ace/Basic_Types.h" to
-          pick up ACE_SIZEOF_WCHAR.
-
-Thu Aug 26 12:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.cpp:
-          Tru64 also provides sysconf functionality to retrieve number
-          of cpu's. Implemented ACE_OS::num_processors() and
-          ACE_OS::num_processors_online() for Tru64 (Digital Unix)
-
-        * tests/OS_Test.cpp:
-          Corrected copy/paste error
-
-Thu Aug 26 11:54:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OS_Test.cpp:
-          Added test for ACE_OS::num_processors() and
-          ACE_OS::num_processors_online()
-
-Thu Aug 26 09:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          I know we are working on footprint, but stating that an entire
-          build of ACE/TAO could use more than 2MB of diskspace is an
-          understatement ;-). Updated this to could use more than 4GB of
-          diskspace, which is something we have seen on the 64 bit systems.
-          Also updated the peak memory usage from 256Mb to 512Mb, the
-          Notification Service is a very memory consuming services when
-          being build.
-
-Thu Aug 26 09:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Updated instructions to build SSL with Borland C++, no OpenSSL
-          patch is necessary anymore and now MPC must be used. Updated HPUX
-          supported platforms.
-
-Thu Aug 26 07:58:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * ace/config-linux-common.h:
-
-          Included check on defined(__alpha) for correctly setting 64 bit
-          format specifiers.
-
-        * examples/Threads/cancel.cpp:
-        * performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp:
-
-          Fixed 64 bit conversion warnings.
-
-Thu Aug 26 06:47:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Auto_Ptr.h:
-          Readded disappeared include of post.h
-
-Wed Aug 25 23:31:02 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * include/makeinclude/platform_linux.GNU:
-
-          Fixed an error caused by a misplaced newline in Rich's previous
-          commit.
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-
-          Brought over the following changes from OCITAO 1.3a.
-          Added -ladm to LIBS.  This is needed for SunOS 5.6 for
-          resolving symbols for regular expression processing (e.g.,
-          compile, step), and does not appear to cause a problem on
-          later version of SunOS.
-
-          Change directory that is argument to ld's '-R' to use the new
-          $ACE_ROOT/lib directory rather than $ACE_ROOT/ace.
-
-Wed Aug 25 21:10:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Fixed tipo introduced by:
-          Mon Aug 23 23:23:18 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-Wed Aug 25 17:33:47 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-
-          Removed ACE_NTRACE definition.  It slipped in again.
-
-Wed Aug 25 16:00:11 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * ace/Auto_Ptr.h:
-        * ace/Auto_Ptr.inl:
-
-          Added new ACE_Auto_Ptr which can be used more portably than
-          auto_ptr even with the ACE auto_ptr workarounds. Specifically,
-          this obviates the need for the ACE_AUTO_PTR_RESET macro, and
-          will have better performance than the pre-standard auto_ptr that
-          comes with VC6.
-
-Wed Aug 25 14:58:51 2004  Rich Seibel <seibel_r@ociweb.com>
-
-      * include/makeincludes/platform_linux.GNU:
-        Generalized the way the rt library is searched.  The
-        previous code did not find it on RedHat AS 3.0 for opteron.
-
-Wed Aug 25 14:49:11 2004  Rich Seibel <seibel_r@ociweb.com>
-
-        * ace/Basic_Types.h:
-        added __x86_64 to long double to satisy opteron.
-
-Wed Aug 25 11:15:33 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ACE-INSTALL.html:
-
-          Updated ACE_SSL library build notes to refer to MPC, i.e. the
-          proper way to add ACE_SSL support to GNUmakefiles and MSVC++
-          workspace/project files.  Thanks to Johnny for pointing out that
-          the documentation was out of date.
-
-          Wrap the "Last modified" line within an Emacs "hhtms" block to
-          allow Emacs to automatically update the date and time this file
-          was last modified.
-
-Wed Aug 25 11:46:49 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/os_include/sys/os_pstat.h: If ACE_HAS_SYS_PSTAT_H, include
-          <sys/param.h> and <sys/pstat.h> (not <time.h>) as directed by
-          HP-UX man page. HP-UX 11 is the only config that sets this.
-
-Wed Aug 25 08:46:02 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * include/makeinclude/wrapper_macros.GNU:
-
-          Fixed the ace_filecache misspelling.
-
-Wed Aug 25 08:38:29 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_unistd.inl (rmdir): Removed the ACE_USES_WCHAR case from
-          the char* version of this method.
-
-Wed Aug 25 09:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Minor updates to Cygwin notes
-
-Wed Aug 25 09:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_pstat.h:
-          Corrected incorrect doxygen file tag
-
-Wed Aug 25 08:47:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * ace/config-lite.h:
-
-          Introduced new macro ACE_HAS_PROCESS_SPAWN to be able to do
-          better checks for availability of subprocessing than is
-          possible with ACE_LACKS_FORK. See [Bug 1793].
-
-        * tests/MEM_Stream_Test.cpp:
-        * tests/Malloc_Test.cpp
-        * tests/SOCK_Dgram_Bcast_Test.cpp
-
-          Changed to use new ACE_HAS_PROCESS_SPAWN macro to test for
-          subprocessing capabilities. See [Bug 1793].
-
-Wed Aug 25 01:19:03 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add checks for ACE_HAS_SYS_PSTAT_H and ACE_HAS_SYS_LOADAVG_H.
-
-Wed Aug 25 08:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_hpux_aCC.GNU:
-          The warnings disabled in this file are for major version 03 of aCC
-          only (PA-RISC), for version 05 (Itanium), disable 1016 and 1031,
-          these are binary incompatible warnings.
-
-Wed Aug 25 07:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_loadavg.h:
-        * ace/os_include/sys/os_pstat.h:
-          New files to include sys/loadavg.h and sys/pstat.h when
-          ACE_HAS_SYS_LOADAVG_H and ACE_HAS_SYS_PSTAT_H is set
-
-        * ace/config-hpux-11.00.h:
-          HPUX has sys/pstat.h, so added define ACE_HAS_SYS_PSTAT_H
-
-        * ace/README:
-          Documented ACE_HAS_SYS_LOADAVG_H and ACE_HAS_SYS_PSTAT_H
-
-        * ace/OS.h:
-          Removed including of sys/pstat.h, it is really not needed here
-
-        * ace/OS_NS_unistd.cpp:
-          Instead of including sys/pstat.h include os_include/sys/os_pstat.h
-
-Wed Aug 25 07:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_hpux_aCC.GNU:
-          Changed CXXVERS to CXXMINORVERS and added CXXMAJORVERS,
-          we just compare minor version at this moment, but we really
-          should also check major vers soon, major version 3 is aCC
-          on PARISC, version 5 is on Itanium. Changed the way we
-          detect itanium to a portable way that works with all
-          HPUX versions.
-
-Tue Aug 24 19:59:18 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-
-          Fixed typo in last change, add back typedef for ACE_UINT64.
-
-Tue Aug 24 19:32:07 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-
-          Removed extraneous cruft left over from autoheader generated
-          file.  Added conditional support for NetBSD/AMD64.
-
-Tue Aug 24 15:03:22 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_Thread.inl (thread_mutex_init): Fixed wchar_t version to
-          pass a 0 sa value. Corrects the passing of the lock_type value
-          through to ACE_OS::mutex_init(), restoring behavior of recursive
-          mutexes.
-
-Tue Aug 24 14:07:22 2004  Steve Huston  <shuston@riverace.com>
-
-        Changes to improve the functionality of wide-char operation on
-        non-Windows platforms:
-
-        * ace/ace_wchar.h: If ACE_HAS_XPG4_MULTIBYTE_CHAR is defined, but not
-          ACE_HAS_WCHAR, set ACE_HAS_WCHAR.
-
-        * ace/ACE.cpp (timestamp): Use ACE_TCHAR for temp char arrays,
-          not char. If ACE_USES_WCHAR on non-Windows, use %ls for printf
-          strings, not %s.
-
-        * ace/ARGV.cpp (constructor): Replaced most of the body with a call
-          to ACE_OS::argv_to_string().
-
-        * ace/Basic_Types.h:
-        * ace/Cleanup.h:
-        * ace/Object_Manager_Base.h:
-        * ace/OS_NS_string.h:
-        * ace/os_include/os_float.h:
-        * ace/os_include/os_inttypes.h:
-        * ace/os_include/os_limits.h:
-        * ace/os_include/os_signal.h:
-        * ace/os_include/os_stdint.h:
-        * ace/os_include/os_stdlib.h:
-        * ace/os_include/os_time.h:
-        * ace/os_include/os_ucontext.h:
-        * ace/os_include/os_unistd.h:
-        * ace/os_include/sys/os_ipc.h:
-        * ace/os_include/sys/os_mman.h:
-        * ace/os_include/sys/os_msg.h:
-        * ace/os_include/sys/os_resource.h:
-        * ace/os_include/sys/os_select.h:
-        * ace/os_include/sys/os_sem.h:
-        * ace/os_include/sys/os_shm.h:
-        * ace/os_include/sys/os_socket.h:
-        * ace/os_include/sys/os_stat.h:
-        * ace/os_include/sys/os_statvfs.h:
-        * ace/os_include/sys/os_timeb.h:
-        * ace/os_include/sys/os_time.h:
-        * ace/os_include/sys/os_times.h:
-        * ace/os_include/sys/os_types.h:
-        * ace/os_include/sys/os_uio.h:
-        * ace/os_include/sys/os_un.h:
-        * ace/os_include/sys/os_utsname.h:
-        * ace/os_include/sys/os_wait.h: #include "config-lite.h" rather than
-          "config-all.h". Only need the user config.h and "lite" things.
-          Including config-all.h introduces a circular include
-          dependency from OS_main.h.
-
-        * ace/Default_Constants.h: Add ACE_LIB_TEXT() to ACE_DEFAULT_SVC_CONF
-          strings.
-
-        * ace/Env_Value_T.i (fetch_value): For non-Win32, force the env var
-          name to narrow-char then convert the result back to ACE_TCHAR.
-
-        * ace/FILE_Connector.cpp (connect): When generating a temp name,
-          convert it to ACE_TCHAR for ACE_FILE_Addr.
-
-        * ace/Get_Opt.cpp (constructor): When checking for POSIXLY_CORRECT,
-          must always use char *, not ACE_TCHAR*, on non-Win32.
-
-        * ace/High_Res_Timer.cpp: Added ACE_LIB_TEXT to naked string literals.
-          Use 'char' when it must be narrow char; ACE_TCHAR when it has to
-          change based on ACE_USES_WCHAR.
-
-        * ace/Lib_Find.cpp (ldfind, get_temp_dir): Environment variables on
-          non-Windows are always narrow char, so account for that.
-
-        * ace/Log_Msg_UNIX_Syslog.cpp: Operate internally with all narrow
-          chars because the underlying OS APIs are only narrow char.
-
-        * ace/Log_Msg.cpp (log): For 'D', 'M', 'm', 'N', and 'p', use the
-          proper 's' format code for the platform/char width. Similar to
-          Log_Record.cpp below.
-
-        * ace/Log_Msg.h (ACE_ASSERT): Convert __FILE__ name to proper char
-          width when necessary.
-
-        * ace/Log_Record.cpp: When formatting log strings, have to change
-          printf formats if using wide chars on non-Windows. Wide-char
-          strings are printed with %ls, whereas Windows uses %s for
-          wide-char strings if the format is wide-char.
-
-        * ace/Memory_Pool.cpp (ctor): Change backing_store_name to narrow
-          char when needed to pass it to sscanf().
-
-        * ace/Object_Manager_Base.cpp (print_error_message): Add
-          ACE_TEXT_ALWAYS_CHAR to the message arg to convert on wide-char
-          builds.
-
-        * ace/OS_main.h: For ACE_MAIN on non-Windows ACE_USES_WCHAR platforms,
-          convert the argv to wchar_t, and pass the wide-char strings to the
-          ACE_TCHAR[]-expecting real main program.
-
-        * ace/OS_NS_dirent.inl (opendir): Moved the const_cast-needing
-          VxWorks part to its own #elif section. Added ACE_TEXT_ALWAYS_CHAR
-          to the other invocation of ::opendir().
-
-        * ace/OS_NS_dlfcn.inl (dlerror, dlopen, dlsym): Corrected use of
-          narrow/wide-char.
-
-        * ace/OS_NS_stdio.inl (cuserid, fdopen, freopen): Don't use
-          ACE_TCHAR when a char is always needed.
-          (fgets, fputs, perror, puts): Changed to have both narrow- and
-          wide-char variants.
-          (checkUnicodeFormat): Use a platform-neutral 2-byte type to
-          read 2 bytes. Need a non-Windows 'whence' arg for fseek().
-          (vsprintf (wchar_t)): Added the non-Windows, XPG5 code for this to
-          use the XPG5 vswprintf() when equippped.
-
-        * ace/OS_NS_stdlib.{h inl cpp}:
-          (ACE_OS::mktemp() and mkstemp()): Changed to have both narrow-
-          and wide-char variants for the !ACE_LACKS_MKTEMP case.
-          Offering both for the ACE_LACKS_MKTEMP case is a low-return
-          use of time since the wide-char variant will probably never be used.
-          (strenvdup): Handle ACE_USES_WCHAR on non-Windows by converting
-          back and forth to narrow-char.
-          (system): On non-Windows, convert command line string to narrow-char.
-          (getcwd): Changed to have both narrow- and wide-char variants.
-
-        * ace/OS_NS_sys_stat.inl (creat, mkfifo): For non-Windows, convert
-          name to narrow-char when needed.
-          (lstat): Change from a single ACE_TCHAR-based interface to both
-          char* and wchar_t*.
-
-        * ace/OS_NS_time.inl (ctime, ctime_r): Corrected narrow/wide char
-          usage.
-
-        * ace/OS_NS_unistd.inl (truncate): For non-Windows, convert the path
-          to narrow-char when needed.
-          (realpath): Changed to have both narrow- and wide-char variants.
-
-        * ace/OS_NS_unistd.{h inl cpp}:
-          (rmdir): Changed to have both narrow- and wide-char variants.
-          (argv_to_string): Handle narrow and wide-char environment variables.
-          (fork_exec): Convert path and argv to narrow-char when needed.
-
-        * ace/Process.cpp (spawn): Convert argv, procname, env vars to narrow
-          char for non-Windows wide-char builds.
-
-        * ace/Process.i (setreugid): Convert user name to narrow char for
-          getpwnam().
-
-        * ace/Process_Mutex.cpp (ctor): Don't convert name to ACE_TCHAR for
-          ACE_SV_Semaphore case - it requires char*.
-
-        * ace/Process_Semaphore.cpp (ctor): Convert name to narrow char
-          for ACE_SV_Semaphore_Complex case.
-
-        * ace/Sock_Connect.cpp (get_bcast_addr):
-        * ace/SOCK_Dgram_Bcast.cpp (mk_broadcast): Host name needs to be
-          converted to narrow-char for wide-char builds.
-
-        * ace/SOCK_Dgram_Mcast.cpp (make_multicast_ifaddr): Interface name
-          needs to be converted to narrow-char for wide-char builds.
-
-        * ace/SV_Semaphore_Simple.{h,i,cpp}: Added wide-char versions of
-          the named constructor and open() methods. They forward to the
-          narrow-char versions.
-
-        * tests/Dirent_Test.cpp: Account for dirent's d_name is an ACE_TCHAR
-          when ACE_LACKS_STRUCT_DIR and a char* otherwise.
-
-        * tests/FIFO_Test.cpp: Change ACE_ALPHABET to char[].
-
-        * tests/Proactor_Test.cpp: Change complete_message from ACE_TCHAR
-          to char. This is easier to handle; as ACE_TCHAR, we'd need to
-          correct all the message block pointer adjustments to take the
-          charset width into account.
-
-        * tests/Log_Msg_Test.cpp:
-        * tests/MEM_Stream_Test.cpp:
-        * tests/Message_Queue_Test.cpp:
-        * tests/Pipe_Test.cpp:
-        * tests/Process_Manager_Test.cpp:
-        * tests/Process_Mutex_Test.cpp:
-        * tests/Process_Strategy_Test.cpp:
-        * tests/Signal_Test.cpp:
-        * tests/SOCK_Connector_Test.cpp:
-        * tests/SOCK_Dgram_Test.cpp:
-        * tests/SOCK_Send_Recv_Test.cpp:
-        * tests/SOCK_Test.cpp:
-        * tests/SV_Shared_Memory_Test.cpp: Char width correction.
-
-        * tests/Service_Config_Test.cpp:
-        * tests/Service_Config_Test.WCHAR_T.conf:
-        * tests/Service_Config_Test.WCHAR_T.conf.xml: Added WCHAR_T-coded
-          versions of the test input file and changed the test to use
-          them on non-Windows ACE_USES_WCHAR builds.
-
-        * tests/Test_Output.cpp (set_output): Handle env var and filepath
-          building correctly even on wide-char non-Windows builds.
-
-        * ACEXML/common/XML_Types.h: typedef ACEXML_Char as ACE_TCHAR, else
-          it doesn't match any char interfaces when wchar_t is not 2 bytes.
-
-        * ACEXML/parser/parser/Parser.cpp (parse_char_reference): Add the
-          case where wide-char is 4 bytes.
-
-        Also brought in this fix:
-        Mon Mar  8 15:52:33 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/POSIX_Proactor.cpp: Comment out the signal setup; this should
-          not be necessary and, indeed, is erroneous, at least on Linux.
-          It's commented out instead of removed in case further testing on
-          other platforms determines that it is needed sometimes.
-
-Tue Aug 24 10:22:18 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-linux-common.h: Added ACE_HAS_SCANDIR and a new
-          macro, ACE_SCANDIR_CMP_USES_VOIDPTR, saying that scandir()
-          cmp() function takes void pointers, not dirent pointers.
-
-        * ace/OS_NS_dirent.inl (scandir): When calling native scandir()
-          with ACE_SCANDIR_CMP_USES_VOIDPTR, cast comparator appropriately.
-          Also, for native scandir(), ACE_TEXT_ALWAYS_CHAR the dirname.
-
-        * ace/OS_NS_dlfcn.inl:
-        * tests/Test_Output.cpp: Added #include "ace/OS_NS_string.h" to get
-          ACE_OS string methods. Fixes compile error on inline=0 build.
-
-Tue Aug 24 11:16:00 2004  Jules White   <jules@dre.vanderbilt.edu>
-
-        * ACE-INSTALL.html: Added a section on using ACE within Eclipse
-
-Tue Aug 24 10:10:22 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-all.h: Moved #include "ace/OS_main.h" down to the bottom
-          of the file, lest it invoke a circular dependency.
-
-        * ace/OS_NS_stdlib.inl: Added #include "ace/config-all.h" to get
-          ACE_TRACE.
-
-Mon Aug 23 23:23:18 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * Makefile.am (AUTOMAKE_OPTIONS):
-
-          Removed required Automake version from `Makefile.am'.
-          `configure.ac' already defines it.
-
-        * configure.ac:
-
-          Updated required version of Automake to 1.9.
-
-          Added test for partial template specialization.  Issue a warning
-          if it isn't support by the compiler since ACE will require it in
-          the near future.
-
-        * ace/ACE.h:
-
-          Corrected ACE namespace documentation to describe the ACE
-          namespace itself rather than summarizing the contents of this
-          header (i.e. the value added global ACE functions).
-
-        * ace/If_Then_Else.h:
-
-          Doxygen documentation corrections and improvements.
-
-Mon Aug 23 22:19:16 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/CDR_Test.cpp (run_main):
-
-          Added run-time assertions that verify proper CDR type sizes
-          (e.g. sizeof (ACE_CDR::Boolean) == 1).
-
-Mon Aug 23 19:18:58 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/config_h.m4:
-
-          Removed autoheader template for ACE_LACKS_PARAM_H.
-
-Mon Aug 23 18:33:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added check for ACE_HAS_ITOA.
-          Added check for ACE_LACKS_ITOW.
-
-Mon Aug 23 18:22:25 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-dgux-4.11-epc.h
-        * ace/config-dgux-4.x-ghs.h
-        * ace/config-freebsd.h
-        * ace/config-lynxos.h
-        * ace/config-m88k.h
-        * ace/config-macosx-panther.h
-        * ace/config-macosx.h
-        * ace/config-openbsd.h
-        * ace/config-sunos4-g++.h
-        * ace/config-sunos4-lucid3.2.h
-        * ace/config-sunos4-sun3.x.h
-        * ace/config-sunos4-sun4.1.4.h
-        * ace/config-sunos4-sun4.x.h
-        * ace/config-sunos5.4-centerline-2.x.h
-        * ace/config-sunos5.4-g++.h
-        * ace/config-sunos5.4-sunc++-4.x.h
-        * ace/config-sunos5.5.h
-        * ace/config-tandem.h
-        * ace/config-unixware-2.01-g++.h
-        * ace/config-unixware-2.1.2-g++.h
-        * ace/config-unixware-7.1.0.h
-        * ace/config-unixware-7.1.0.udk.h
-        * ace/os_include/os_stropts.h
-
-          Changed name of feature test macro ACE_HAS_SOCKIO_H to
-          ACE_HAS_SYS_SOCKIO_H.
-
-Mon Aug 23 17:41:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/config_h.m4:
-        * m4/platform.m4:
-
-          Removed support for unused ACE_NETBSD feature test macro.
-
-Mon Aug 23 17:37:16 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/platform.m4:
-
-          Add check for ACE_LACKS_PERFECT_MULTICAST_FILTERING.
-
-Mon Aug 23 16:33:59 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-
-          Remove PACKAGE, PACKAGE_*, and VERSION definitions.  The latter
-          conflicts with some of the test/example programs.  I'll get rid
-          of the others just to be safe.
-
-          Comment out ACE_NTRACE, as the constant definition conflicts
-          with Misc_test_trace.  We probably need an option to control
-          whether tracing and debugging features are enabled when ACE/
-          TAO is compiled that is separate from the one used after it
-          has been built.
-
-Mon Aug 23 16:06:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added checks for ACE_HAS_VWFPRINTF and ACE_HAS_VWSPRINTF.
-
-Tue Aug 24 00:34:30 2004  Marek Brudka  <mbrudka@elka.pw.edu.pl>
-
-        * ace/QtReactor.cpp:
-        Removed unecessary #include <qeventloop.h>. Thanks to
-        Gan Deng <gan.deng@vanderbilt.edu> for a patch.
-
-
-Mon Aug 23 17:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_hpux_aCC.GNU:
-          Added support for itanium on HPUX 11iv2 (11.23). Different options
-          have to be passed when on itanium, so when version 11.23 is detected,
-          set itanium to 1 and dependent on that set different compiler options.
-
-Mon Aug 23 16:58:18 UTC 2004  Don Hinton  <don.hinton@vanderbilt.edu>
-
-        * include/makeinclude/rules.local.GNU:
-          Added CCFLAGS to the list of arguments passed to the dependency
-          generator.  Thanks to Matthew Townsend <mtownsen@harris.com>
-          for reporting the problem.
-
-        * THANKS:
-          Added Matthew Townsend to the hall of fame.
-
-Mon Aug 23 08:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-hpux11.h:
-          Removed this file from the repo, use config-hpux-11.00.h instead,
-          the contents of this file refers to config-hpux11-xx.h files
-          which are not there, making this file unusable.
-
-Sun Aug 22 21:49:14 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-
-          Update with autoconf generated results.  While not perfect, the
-          old version would be difficult to update by hand.
-
-Mon Aug 23 01:04:34 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * ace/Select_Reactor_T.cpp:
-
-          Made some slight changes to the BUG 1890 patch after receiving
-          some clarifications from Kobi.
-
-Sun Aug 22 11:11:00 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/amh.mpb:
-          When using amh, you must have valuetype support, so add valuetype
-          as base project of amh
-
-Sun Aug 22 09:53:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * tests/MEM_Stream_Test.cpp:
-
-          Changed to remove compile warning resulting from bad use
-          of ACE_UNUSED_ARG().
-
-Fri Aug 20 15:29:29 MST 2004  Trevor Fields  <fields_t@ociweb.com>
-
-         * bin/auto_run_tests.pl:
-         * tests/run_test.pl:
-           Changed the run test scripts to time the execution
-           and print test finished messages.  This for the
-           generation of statistics.
-
-Fri Aug 20 15:10:08 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/core.mpb:
-
-          Changed to define INSTALL_THIS_TARGET for automake builds.
-
-        * bin/MakeProjectCreator/config/taodefaults.mpb:
-
-          Changed to add $(TAO_BUILDDIR) to includes for automake builds.
-
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
-
-          Changed to add $(ACE_BUILDDIR) to includes for automake builds.
-
-Fri Aug 20 12:17:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-        * m4/config_h.m4:
-
-          Added check for ACE_SIZEOF_WCHAR.
-
-Fri Aug 20 16:13:29 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-        * ace/TSS_T.cpp:
-          Revert.  It triggers (or causes) an intermittent problem
-          in the Timer_Cancellation_Test
-
-Fri Aug 20 10:22:34 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * TAO/tests/MT_Client/client.cpp:
-          Revert this.  It wasn't supposed to be included in my previous
-          check in. (Thu Aug 19 12:42:19 2004)
-
-Fri Aug 20 15:20:31 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        Fixes for Bug 1890. Please see
-
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1890
-
-        for details of this bug. What follows are the individual changes.
-
-        * ace/Select_Reactor_Base.cpp:
-        * ace/Select_Reactor_Base.h:
-
-          Added a new method clear_dispatch_mask (), which as the name
-          indicates clears the masks in the dispatch_set. The dispatch set
-          is a new addition, which keeps track of the handles that can be
-          used for dispatching.
-
-        * ace/Select_Reactor_Base.inl:
-        * ace/Select_Reactor_T.cpp:
-        * ace/Select_Reactor_T.h: Modified dispatch_io_set () so that it
-          doesn't break the loop when state_changes occur. This is the
-          crux of the 1890 bug report. If unbinding occurs as part of an
-          upcall, the bit_ops () calls clear_dispatch_mask (), which
-          prevents dispatching to already removed (and potentially
-          rebounded) handles.
-
-          Additional cosmetic changes.
-
-        * ace/Priority_Reactor.cpp:
-        * ace/Priority_Reactor.h:
-        * ace/TP_Reactor.cpp:
-        * ace/TP_Reactor.h:
-        * ace/TP_Reactor.inl:
-
-          Replicate changes to the above reactors.
-
-        * ace/Signal.h:
-        * ace/Signal.inl:
-
-          Added a default argument to the ACE_Signal class, which is used
-          by the ACE_Select_Reactor.
-
-          Thanks to Kobi for the patches.
-
-Fri Aug 20 14:26:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * tests/Process_Mutex_Test.cpp:
-
-          Changed to use a separate logfile per child (based on PID like
-          in MEM_Stream_Test) because of concurrency problems in using a
-          single non-synchronized child logfile (at least under windows).
-
-Fri Aug 20 14:10:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * tests/MEM_Stream_Test.cpp:
-
-          Changed to use child processes instead of threads for testing.
-          See also [Bug 1793].
-
-Fri Aug 20 07:47:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * bin/bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Added $(EXEEXT) to BIN build target.
-          Removed from $(EXEEXT) from install and cleanup target
-          because these are derived from build target.
-          This improves link behaviour (disables unnecessary links
-          because dependency checks on build targets did not function)
-          on platforms using GNU make and having a executable extension
-          (like MingW; .exe).
-          Fixes [Bug 1876].
-
-        * apps/gperf/tests/tests.mpc:
-
-          Added $(EXEEXT) to verbatim 'runtests' targets because
-          otherwise dependencies on build targets do not function
-          anymore.
-
-Thu Aug 19 16:45:05 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/security.mpb:
-
-          Changed to inherit from orbsvcslib.
-
-Thu Aug 19 12:42:19 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * TAO/tests/MT_Client/client.cpp:
-
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-        * ace/TSS_T.cpp:
-        Repeat part of the checkin from Fri Aug 13 15:26:40 2004
-        This corrects the incorrect thread-in-use count problem
-        that leads to premature TSS key deletion, but does not fix
-        the TSS leak because fixing that reveals other problems
-        that I don't have a solution for, yet.
-
-Thu Aug 19 08:26:11 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * apps/drwho/Rwho_DB_Manager.h:
-
-          Changed to #include <sys/types.h> before <protocols/rwhod.h>,
-          as the latter needs the former on some systems.
-
-Thu Aug 19 08:07:53 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/APG/Signals/SigAction.cpp:
-
-          Changed to use a (conditional) extern "C" linkage block around
-          my_sighandler, because the plain extern "C" directive resulted
-          in a declaration with multiple storage classes.
-
-Thu Aug 19 08:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * PROBLEM-REPORT-FORM:
-          Ask for the default.features file used by MPC.
-
-Wed Aug 18 21:02:34 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-        * ace/Object_Manager.cpp:
-        * ace/TSS_T.cpp:
-          Revert TSS leak fix (temporarily, I hope)
-          until I can find and eliminate the hang.
-
-Wed Aug 18 15:07:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * bin/msvc_static_compile.pl:
-          bin/msvc_mpc_auto_compile.pl:
-
-        Fixed wrong comment characters.
-
-Wed Aug 18 13:35:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * bin/msvc_static_compile.pl:
-
-        Added support for building VC8 projects.
-
-Wed Aug 18 13:29:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * bin/msvc_mpc_auto_compile.pl:
-
-        Added support for building VC8 projects.
-
-Wed Aug 18 08:50:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * ace/Asynch_Connector.h:
-        * ace/Asynch_Connector.cpp:
-
-          Thanks to Douglas for his assistance. This change introduces a
-          class-static "local_default" for use as the default parameter
-          for the second attribute of
-          ACE_Asynch_Connector<>::connect(). This "simplifies" the nested
-          templated class for the Solaris Lynxos GCC295 cross compiler
-          which was faulting due to the complexity of this
-          definition. This change does not appreachiably modify the
-          signature of the member function, just stops clients from having
-          to create their own local default parameter.
-
-Wed Aug 18 01:05:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * include/makeinclude/platform_netbsd.GNU:
-
-          Update to support current NetBSD platforms.
-
-Tue Aug 17 21:03:08 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/interceptors.mpb:
-
-          New file, with base project requiring interceptors.  Project
-          files should inherit from this instead of providing explicit
-          requires statements to eliminate duplicate entries in list.
-
-Tue Aug 17 17:42:16 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/rtcosscheduler.mpb:
-
-          Changed to inherit from orbsvcslib.
-
-Tue Aug 17 09:50:46 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_servant.mpb:
-        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb:
-
-          Added the path to $TAO_ROOT/orbsvcs to the CIDL compiler.
-
-Tue Aug 17 14:30:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-        * tests/Proactor_Test.cpp
-          Revertion of change to this file (for the sake of being complete).
-
-Tue Aug 17 13:00:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-        * ace/Asynch_Connector.h
-          Revertion of change to this file as it breaks the windows build and
-          changed the public interface of the template class.
-
-Tue Aug 17 10:03:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * ace/ACE.cpp:
-
-          Added ACE_UNUSED_ARG() to is_sock_error() for non-WIN32
-          builds.
-
-Tue Aug 17 09:43:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-
-          Removed DOS style linefeeds.
-
-Tue Aug 17 08:49:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * ace/OS_NS_String.cpp:
-
-          Removed some hidden characters causing compile problems.
-
-Tue Aug 17 08:00:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-        * ace/Asynch_Connector.h
-        * tests/Proactor_Test.cpp
-          Due to a long standing fatal cross development compiler bug in the
-          Solaris -> Lynxos cross development environment.
-          (LynxOS gcc 2.95.3 cross compiler)
-
-Tue Aug 17 08:00:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * ace/ACE.h:
-          ace/ACE.cpp:
-
-          Added ACE::is_sock_error() to be able to test if errorcode is
-          WinSock error *before* converting to error string.
-
-        * ace/OS_NS_String.cpp:
-
-          Fixed WCHAR bug in ACE_OS::strerror().
-          Introduced use of ACE::is_sock_error().
-
-Mon Aug 16 22:53:53 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/SSL/SSL_SOCK_Stream.cpp (~ACE_SSL_SOCK_Stream):
-
-          Removed useless invalidation of "ssl_" pointer member by
-          assignment of zero.  Once the destructor is called, the object
-          no longer exists so invalidation is unnecessary.
-
-Mon Aug 16 16:54:18 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/ftorbutils.mpb
-        * bin/MakeProjectCreator/config/smart_proxies.mpb
-        * bin/MakeProjectCreator/config/svc_utils.mpb
-
-          Changed to inherit from orbsvcslib instead of taolib_with_idl.
-
-        * bin/MakeProjectCreator/config/orbsvcslib.mpb:
-
-          Added $(TAO_ROOT)/orbsvcs to includes.
-          Added -I$(TAO_ROOT)/orbsvcs to idlflags.
-
-Mon Aug 16 15:58:21 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/Signal.cpp: Added template instantiations for
-          ACE_Fixed_Set_Iterator_Base. Related to:
-          Mon Aug  2 08:55:17 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-Mon Aug 16 15:30:29 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/Task.cpp (svc_run): Added "defined (ACE_WIN32)" to the
-          "defined (__IBMCPP__)" test for how to cast a thread result.
-          __IBMCPP__ is defined for both Windows (where the alternate cast
-          is needed) and AIX (where it is prohibited).
-          This is related to this change:
-          Fri Aug  6 08:34:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-Mon Aug 16 11:54:50 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/ACE.h (debug):
-
-          Corrected the export qualifier for these functions.  They are no
-          longer inlined.
-
-Mon Aug 16 11:16:02 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/ACE.h:
-
-          Moved remaining ACE namespace variables out of header and into
-          the '.cpp' file.  They should not be accessed/modified
-          directly.
-
-        * ace/ACE.inl (hex_chars_, nibble2hex):
-
-          No need to declare/define the hex_chars_ constant variable in
-          the ACE namespace.  Define it as a static constant in the
-          nibble2hex() function instead, the only place it is used.
-
-        * ace/ACE.cpp (debug):
-
-          Unlined these functions.  They generally aren't performance
-          critical, and doing so allows us to remove the ACE::debug_
-          internal variable to the '.cpp' file.
-
-Mon Aug 16 11:16:02 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/ACE.h:
-        * ace/ACE.cpp:
-
-          Added remaining missing DLL export qualifiers.  Fixes
-          "unresolved external symbol" errors in MS Windows builds.
-
-          Moved variables in ACE namespace that are internal to ACE into
-          the '.cpp' file.  They should be not be accessed or modified
-          directly.
-
-Mon Aug 16 10:58:09 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/ACE.h (recv):
-
-          Fixed DLL export qualifier.  Addresses "unresolved external
-          symbol" link-time errors in MS Windows builds.
-
-Mon Aug 16 12:14:37 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb:
-
-          Changed the names of the Deployment libraries. Arranged the
-          dependencies in such a manner so that it is easier to use it in
-          the application.
-
-Mon Aug 16 09:27:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/msvc_mpc_auto_compile.pl:
-
-           Added MSVC 7.1 compatibility through '-vc7' option.
-
-        * bin/msvc_static_compile.pl:
-
-          Added MSVC 7.1 compatibility through '-vc7' option. Added
-          support for MPC '-name_modifier' option.
-
-        * bin/msvc_static_compile.lst:
-
-          Removed projectfile extensions to be able to generate these
-          dynamically from 'msvc_static_compile.pl'.
-
-Sat Aug 14 19:38:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/CDR_Base.h:
-
-          Do not include "ace/If_Then_Else.h" when using MSVC++ 6.  It
-          can't handle the partial template specializations in that file.
-
-Sat Aug 14 19:34:02 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Sock_Connect.cpp (ipv6_enabled_):
-
-          Fixed syntax error.
-
-Sat Aug 14 13:07:50 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp (subscribe_ifs):
-
-          The "ACE_Sock_Connect" interim pseudo namespace no longer
-          exists.  Use the true "ACE" C++ namespace instead.  Fixes a
-          compile-time error.
-
-Sat Aug 14 14:48:01 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Add /usr/lib as a path for library check. If the location of the
-          library is not specified by the application, the compiler,
-          linker and loader knows where to look in for *nix based
-          systems. So should our library checker.Without this applications
-          MPC file starts pointing to /usr/lib to locate libraries like
-          PCAP and XERCES, which can be installed with system
-          libraries. It is bad to see installation specific thingies
-          making its way up the order.
-
-Sat Aug 14 09:28:19 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/CDR_Base.h (ACE_CDR::Boolean):
-
-          MSVC++ 6 can't handle partial template specializations so fall
-          back on an unsigned char typedef if _MSC_VER < 1300 (i.e. MSVC++
-          version is less than 7).  This is an interim solution to get the
-          MSVC++ 6 builds going again.
-
-        * ace/IfThenElse.h:
-        * ace/If_Then_Else.h:
-
-          Renamed the former to the latter, including the class template
-          defined within, to match ACE naming conventions.  Thanks to Doug
-          for pointing this out.
-
-Sat Aug 14 01:43:16 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/CDR_Base.h (ACE_CDR):
-
-          Parenthesize boolean condition that is the first argument to the
-          ACE::IfThenElse<> template to avoid any potential confusion.
-
-Sat Aug 14 00:33:59 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/IfThenElse.h (IfThenElse):
-
-          Place sample code within a Doxygen code block.  Addresses some
-          documentation formatting problems.
-
-Fri Aug 13 23:26:56 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/IfThenElse.h:
-
-          New template that allows one to choose between two types at
-          compile-time based on a boolean value.  This is basically the
-          IfThenElse template described in the book "C++ Templates" by
-          Vandevoorde and Josuttis.
-
-        * ace/CDR_Base.h (ACE_CDR::Boolean):
-
-          Detect at compile-time whether the C++ "bool" type can be used
-          as the underlying ACE_CDR::Boolean type using the new
-          ACE::IfThenElse template.
-
-        * ace/ACE.h:
-        * ace/Flag_Manip.cpp:
-        * ace/Flag_Manip.h:
-        * ace/Flag_Manip.inl:
-        * ace/Handle_Ops.cpp:
-        * ace/Handle_Ops.h:
-        * ace/Init_ACE.cpp:
-        * ace/Init_ACE.h:
-        * ace/Lib_Find.cpp:
-        * ace/Lib_Find.h:
-        * ace/Sock_Connect.cpp:
-        * ace/Sock_Connect.h:
-
-          Functions that were in the pseudo "ACE" namespace are now in a
-          true "ACE" C++ namespace.
-
-        * ace/ACE.inl (log2):
-
-          Use the prefix increment operator when incrementing the loop
-          index.  It is generally more efficient than the postfix
-          increment operator.
-
-        * ace/Asynch_Acceptor.cpp:
-        * ace/Asynch_Connector.cpp:
-        * ace/DEV_Connector.cpp:
-        * ace/DLL_Manager.cpp:
-        * ace/FILE_Addr.cpp:
-        * ace/FILE_Connector.cpp:
-        * ace/INET_Addr.inl:
-        * ace/IO_SAP.cpp:
-        * ace/IPC_SAP.cpp:
-        * ace/Logging_Strategy.cpp:
-        * ace/MEM_Acceptor.cpp:
-        * ace/Memory_Pool.cpp:
-        * ace/Naming_Context.cpp:
-        * ace/POSIX_Asynch_IO.cpp:
-        * ace/POSIX_Proactor.cpp:
-        * ace/SOCK_Acceptor.cpp:
-        * ace/SOCK_Dgram.cpp:
-        * ace/SOCK_Dgram_Mcast.cpp:
-        * ace/SOCK_SEQPACK_Acceptor.cpp:
-        * ace/SPIPE_Connector.cpp:
-        * ace/System_Time.cpp:
-        * ace/UPIPE_Connector.cpp:
-        * tests/Enum_Interfaces_Test.cpp:
-        * tests/FIFO_Test.cpp:
-        * tests/INET_Addr_Test.cpp:
-        * tests/INET_Addr_Test_IPV6.cpp:
-
-          Updated all calls to functions that were in the pseudo "ACE"
-          namespace through a former ACE class base class
-          (e.g. ACE_Sock_Connect, ACE_Flag_Manip, etc) to use the correct
-          "ACE" namespace.  Use of the base class names should never have
-          been used since it was known long ago that the "ACE" pseudo
-          namespace would be changed to true C++ namespace.
-
-        * ace/Basic_Types.h:
-        * ace/OS_NS_fcntl.inl:
-        * ace/OS_NS_stdio.h:
-        * ace/OS_NS_stdlib.h:
-
-          Nuked trailing whitespace.
-
-Sat Aug 14 03:44:02 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * ace/TSS_T.cpp:
-
-          Fixed compilation errors in the SingleThreaded builds.
-
-Sat Aug 14 03:37:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * ace/OS_NS_Thread.cpp:
-
-          Fixed a unused variable warning in the daily builds.
-
-Sat Aug 14 01:58:32 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * Release:
-
-          Added the NEWS file to the release. Thanks to Ramiro Morales
-          <rm0 at gmx dot net> for reporting the problem.
-
-Fri Aug 13 16:17:32 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Module.h (class ACE_Module):
-        * ace/Task.h (ACE_Task_Base):
-          Updated the documentation so it's more clear.  Thanks to Andrew
-          Athan <aathan-ace-bugs-1524@cloakmail.com> for motivating this.
-
-        * ace/Stream.h: Updated the documentation for push() and pop() to
-          clarify how it affects open() and close() hooks on the tasks.
-          Thanks to Andrew Athan <aathan-ace-bugs-1524@cloakmail.com> for
-          motivating this.
-
-Fri Aug 13 15:26:40 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * ace/TSS_T.cpp:
-          Pass the TSS key to ACE_OS::thr_key_detach.  This
-          eliminates the table lookup formerly required to
-          identify the key being detached.
-
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-          --Accept and use the TSS key from TST_T.cpp
-          --Typedef the function pointer used to delete TSS
-          objects.  This improves readability.
-          --Change the name of the ACE_TSS_Info member from
-          tss_obj_ to tss_info_.  This avoids confusion
-          due to conflicting use of the name "tss_obj"
-          --Check to see if a thread has actually used
-          a TSS key before decrementing the "number of
-          threads using this key" counter.  This eliminates
-          a messy situation in which the key is deleted
-          while threads are still using it.
-          --Fix bugzilla 1542:  Leaks in ACE_TSS
-          Note that the patch suggested
-          in the bugzilla report did not completely address
-          the problem, so this fix takes a different approach.
-          Significant features of this change:
-          > The ACE_TSS_Cleanup::detach method now frees the
-            thread's specified TSS entry.  Formerly it leaked it.
-          > The exit method defers to the detach method to
-            free the entry. This ensures entries are handled
-            consistently -- no matter how they are freed up.
-          > The ACE_TSS_Cleanup::in_use_ entry receives special
-            handling to avoid using it while deleting it.  Formerly
-            it was leaked, so it didn't matter.
-          -- Note this does NOT address bugzilla 1797.  I'll
-          look at that one next.
-
-        * ace/Object_Manager.cpp:
-          Eliminating TSS leaks revealed another problem.  The
-          main thread was not waiting for other threads to exit
-          before dismantling the ACE infrastructure in
-          Object_Manager::fini.  There's a hack in Thread_Manager
-          that disables the wait method when the Object_Manager
-          is shutting down.
-          Unfortunatly this causes a messy race condition in which
-          one thread is deleting objects while other threads are
-          using them.
-          The "solution" here is to call Thread_Manager::wait()
-          with a short (1 second) timeout.  If the threads have
-          already exited -- no problem, and no delay.  If they
-          haven't, they get a chance to exit cleanly.
-
-Fri Aug 13 18:43:01 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * ace/CDR_Base.h (ACE_CDR):
-
-          Reverted the usage of C++ bool as a typedef of
-          ACE_CDR::Boolean. We will now use unsigned char on all
-          platforms. MacOSX (Panther) atleast makes the size of bool to be
-          4 bytes which creates problems for TAO. Thanks to Rich Shapiro
-          <rshapiro at bbn dot com> for reporting the problem.
-
-Fri Aug 13 18:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/IOStream_T.h:
-          When ACE_LACKS_IOSTREAM_FX is defined, also include ace/os_include/
-          os_ctype.h
-
-Fri Aug 13 12:03:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          Also install pidl files
-
-Fri Aug 13 07:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_gnuwin32_common.GNU:
-          Pass the def file with -Wl, to the compiler, it is a linker option
-          and with the Cygwin GCC 3.3.3 it seems the compiler thinks the def
-          file is a modula2 file. By marking it as linker option it works
-          without problems again
-
-        * etc/*.doxygen:
-          Set INTERNAL_DOCS to YES, that way we generate documentation for
-          stuff marked with @internal, but doxygen will make sure the
-          documentation says it is for internal use only
-
-Thu Aug 12 21:17:05 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/taolib.mpb:
-          Inherit from pidl.mpb:
-
-        * bin/MakeProjectCreator/config/pidl.mpb:
-          New file, custom file type definition for *.pidl files.
-
-Thu Aug 12 16:12:18 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * bin/fuzz.pl:
-
-          Priority of synch.h inclusion is reduced.
-
-Thu Aug 12 13:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
-          Use LIBMODIFIER with bmake, not LIB_MODIFIER
-
-Thu Aug 12 07:54:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_hpux_gcc.GNU:
-          Removed support for buildbits=64 again, the way I tried it doesn't
-          work
-
-Wed Aug 11 22:20:49 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * bin/fuzz.pl:
-
-          Priority of OS.h and Synch.h inclusions have been reduced.
-
-Wed Aug 11 11:55:46 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/event.mpb
-        * bin/MakeProjectCreator/config/ftorbutils.mpb
-        * bin/MakeProjectCreator/config/ftrtevent.mpb
-        * bin/MakeProjectCreator/config/rtcorbacommon.mpb
-          Changed to inherit from minimum_corba instead of providing avoids
-          statements to eliminate duplicate entries in list.
-
-Wed Aug 11 08:48:48 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm:
-        * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm:
-        * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
-        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
-
-          Call $self->mpc_dirname() instead of dirname() to be consistent
-          with the modules in MPC.
-
-        * bin/mpc.pl:
-        * bin/mwc.pl:
-
-          Put back the getBasePath() function and cleaned up the VMS
-          support.
-
-Wed Aug 11 10:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_other_tests.lst:
-          Don't run the PluggableUDP examples when NO_DIOP is defined,
-          makes it possible to exclude these examples in builds that don't
-          have DIOP
-
-Wed Aug 11 08:32:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Process.cpp:
-          Added OpenVMS version of ACE_Process::spawn().
-
-        * include/makeinclude/platform-openvms.GNU:
-          Removed mathlibrary from required libs.
-          Added dummy code to circumvent 'touch' problem with OpenVMS make port.
-
-Wed Aug 11 08:00:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_other_tests.lst:
-          Don't run TAO/orbsvcs/tests/Notify/performance-tests/Filter when
-          MINIMUM is set, this test isn't build with minimum corba
-
-Tue Aug 10 10:57:00 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-          Enable check for ACE_HAS_WCHAR.  We'll never shake out any
-          wide character configuration bugs that may remain if it's
-          disabled.
-
-Tue Aug 10 11:08:31 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-linux-common.h: Removed ACE_LACKS_TOWLOWER and
-          ACE_LACKS_TOWUPPER. These functions are present but, I suspect,
-          marked "lacks" because of type conflicts, which J.T. Conklin fixed:
-          Mon Aug  9 23:13:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-Tue Aug 10 06:52:47 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-          Removed AC_LANG_PUSH([C])/.../AC_LANG_POP([C]) which forced the
-          use of C for selected AC_CHECK_FUNC calls.  The current version
-          of autoconf always uses C.
-
-Tue Aug 10 14:00:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        I shouldn't have been rushed into these guarded #includes. The
-        following two files now need these guarded #includes to be moved
-        after the rest.
-
-        * ace/FILE_IO.h
-        * ace/FIFO_Send_Msg.h
-          Moved guarded  #include "ace/OS_NS_stropts.h"  to end of other
-          #includes
-
-Tue Aug 10 11:20:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * examples/IOStream/server/iostream_server.cpp
-          Added missing  #include "ace/OS_NS_unistd.h"  inside the guard of
-          #if defined (ACE_HAS_STRING_CLASS)
-
-        * tests/IOStream_Test.cpp
-          Added missing  #include "ace/OS_NS_unistd.h"  inside the guard of
-          #if !defined (ACE_LACKS_ACE_IOSTREAM)
-
-Tue Aug 10 12:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-        * bin/tao_other_tests.lst:
-          When DISABLE_BIDIR is set, don't run the BiDIR tests, this can be
-          used for builds that build without BiDIR GIOP
-
-Tue Aug 10 11:20:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for the information
-        leading to these guard conditions.
-
-        * ace/Sock_Connect.cpp
-          Added guard checks around #include "ace/OS_NS_fcntl.h"
-
-        * ace/DEV_IO.h
-        * ace/FILE_IO.h
-        * ace/FIFO_Send_Msg.h
-          Added guard checks around #include "ace/OS_NS_stropts.h"
-
-        * ace/Pipe.cpp
-        * ace/SPIPE_Acceptor.cpp
-          Added guard checks around #include "ace/OS_NS_unistd.h"
-
-Mon Aug  9 23:13:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-freebsd.h:
-          Remove #define of ACE_LACKS_TOWLOWER and ACE_LACKS_TOWUPPER.
-          FreeBSD has these functions, but they were disabled because
-          of the problem below.
-
-        * ace/OS_NS_ctype.h:
-        * ace/OS_NS_ctype.inl:
-        * ace/OS_NS_strings.cpp:
-        * ace/OS_NS_wchar.cpp:
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp:
-        * tests/Config_Test.cpp:
-        * tests/Proactor_Test.cpp:
-        * tests/Proactor_Test_IPV6.cpp:
-          Renamed ACE_OS::to_upper(int) and ACE_OS::to_upper(wint_t) to
-          ACE_OS::ace_toupper() and ACE_OS::ace_towupper() because they
-          are ambiguous on systems where wint_t is in fact an int.  The
-          same was done for ACE_OS::to_lower(), etc.
-
-Mon Aug  9 18:12:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-        * ace/OS_NS_stdlib.cpp (realpath):
-          Applied ACE code formatting to make it readable
-
-Mon Aug  9 15:20:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * ace/Sock_Connect.cpp
-          Added missing #include "ace/OS_NS_fcntl.h"
-
-        * ace/DEV_IO.h
-        * ace/FILE_IO.h
-        * ace/FIFO_Send_Msg.h
-          Added missing #include "ace/OS_NS_stropts.h"
-
-        * ace/Pipe.cpp
-        * ace/SPIPE_Acceptor.cpp
-          Added missing #include "ace/OS_NS_unistd.h"
-
-Mon Aug  9 15:05:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-        * include/makeinclude/platform_hpux_gcc.GNU:
-          When buildbits is set to 64, add -m64 to the CPPFLAGS
-
-Mon Aug  9 09:25:12 2004  Huang-Ming Huang  <hh1@cse.wustl.edu>
-
-        * tests/Dynamic_Priority_Test.cpp:
-          Fixed buffer overrun problem when ACE_HAS_TIMED_MESSAGE_BLOCKS
-          macro is defined.
-
-Mon Aug  9 09:56:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-        * examples/APG/Processes/Spawn.cpp:
-          Changed the check of the result of spawn, use ACE_INVALID_PID
-          instead of -1.
-
-Mon Aug  9 08:55:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-        * ace/OS_NS_unistd.inl (chdir):
-          Fixed Visual Age on Win32 implementation
-
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
-          this.
-
-Sun Aug  8 22:43:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-integritySCA.h:
-        * m4/config_h.m4:
-          Removed vestigial mentions of ACE_HAS_ONE_DEFINITION_RULE.
-
-Sun Aug  8 17:38:05 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/README:
-        * ace/config-g++-common.h:
-          Removed vestigial mentions of ACE_HAS_GNUG_PRE_2_8.
-
-        * m4/compiler.m4:
-        * m4/config_h.m4:
-          Removed check for ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS
-          and ACE_HAS_GNUG_PRE_2_8, as those feature test macros have been
-          removed from ACE for some time.
-
-        * m4/config_h.m4:
-        * m4/threads.m4:
-          Replaced AH_TEMPLATE for ACE_HAS_STHREADS and ACE_HAS_PTHREADS
-          with third argument to AC_DEFINE.
-
-Sun Aug  8 07:12:32 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-          Start converting checks for for prototypes to use AC_CHECK_DECL
-          instead of AC_EGREP_CPP or AC_EGREP_HEADER.
-
-        * ace/OS_NS_sys_resource.inl:
-          Changed so conditionals aren't used inside macro call.
-
-        * m4/subsets.m4:
-          Changed AC_HELP_STRING to AS_HELP_STRING.
-
-        * ace/config-sco-4.2-nothread.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-        * ace/config-sco-5.0.0.h:
-        * ace/config-tandem.h:
-          Removed (commented-out) definition of ACE_HAS_SYSCALL_GETRUSAGE.
-
-        * ace/config-hpux11.h:
-        * ace/config-hpux-11.00.h:
-          Removed ACE_HAS_SYSCALL_GETRUSAGE.  getrusage() was added in
-          HPUX 10.10.
-
-        * configure.ac:
-          Fixed check for setregid() and setreuid() prototypes to look for
-          them in <unistd.h>, not <time.h>.
-
-        * m4/config_h.m4:
-          Replace some AH_TEMPLATE definitions.  ACE_CHECK_HAS_HEADERS and
-          ACE_CHECK_LACKS_HEADERS provide autoheader templates themselves.
-
-        * configure.ac:
-          Replace some calls to AC_CHECK_HEADERS with ACE_CHECK_HAS_HEADERS
-          or ACE_CHECK_LACKS_HEADERS.
-
-        * m4/ace_headers.m4:
-          New file, with ACE_CHECK_HAS_HEADERS and ACE_CHECK_LACKS_HEADERS
-          autoconf macros.  These macros are similar to AC_CHECK_HEADERS,
-          but define either ACE_HAS_<foo> or ACE_LACKS_<foo>.
-
-        * ace/OS_NS_unistd.inl:
-        * config-rtems.h:
-          Changed name of feature test macro ACE_HAS_GETOPT_PROTO to
-          ACE_HAS_GETOPT_PROTOTYPE.
-
-        * ace/config-linux-common.h:
-        * ace/config-unixware-7.1.0:
-        * ace/config-unixware-7.1.0.udk.h:
-        * ace/os_include/sys/os_resource.h:
-          Changed name of feature test macro ACE_HAS_GETRUSAGE_PROTO to
-          ACE_HAS_GETRUSAGE_PROTOTYPE.
-
-        * ace/Basic_Types.h:
-        * ace/config-chorus.h:
-        * ace/config-integritySCA.h:
-        * ace/config-mvs.h:
-        * ace/config-openvms.h:
-        * ace/config-psos-diab.h:
-        * ace/config-psos-diab-mips.h:
-        * ace/config-psos-diab-ppc.h:
-        * ace/config-psos-tm.h:
-        * ace/config-psosim-g++.h:
-        * ace/config-tandem.h:
-        * ace/config-vxworks5.x.h:
-        * ace/config-win32-common.h:
-        * ace/os_include/os_limits.h:
-          Changed name of feature test macro ACE_LACKS_PARAM_H to
-          ACE_LACKS_SYS_PARAM_H.
-
-        * ace/OS.inl:
-        * ace/config-dgux-4.11-epc.h:
-        * ace/config-freebsd.h:
-        * ace/config-hpux-10.x.h:
-        * ace/config-hpux-11.00.h:
-        * ace/config-hpux11.h:
-        * ace/config-irix5.2.h:
-        * ace/config-irix5.3-g++.h:
-        * ace/config-irix5.3-sgic++.h:
-        * ace/config-irix6.x-common.h:
-        * ace/config-linux-common.h:
-        * ace/config-m88k.h:
-        * ace/config-macosx-panther.h:
-        * ace/config-macosx.h:
-        * ace/config-netbsd.h:
-        * ace/config-openbsd.h:
-        * ace/config-osf1-3.2.h:
-        * ace/config-osf1-4.0.h:
-        * ace/config-sco-4.2-nothread.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-        * ace/config-sco-5.0.0.h:
-        * ace/config-sunos4-g++.h:
-        * ace/config-sunos4-lucid3.2.h:
-        * ace/config-sunos4-sun3.x.h:
-        * ace/config-sunos4-sun4.1.4.h:
-        * ace/config-sunos4-sun4.x.h:
-        * ace/config-sunos5.4-centerline-2.x.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos5.4-sunc++-4.x.h:
-        * ace/config-sunos5.5.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-tandem.h:
-        * ace/config-unixware-2.01-g++.h:
-        * ace/config-unixware-2.1.2-g++.h:
-        * ace/config-unixware-7.1.0.h:
-        * ace/config-unixware-7.1.0.udk.h:
-        * ace/os_include/sys/os_resource.h:
-          Changed name of feature test macro ACE_HAS_SYSCALL_H to
-          ACE_HAS_SYS_SYSCALL_H.
-
-Sat Aug  7 10:43:51 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/OS_NS_string.cpp:
-        * ace/OS_NS_string.h:
-        * ace/OS_NS_string.inl:
-
-          Uninlined the ACE_OS::strerror() method, so the #include of ACE.h
-          necessitated by the changes in
-
-          Fri Aug  6 07:58:54 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-          can be moved to the .cpp file.
-
-Fri Aug  6 20:22:02 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-          Added check for mkstemp() which sets ACE_LACKS_MKSTEMP if
-          it is not available.
-
-Fri Aug  6 19:13:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-openvms.h:
-        Added ACE_HAS_VOIDPTR_GETTIMEOFDAY.
-
-Fri Aug  6 08:17:23 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/ace.m4:
-          Split new ACE_WITH_RMCAST, ACE_WITH_QOS, and ACE_WITH_SSL macros
-          out of ACE_CONFIGURATION_OPTIONS so they can be used with other
-          packages.
-
-        * ace/OS_NS_sys_uio.cpp:
-        * ace/OS_NS_sys_uio.h:
-        * ace/OS_NS_sys_uio.inl:
-          Changed ACE_OS::readv_emulation() and ACE_OS::writev_emulation()
-          to use const iovec * instead of type of system iovec parameter.
-          Changed ACE_OS::readv() to cast const qualification of iovec
-          parameter away if ACE_HAS_NONCONST_READV.
-          Changed ACE_OS::writev() to cast const qualifiaction of iovec
-          parameter away if ACE_HAS_NONCONST_WRITEV.
-        * ace/os_include/os_uio.h:
-          Removed ACE_READV_TYPE type definition.
-          Removed ACE_WRITEV_TYPE type definition.
-          Changed readv_timedwait and writev_timedwait definitions to
-          use const iovec *'s for iovec parameter.
-
-        * ace/OS_sys_socket.inl:
-          Cast const qualifiaction away if ACE_HAS_NONCONST_SENDMSG.
-        * ace/os_include/sys/os_socket.h:
-          Removed ACE_SENDMSG_TYPE type definition.
-
-        * ace/OS_sys_resource.h:
-        * ace/OS_sys_resource.inl:
-          Changed ACE_OS::setrlimit() to use const struct rlimit*
-          instead of type of system rlimit parameter.  Cast const
-          qualification away if ACE_HAS_NONCONST_SETRLIMIT.
-        * ace/os_include/sys/os_resource.h:
-          Removed ACE_SETRLIMIT_TYPE type definition.
-
-        * ace/config-chorus.h:
-        * ace/config-linux-common.h:
-        * ace/config-lynxos.h:
-        * ace/config-m88k.h:
-        * ace/config-osf1-3.2.h:
-        * ace/config-osf1-4.0.h:
-        * ace/config-psos-diab-mips.h:
-        * ace/config-psos-diab-ppc.h:
-        * ace/config-psos-diab.h:
-        * ace/config-psos-tm.h:
-        * ace/config-psosim-g++.h
-        * ace/config-rtems.h:
-        * ace/config-sunos5.4-centerline-2.x.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos5.4-sunc++-4.x.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-tandem.h:
-        * ace/config-vxworks5.x.h:
-        * configure.ac:
-        * m4/config_h.m4:
-          Rename ACE_HAS_BROKEN_SETRLIMIT, ACE_HAS_BROKEN_SENDMSG,
-          ACE_HAS_BROKEN_READV, and ACE_HAS_BROKEN_WRITEV to
-          ACE_HAS_NONCONST_SETRLIMIT, ACE_HAS_NONCONST_SENDMSG,
-          ACE_HAS_NONCONST_READV, and ACE_HAS_NONCONST_WRITEV to
-          be more descriptive of what's really broken.
-
-        * bin/MakeProjectCreator/config/ec_used_typed_events.mpb:
-          Changed to inherit from dynamicinterface and ifr_client instead
-          of providing libs and after statements so that dependency chain
-          is complete.
-
-Fri Aug  6 10:26:20 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/OS_NS_string.h:
-
-          Added include of ACE.h needed for WIN32 version of change in
-
-          Fri Aug  6 07:58:54 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/OS_NS_string.inl:
-
-          Fixed typo and mismatched return type for WIN32.
-
-Fri Aug  6 14:15:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-        * ace/config-win32-common.h:
-          Don't define export macro's also for Visual Age.
-
-        * ace/config-win32-visualage.h:
-          Added special Visual Age export macros
-
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
-          this.
-
-Fri Aug  6 14:14:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_sys_socket.h:
-          Removed include for 'ace/os_include/netinet/os_tcp.h'.
-        * ace/Pipe.cpp:
-          Added include for 'ace/os_include/netinet/os_tcp.h' to provide
-          TCP macros/constants (f.i. TCP_NODELAY) for OS like OpenVMS.
-
-Fri Aug  6 07:58:54 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Message_Block.cpp (crunch): If rd_ptr_ was greater than
-          wr_ptr_ memory was overwritten, so added a check for this case
-          and return -1 in this case.  Also, simplified the initial if
-          statement.  Thanks to Boris Kaminer for reporting this.
-
-        * ace/OS_NS_string.inl: Updated ACE_OS::strerror() so it checks
-          for socket errors explicitly.  Thanks to Boris Kaminer
-          <boris_kaminer@mail.ru> for reporting this.
-
-Fri Aug  6 10:18:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-openvms.h:
-          Added ACE_LACKS_REALPATH.
-          Added '#define MAXSYMLINKS 0'.
-          Removed uppercase macros for pthread symbols.
-
-Fri Aug  6 10:08:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_sys_socket.h:
-          Added include for 'ace/os_include/netinet/os_tcp.h' to provide
-          TCP macros/constants (f.i. TCP_NODELAY) for OS like OpenVMS.
-
-Fri Aug  6 09:50:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-        * bin/make_release:
-          For generating the project files for borland, vc6 & vc71 set
-          qos=1 in the default.features file, these environments support
-          qos.
-
-Fri Aug  6 09:41:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-        * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm:
-          Just always use Makefile.bor as workspace name, this is the way
-          our Borland users expect things to work.
-
-Fri Aug  6 09:15:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * apps/JAWS3/jaws3/Reactive_IO_Helpers.h
-          private -> public ~JAWS_IO_Reactive_Handler (void) due to
-          aCC: HP ANSI C++ B3910B A.03.39 compiler bug not allowing
-          friend derived classes access.
-
-Fri Aug  6 08:34:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-        * ace/config-win32-msvc-7.h:
-        * ace/config-win32-msvc-8.h:
-          Added ACE_HAS_TEMPLATE_TYPEDEFS
-
-        * ace/config-win32-visualage.h:
-          Added huge list of new defines
-
-        * ace/Event_Handler_T.h:
-          Instead of -1 use ACE_INVALID_HANDLE to make it portable
-
-        * ace/Malloc.cpp:
-          Corrected assert
-
-        * ace/OS_NS_sys_stat.h:
-          For IBMCPP also define ACE_stat as stat
-
-        * ace/OS_NS_sys_stat.inl (stat):
-          For Visual Age use special _stat call
-
-        * ace/Task.cpp (svc_run):
-          For Visual Age also do a static cast
-
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
-          this.
-
-Fri Aug  6 08:03:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
-
-        * ace/config-win32-msvc-8.h:
-          Added this file for msvc8, is a copy of msvc7 but this will change as
-          things are tested for msvc8.
-
-        * ace/config-win32-msvc.h:
-          If msvc_ver >= 1400 then we are including the msvc-8 file.
-
-Thu Aug  5 23:50:38 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/ec_use_typed_events.mpb:
-          Changed to inherit from dynamicinterface and ifr_client instead
-          of providing libs and after statements so that dependency chain
-          is complete.
-
 Thu Aug  5 13:17:26 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ace/ACE.cpp (sock_error): Changed the WSAEWOULDBLOCK message
-          back to "resource temporarily unavailable" to be consistent with
-          the UNIX error string.  Thanks to Boris Kaminer
-          <boris_kaminer@mail.ru> for reporting this.
-
-        * examples/NT_Service/ntsvc.{h,cpp}: Added a destructor to
-          Service that cancels the timer.  Thanks to Scott Harris
-          <harris_s@ociweb.com> for this fix.
+	* ace/ACE.cpp (sock_error): Changed the WSAEWOULDBLOCK message
+	  back to "resource temporarily unavailable" to be consistent with
+ 	  the UNIX error string.  Thanks to Boris Kaminer
+ 	  <boris_kaminer@mail.ru> for reporting this.
+	
+	* examples/NT_Service/ntsvc.{h,cpp}: Added a destructor to 
+	  Service that cancels the timer.  Thanks to Scott Harris
+ 	  <harris_s@ociweb.com> for this fix.
 
-        * ace/ACE.cpp (sock_error): Added support for WSAEISCONN.
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
-          this.
+	* ace/ACE.cpp (sock_error): Added support for WSAEISCONN.
+	  Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
+ 	  this.
 
 Thu Aug  5 07:45:53 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * m4/config_h.m4:
-          Replace some AH_TEMPLATE definitions.  ACE_CHECK_HAS_FUNCS and
-          ACE_CHECK_LACKS_FUNCS provide autoheader templates themselves.
+	* m4/config_h.m4:
+	  Replace some AH_TEMPLATE definitions.  ACE_CHECK_HAS_FUNCS and
+	  ACE_CHECK_LACKS_FUNCS provide autoheader templates themselves.
 
-        * configure.ac:
-          Replace some calls to AC_CHECK_FUNCS with ACE_CHECK_HAS_FUNCS or
-          ACE_CHECK_LACKS_FUNCS.
+	* configure.ac:
+	  Replace some calls to AC_CHECK_FUNC with ACE_CHECK_HAS_FUNCS or
+	  ACE_CHECK_LACKS_FUNC.
 
-        * m4/ace_functions.m4:
-          New file, with ACE_CHECK_HAS_FUNCS and ACE_CHECK_LACKS_FUNCS
-          autoconf macros.  These macros are similar to AC_CHECK_FUNCS,
-          but define either ACE_HAS_<foo> or ACE_LACKS_<foo>.
+	* m4/ace_headers.m4:
+	  New file, with ACE_CHECK_HAS_FUNCS and ACE_CHECK_LACKS_FUNCS
+	  autoconf macros.  These macros are similar to AC_CHECK_FUNCS,
+	  but define either ACE_HAS_<foo> or ACE_LACKS_<foo>.
 
 Thu Aug  5 09:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -3057,73 +41,73 @@ Thu Aug  5 09:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Wed Aug  4 18:09:47 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * m4/ace.m4:
-        * configure.ac:
-          Support --with/without-tao flag to provide find grain
-          control over TAO configuration.
+	* m4/ace.m4:
+	* configure.ac:
+	  Support --with/without-tao flag to provide find grain
+	  control over TAO configuration.
 
 Wed Aug  4 16:19:40 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * ace/Global_Macros.h (ACE_CORBA_1, ACE_CORBA_2, ACE_CORBA_3):
+	* ace/Global_Macros.h (ACE_CORBA_1, ACE_CORBA_2, ACE_CORBA_3):
 
-          Marked these macros as deprecated, and removed the version of
-          these macros that defined the obsolete "CORBA_foo" broken
-          namespace workaround classes.
+	  Marked these macros as deprecated, and removed the version of
+	  these macros that defined the obsolete "CORBA_foo" broken
+	  namespace workaround classes.
 
 Wed Aug  4 14:46:07 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * Makefile.am:
-        * configure.ac:
-          Configure TAO if TAO subdirectory is present.
+	* Makefile.am:
+	* configure.ac:
+	  Configure TAO if TAO subdirectory is present.
 
 Wed Aug  4 16:33:14 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * ace/Select_Reactor_T.cpp:
+	* ace/Select_Reactor_T.cpp:
 
-          Fix for Bug 1893. Please see
+	  Fix for Bug 1893. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1893
+	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1893
 
-          for details. Thanks to Alan L Batongbacal <alanlb at vt dot edu>
-          for the patch.
+	  for details. Thanks to Alan L Batongbacal <alanlb at vt dot edu>
+	  for the patch.
 
 Wed Aug  4 08:31:43 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ace/config-linux-common.h: If the version of glibc
-          is less than 2.1 add the ACE_HAS_NONCONST_MSGSND macro.  Thanks
-          to Anand <anand@icmgworld.com> and Johnny Willemsen for this
-          fix.
+	* ace/config-linux-common.h: If the version of glibc
+	  is less than 2.1 add the ACE_HAS_NONCONST_MSGSND macro.  Thanks
+ 	  to Anand <anand@icmgworld.com> and Johnny Willemsen for this
+ 	  fix.
 
 Tue Aug  3 15:25:43 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        From Jaroslaw Nozderko <jaroslaw.nozderko@polkomtel.com.pl>.
-        * ace/Dev_Poll_Reactor.cpp (register_handler_i):
+	From Jaroslaw Nozderko <jaroslaw.nozderko@polkomtel.com.pl>.
+	* ace/Dev_Poll_Reactor.cpp (register_handler_i):
 
-          Allow same handler to be registered with a different event,
-          which is consistent with the other reactor implementations.
+	  Allow same handler to be registered with a different event,
+	  which is consistent with the other reactor implementations.
 
 Tue Aug  3 13:04:24 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/Svc_Handler.h:
-        * ace/Svc_Handler.cpp:
-          Add throw() exception specifier to no-throw version of class
-          local operator new.  In addition to squelching warnings from
-          gcc, this tells the compiler to check the return value before
-          constructing the object.
+	* ace/Svc_Handler.h:
+	* ace/Svc_Handler.cpp:
+	  Add throw() exception specifier to no-throw version of class
+	  local operator new.  In addition to squelching warnings from
+	  gcc, this tells the compiler to check the return value before
+	  constructing the object.
 
 Tue Aug  3 08:55:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/Condition_Recursive_Thread_Mutex.cpp:
-        * ace/Functor.inl:
-        * ace/config-borland-common.h:
-        * ace/config-g++-common.h:
-        * ace/config-hpux-11.00.h:
-        * ace/config-lite.h:
-        * ace/config-lynxos.h:
-        * ace/config-sunos5.5.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-win32-ghs.h:
-          Remove vestigial traces of ACE_TEMPLATE_METHOD_SPECIALIZATION.
+	* ace/Condition_Recursive_Thread_Mutex.cpp:
+	* ace/Functor.inl:
+	* ace/config-borland-common.h:
+	* ace/config-g++-common.h:
+	* ace/config-hpux-11.00.h:
+	* ace/config-lite.h:
+	* ace/config-lynxos.h:
+	* ace/config-sunos5.5.h:
+	* ace/config-tandem-nsk-mips-v2.h:
+	* ace/config-win32-ghs.h:
+	  Remove vestigial traces of ACE_TEMPLATE_METHOD_SPECIALIZATION.
 
 Tue Aug  3 14:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -3132,9 +116,9 @@ Tue Aug  3 14:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Tue Aug  3 08:22:10 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ace/config-aix-5.x.h:
-          ace/OS_NS_dirent.inl (readdir_r): Added support for AIX and G++.
-          Thanks to Raz Ben-Yehuda <raz.b@corigin.com>.
+	* ace/config-aix-5.x.h:
+	  ace/OS_NS_dirent.inl (readdir_r): Added support for AIX and G++.
+	  Thanks to Raz Ben-Yehuda <raz.b@corigin.com>.
 
 Tue Aug  3 11:56:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/Makefile.am b/Makefile.am
index 5d8d06f3c13..c06cc3d9981 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = 1.7 foreign
 
 
 bin_SCRIPTS = ace-config
diff --git a/NEWS b/NEWS
index c65207f0a7c..b15adefb207 100644
--- a/NEWS
+++ b/NEWS
@@ -6,26 +6,6 @@ PLANNED MAJOR CHANGES TARGETED FOR ACE-5.4.3
 
 - (Boris) Addition of XSC
 
-- (Steve, J.T., Ossama) Autoconfigure using all MPC-generated files.
-  **In progress. Mostly fighting with MPC.
-
-- (Steve) Wide-char functionality on POSIX (Linux, etc.)
-  Tue Aug 24 14:07:22 2004  Steve Huston  <shuston@riverace.com>
-  (and subsequent follow-ups)
-
-- (OCI) TSS memory leak fixes (Bug 1542)
-  ACE - Initially Fri Aug 13 15:26:40 2004  Dale Wilson  <wilson_d@ociweb.com>
-        with many others following on.
-   ** Finished: Mon Sep 13 15:31:23 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-
-- (Johnny) Ported to HPUX 11i v2 on Itanium
-  Finished, Mon Aug 23 17:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-*** not user visible, but probably significant anyway
-- Added code to ace for platform RedHat AS 3.0 on Opteron.
-  Wed Aug 25 14:58:51 2004  Rich Seibel <seibel_r@ociweb.com>
-  Wed Aug 25 14:49:11 2004  Rich Seibel <seibel_r@ociweb.com>
 
 USER VISIBLE CHANGES BETWEEN ACE-5.4.1 and ACE-5.4.2
 ====================================================
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index e138fa4c983..61a9c6153c9 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -1,9 +1,7 @@
-[Please use the PRF form below to submit bug reports, problem reports,
- etc., to the ACE developers and interested users.  Send to
- ace-bugs@cs.wustl.edu.  If you are using OCI, PrismTech, or
- Riverace's versions of ACE do not send bugs to this mailing list, but
- instead contact those companies for support.  Please also send your
- PRF as plain ASCII text, _not_ uuencoded or as an attachment.
+[Please use the form below to submit bug reports, problem
+ reports, etc., to the ACE developers and interested users.
+ Send to ace-bugs@cs.wustl.edu.  Please send it as plain
+ ASCII text, _not_ uuencoded or as an attachment.
 
  We prefer that all bug reports be submitted through our bug tracking
  system.  See $ACE_ROOT/docs/usage-bugzilla.html for more information
@@ -35,8 +33,8 @@
  When including your config.h and platform_macros.GNU files as requested
  below, only include the contents if you use the recommended method of
  including the platform-specific file in your file. If you use a link
- to the platform-specific file, simply state which one - DO NOT
- include an entire platform-specific configuration file in the form.
+ to the platform-specific file, simply state which one - DO NOT include
+ an entire platform-specific configuration file in the form.
 
 8<----------8<----------8<----------8<----------8<----------8<----------8<----
 
@@ -57,10 +55,7 @@ Subject: [area]: [synopsis]
 
     CONTENTS OF $ACE_ROOT/include/makeinclude/platform_macros.GNU (unless
     this isn't used in this case, e.g., with Microsoft Visual C++):
-
-    CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-    (used by MPC when you generate your own makefiles):
-
+    
     AREA/CLASS/EXAMPLE AFFECTED:
 [What example failed?  What module failed to compile?]
 
diff --git a/Release b/Release
index f57dca04732..64aff33dfa8 100644
--- a/Release
+++ b/Release
@@ -55,7 +55,6 @@ CONTROLLED_FILES = \
         ChangeLog* \
         FAQ \
         Release \
-        NEWS \
         ACE.mwc \
         Makefile.am \
         PROBLEM-REPORT-FORM \
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
index 5008a43f5d8..3f1f1761bb8 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
@@ -224,13 +224,13 @@ namespace CCF
 
         /*
 
-        Let me know if you need this function.
+	Let me know if you need this function.
 
         ScopedName
         eponym () const
         {
         }
-        */
+	*/
 
       public:
         static Introspection::TypeInfo const&
@@ -460,7 +460,7 @@ namespace CCF
         }
 
         void
-        add_edge_right (Extends&)
+        add_edge_right (Extends& e)
         {
         }
 
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
index 1318ef3c5ef..745e017f9f9 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
@@ -324,7 +324,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type&)
+        pre (Type& e)
         {
         }
 
@@ -335,12 +335,12 @@ namespace CCF
         }
 
         virtual void
-        name (Type&)
+        name (Type& e)
         {
         }
 
         virtual void
-        post (Type&)
+        post (Type& e)
         {
         }
       };
@@ -395,7 +395,7 @@ namespace CCF
       public:
         /* GCC#13590/DR#39
         using Node<T>::edge_traverser;
-        */
+	*/
 
         virtual void
         traverse (T& s)
diff --git a/TAO/CIAO/CIAOTAO.mwc b/TAO/CIAO/CIAOTAO.mwc
index 263b2ca181f..e3990dd3245 100644
--- a/TAO/CIAO/CIAOTAO.mwc
+++ b/TAO/CIAO/CIAOTAO.mwc
@@ -14,5 +14,4 @@ workspace {
   DAnCE
   ciao
   tools
-  tests
 }
diff --git a/TAO/CIAO/CIDLC/CIDLC.mpc b/TAO/CIAO/CIDLC/CIDLC.mpc
index 87e965a1942..e656af7e913 100644
--- a/TAO/CIAO/CIDLC/CIDLC.mpc
+++ b/TAO/CIAO/CIDLC/CIDLC.mpc
@@ -6,16 +6,11 @@ project(CIDLC) {
   includes += .. ../CCF
   after += IDL2 IDL3 CIDL CodeGenerationKit CompilerElements
   install = ../bin
-  libpaths += ../CCF/CCF ../../../lib
+  libpaths += ../CCF/CCF
   libs += CIDL IDL3 IDL2 CodeGenerationKit CompilerElements
   Source_Files {
     ExecutorMappingGenerator.cpp
     DescriptorGenerator.cpp
-    ExecImplGenerator.cpp
-    ExecImplHeaderGenerator.cpp
-    ExecImplSourceGenerator.cpp
-    ExecutorMappingGenerator.cpp
-    RepositoryIdGenerator.cpp
     SizeTypeCalculator.cpp
     ServantGenerator.cpp
     ServantHeaderGenerator.cpp
diff --git a/TAO/CIAO/CIDLC/CIDLC.vcproj b/TAO/CIAO/CIDLC/CIDLC.vcproj
index 511dc643b53..dda9630e47a 100644
--- a/TAO/CIAO/CIDLC/CIDLC.vcproj
+++ b/TAO/CIAO/CIDLC/CIDLC.vcproj
@@ -1,225 +1,208 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="CIDLC"
-	ProjectGUID="{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../bin"
-			IntermediateDirectory="$(ProjectDir)/Debug"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"
-				Optimization="0"
-				AdditionalIncludeDirectories="..,../CCF"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_REGEX_NO_LIB;BOOST_REGEX_STATIC_LINK"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="CompilerElements.lib CodeGenerationKit.lib IDL2.lib IDL3.lib CIDL.lib libboost_filesystem_debug.lib libboost_regex_debug.lib"
-				OutputFile="$(OutDir)/cidlc.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../CCF/CCF/CompilerElements;../CCF/CCF/CodeGenerationKit;../CCF/CCF/IDL2;../CCF/CCF/IDL3;../CCF/CCF/CIDL"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/CIDLC.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectDir)"
-			IntermediateDirectory="$(ProjectDir)/Release"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"
-				AdditionalIncludeDirectories="..,../CCF"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="CompilerElements.lib CodeGenerationKit.lib IDL2.lib IDL3.lib CIDL.lib"
-				OutputFile="$(OutDir)/CIDLC.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../CCF/CCF/CompilerElements;../CCF/CCF/CodeGenerationKit;../CCF/CCF/IDL2;../CCF/CCF/IDL3;../CCF/CCF/CIDL"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\cidlc.cpp">
-			</File>
-			<File
-				RelativePath=".\DescriptorGenerator.cpp">
-			</File>
-			<File
-				RelativePath=".\ExecImplGenerator.cpp">
-			</File>
-			<File
-				RelativePath=".\ExecImplHeaderGenerator.cpp">
-			</File>
-			<File
-				RelativePath=".\ExecImplSourceGenerator.cpp">
-			</File>
-			<File
-				RelativePath=".\ExecutorMappingGenerator.cpp">
-			</File>
-			<File
-				RelativePath=".\Literals.cpp">
-			</File>
-			<File
-				RelativePath=".\RepositoryIdGenerator.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ServantGenerator.cpp">
-			</File>
-			<File
-				RelativePath=".\ServantHeaderGenerator.cpp">
-			</File>
-			<File
-				RelativePath=".\ServantSourceGenerator.cpp">
-			</File>
-			<File
-				RelativePath=".\SizeTypeCalculator.cpp">
-			</File>
-			<File
-				RelativePath=".\TypeNameEmitter.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\Collectors.hpp">
-			</File>
-			<File
-				RelativePath=".\DescriptorGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ExecImplGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ExecImplHeaderGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ExecImplSourceGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ExecutorMappingGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\Literals.hpp">
-			</File>
-			<File
-				RelativePath=".\RepositoryIdGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ServantGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ServantHeaderGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ServantSourceGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\SizeTypeCalculator.hpp">
-			</File>
-			<File
-				RelativePath=".\TypeNameEmitter.hpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="CIDLC"
+	ProjectGUID="{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../bin"
+			IntermediateDirectory="$(ProjectDir)/Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"
+				Optimization="0"
+				AdditionalIncludeDirectories="..,../CCF"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_REGEX_NO_LIB;BOOST_REGEX_STATIC_LINK"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="CompilerElements.lib CodeGenerationKit.lib IDL2.lib IDL3.lib CIDL.lib libboost_filesystem_debug.lib libboost_regex_debug.lib"
+				OutputFile="$(OutDir)/cidlc.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../CCF/CCF/CompilerElements;../CCF/CCF/CodeGenerationKit;../CCF/CCF/IDL2;../CCF/CCF/IDL3;../CCF/CCF/CIDL"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/CIDLC.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectDir)"
+			IntermediateDirectory="$(ProjectDir)/Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"
+				AdditionalIncludeDirectories="..,../CCF"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="CompilerElements.lib CodeGenerationKit.lib IDL2.lib IDL3.lib CIDL.lib"
+				OutputFile="$(OutDir)/CIDLC.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../CCF/CCF/CompilerElements;../CCF/CCF/CodeGenerationKit;../CCF/CCF/IDL2;../CCF/CCF/IDL3;../CCF/CCF/CIDL"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\cidlc.cpp">
+			</File>
+			<File
+				RelativePath=".\DescriptorGenerator.cpp">
+			</File>
+			<File
+				RelativePath=".\ExecutorMappingGenerator.cpp">
+			</File>
+			<File
+				RelativePath=".\Literals.cpp">
+			</File>
+			<File
+				RelativePath=".\RepositoryIdGenerator.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\ServantGenerator.cpp">
+			</File>
+			<File
+				RelativePath=".\ServantHeaderGenerator.cpp">
+			</File>
+			<File
+				RelativePath=".\ServantSourceGenerator.cpp">
+			</File>
+			<File
+				RelativePath=".\SizeTypeCalculator.cpp">
+			</File>
+			<File
+				RelativePath=".\TypeNameEmitter.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\Collectors.hpp">
+			</File>
+			<File
+				RelativePath=".\DescriptorGenerator.hpp">
+			</File>
+			<File
+				RelativePath=".\ExecutorMappingGenerator.hpp">
+			</File>
+			<File
+				RelativePath=".\Literals.hpp">
+			</File>
+			<File
+				RelativePath=".\RepositoryIdGenerator.hpp">
+			</File>
+			<File
+				RelativePath=".\ServantGenerator.hpp">
+			</File>
+			<File
+				RelativePath=".\ServantHeaderGenerator.hpp">
+			</File>
+			<File
+				RelativePath=".\ServantSourceGenerator.hpp">
+			</File>
+			<File
+				RelativePath=".\SizeTypeCalculator.hpp">
+			</File>
+			<File
+				RelativePath=".\TypeNameEmitter.hpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp b/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
index cd940a233ee..41856f9d4d6 100644
--- a/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
@@ -991,19 +991,19 @@ namespace
     }
 
     virtual void
-    pre (InParameter&)
+    pre (InParameter& p)
     {
       os << "in ";
     }
 
     virtual void
-    pre (OutParameter&)
+    pre (OutParameter& p)
     {
       os << "out ";
     }
 
     virtual void
-    pre (InOutParameter&)
+    pre (InOutParameter& p)
     {
       os << "inout ";
     }
@@ -1119,7 +1119,7 @@ namespace
     }
 
     virtual void
-    names (Type&)
+    names (Type& h)
     {
       os << "{"
          << STRS[COMP_EC] << " "
@@ -1464,7 +1464,7 @@ namespace
     }
 
     virtual void
-    implements (Type&)
+    implements (Type& i)
     {
       // os << " : ";
 
diff --git a/TAO/CIAO/CIDLC/Literals.cpp b/TAO/CIAO/CIDLC/Literals.cpp
index 3055be54d61..221ac34925b 100644
--- a/TAO/CIAO/CIDLC/Literals.cpp
+++ b/TAO/CIAO/CIDLC/Literals.cpp
@@ -79,9 +79,7 @@ namespace StringLiterals
     "// Your code here.",                                 // YCH
     "//==================================================================", // SEP
 
-    "variable-size",                                      // VAR_SIZE
-    "_ciao_extract_val",                                  // EXTRACT
-    "_ciao_extract_tmp"                                   // EXTRACT_TMP
+    "variable-size"                                       // VAR_SIZE
   };
 }
 
diff --git a/TAO/CIAO/CIDLC/Literals.hpp b/TAO/CIAO/CIDLC/Literals.hpp
index 88803330609..d173026fa2f 100644
--- a/TAO/CIAO/CIDLC/Literals.hpp
+++ b/TAO/CIAO/CIDLC/Literals.hpp
@@ -49,8 +49,6 @@ namespace StringLiterals
     YCH,
     SEP,
     VAR_SIZE,
-    EXTRACT,
-    EXTRACT_TMP,
     SIZE
   };
 
diff --git a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
index 796f2ef848e..7746dac71b5 100644
--- a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
+++ b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
@@ -6,124 +6,54 @@
 #include "Literals.hpp"
 
 #include "CCF/CompilerElements/Diagnostic.hpp"
+
+#include "CCF/CIDL/SemanticGraph.hpp"
 #include "CCF/CIDL/Traversal.hpp"
-#include "CCF/CodeGenerationKit/Regex.hpp"
 
 using namespace CCF::CIDL;
-using namespace CCF::CIDL::SemanticGraph;
-using namespace StringLiterals;
-using namespace std;
+using namespace SyntaxTree;
 
 namespace
 {
-  string
-  name_to_string (Name const& n)
-  {
-    ostringstream os;
-    os << n;
-    return os.str ();
-  }
-
-  Nameable* defined_in (Nameable& n)
-  {
-    for (Nameable::NamedIterator i (n.named_begin ()), e (n.named_end ());
-        i != e;
-        ++i)
-    {
-      if (Defines* d = dynamic_cast<Defines*> (*i))
-      {
-        return &d->scope ();
-      }
-    }
-
-    return 0;
-  }
-  
-  void
-  compute_new_repo_id (Nameable& d)
-  {
-    string prefix ("");
-    TypePrefix *tp = 0;
-
-    if (d.context ().count (STRS[TYPE_PREFIX]))
-    {
-      tp = d.context ().get<TypePrefix*> (STRS[TYPE_PREFIX]);
-      prefix = tp->prefix ().literal ();
-    }
-    else
-    {
-      Nameable* parent = defined_in (d);
-
-      while (parent != 0)
-      {
-        if (parent->context ().count (STRS[TYPE_PREFIX]))
-        {
-          tp =
-            parent->context ().get<TypePrefix*> (STRS[TYPE_PREFIX]);
-
-          prefix = tp->prefix ().literal ();
-          break;
-        }
-
-        parent = defined_in (*parent);
-      }
-    }
-
-    if (prefix != "") prefix += "/";
-
-    ScopedName scoped (d.scoped_name ());
-    Name stripped (scoped.begin () + 1, scoped.end ());
-
-    string scope_name = regex::perl_s (name_to_string (stripped), "%::%/%");
-
-    string repo_id = "IDL:" + prefix + scope_name + ":1.0";
-
-    d.context ().set<string> (STRS[REPO_ID], repo_id);
-  }
+  char const* const
+  type_id_label = "CIDLC::RepositoryIdGenerator::TypeId";
 
-  void
-  compute_repo_id (Nameable& d)
-  {
-    if (d.context ().count (STRS[REPO_ID]))
-    {
-      return;
-    }
-    else
-    {
-      compute_new_repo_id (d);
-    }
-  }
+  char const* const
+  type_prefix_label = "CIDLC::RepositoryIdGenerator::TypePrefix";
 }
 
 namespace
 {
+  //
+  //
+  //
   class TypeIdLabelGenerator : public Traversal::TypeId
   {
   public:
-    TypeIdLabelGenerator (Diagnostic::Stream& dout,
-                          TranslationUnit& tu)
-      : dout_ (dout),
-        tu_ (tu)
+    TypeIdLabelGenerator (Diagnostic::Stream& dout)
+        : dout_ (dout)
     {
     }
 
     virtual void
-    traverse (SemanticGraph::TypeId& ti)
+    traverse (TypeIdPtr const& ti)
     {
-      ScopedName decl_name (ti.declaration ());
-      Nameables ref = tu_.lookup (decl_name);
+      ScopedName decl_name (ti->declaration ());
 
-      for (Nameables::const_iterator iter (ref.begin ());
-           iter != ref.end ();
-           ++iter)
+      DeclarationTable::IteratorPair iters (
+        ti->table ().lookup (decl_name));
+
+      for (; iters.first != iters.second; ++iters.first)
       {
-        Nameable *decl = *iter;
+        DeclarationPtr decl (*iters.first);
 
-        if (decl->context ().count (STRS[TYPE_ID]))
+        if (decl->context ().count (
+              StringLiterals::STRS[StringLiterals::TYPE_ID]))
         {
           //@@ Seems it should contain filename and line
           //   of its origin.
           //
+
           Diagnostic::Error err ("???", 0);
 
           err << "repetition of typeid for " << decl_name
@@ -139,50 +69,56 @@ namespace
         }
         else
         {
-          decl->context ().set (STRS[TYPE_ID], &ti);
-          decl->context ().set (STRS[REPO_ID], ti.id ().literal ());
+          decl->context ().set (
+            StringLiterals::STRS[StringLiterals::TYPE_ID], ti);
+          decl->context ().set (
+            StringLiterals::STRS[StringLiterals::REPO_ID], ti->id ().str ());
         }
       }
     }
 
   private:
     Diagnostic::Stream& dout_;
-    SemanticGraph::TranslationUnit& tu_;
   };
 
+
+  //
+  //
+  //
   class TypePrefixLabelGenerator : public Traversal::TypePrefix
   {
   public:
-    TypePrefixLabelGenerator (Diagnostic::Stream& dout,
-                              TranslationUnit& tu)
-      : dout_ (dout),
-        tu_ (tu)
+    TypePrefixLabelGenerator (Diagnostic::Stream& dout)
+        : dout_ (dout)
     {
     }
 
     virtual void
-    traverse (SemanticGraph::TypePrefix& tp)
+    traverse (TypePrefixPtr const& tp)
     {
-      ScopedName decl_name (tp.declaration ());
-      Nameables ref = tu_.lookup (decl_name);
+      ScopedName decl_name (tp->declaration ());
+
+      DeclarationTable::IteratorPair iters (
+        tp->table ().lookup (decl_name));
 
-      for (Nameables::const_iterator iter (ref.begin ());
-           iter != ref.end ();
-           ++iter)
+      for (; iters.first != iters.second; ++iters.first)
       {
-        Nameable *decl = *iter;
-        CCF::CompilerElements::Context& ctx = decl->context ();
+        DeclarationPtr decl (*iters.first);
 
-        if (ctx.count (STRS[TYPE_PREFIX]))
+        if (decl->context ().count (
+              StringLiterals::STRS[StringLiterals::TYPE_PREFIX]))
         {
-          SemanticGraph::TypePrefix* prev =
-            ctx.get<SemanticGraph::TypePrefix*> (STRS[TYPE_PREFIX]);
-        
-          if (prev->prefix () != tp.prefix ())
+          TypePrefixPtr prev (
+            decl->context ().get<TypePrefixPtr> (
+              StringLiterals::STRS[StringLiterals::TYPE_PREFIX]));
+
+          if ((prev->prefix ()) != (tp->prefix ()))
           {
-            //@@ Seems tp should contain filename and line
+
+            //@@ Seems tp should containt filename and line
             //   of it's origin.
             //
+
             Diagnostic::Error err ("???", 0);
 
             err << "resetting type prefix for " << decl_name
@@ -199,85 +135,42 @@ namespace
         }
         else
         {
-          decl->context ().set (STRS[TYPE_PREFIX], &tp);
-          
-          // A typeprefix declaration could appear after the IDL
-          // type declaration, so we want to update the repo id
-          // every time.
-          compute_new_repo_id (*decl);
+          decl->context ().set (
+            StringLiterals::STRS[StringLiterals::TYPE_PREFIX], tp);
         }
       }
     }
 
   private:
     Diagnostic::Stream& dout_;
-    SemanticGraph::TranslationUnit& tu_;
-  };
-  
-  class RepoIdGenerator : public Traversal::Interface,
-                          public Traversal::EventType
-  {
-    virtual void
-    traverse (SemanticGraph::Interface& i)
-    {
-      compute_repo_id (i);
-    }
-    
-    virtual void
-    traverse (SemanticGraph::EventType& e)
-    {
-      compute_repo_id (e);
-    }
   };
 }
 
 
-bool RepositoryIdGenerator::generate (TranslationUnit& u)
+bool RepositoryIdGenerator::
+generate (TranslationUnitPtr const& u)
 {
-  Diagnostic::Stream dout;
-
-  TypeIdLabelGenerator type_id (dout, u);
-  TypePrefixLabelGenerator type_prefix (dout, u);
-  RepoIdGenerator repo_id;
-
-  Traversal::TranslationUnit unit;
-
-  Traversal::ContainsPrincipal contains_principal;
-  unit.edge_traverser (contains_principal);
-
-  Traversal::TranslationRegion region;
-  contains_principal.node_traverser (region);
-
-  Traversal::ContainsRoot contains_root;
-  Traversal::Includes includes;
-  
-  region.edge_traverser (includes);
-  region.edge_traverser (contains_root);
-  
-  Traversal::Root root;  
-  includes.node_traverser (region);
-  contains_root.node_traverser (root);
-
-  Traversal::Defines defines;
-  root.edge_traverser (defines);
-
-  Traversal::Module module;
-  
-  defines.node_traverser (module);
-  defines.node_traverser (type_id);
-  defines.node_traverser (type_prefix);
-  defines.node_traverser (repo_id);
-  
-  module.edge_traverser (defines);
-  
-  Traversal::Interface iface;
-  defines.node_traverser (iface);
-  
-  unit.traverse (u);
-
-  if (dout.error_count () != 0) return false;
-
-  //@@ check errors
+  {
+    Diagnostic::Stream dout;
+
+    TypeIdLabelGenerator type_id (dout);
+    TypePrefixLabelGenerator type_prefix (dout);
+
+    Traversal::Scope scope;
+    scope.add_scope_delegate (&type_id);
+    scope.add_scope_delegate (&type_prefix);
+
+    Traversal::TranslationRegion region (&scope);
+
+    Traversal::TranslationUnit unit;
+    unit.add_content_delegate (&region);
+
+    unit.dispatch (u);
+
+    if (dout.error_count () != 0) return false;
+
+    //@@ check errors
+  }
 
   return true;
 }
diff --git a/TAO/CIAO/CIDLC/RepositoryIdGenerator.hpp b/TAO/CIAO/CIDLC/RepositoryIdGenerator.hpp
index 36dc13e064e..0f15807a3b7 100644
--- a/TAO/CIAO/CIDLC/RepositoryIdGenerator.hpp
+++ b/TAO/CIAO/CIDLC/RepositoryIdGenerator.hpp
@@ -15,7 +15,7 @@ class RepositoryIdGenerator
 {
 public:
   bool
-  generate (CCF::CIDL::SemanticGraph::TranslationUnit& u);
+  generate (CCF::CIDL::SyntaxTree::TranslationUnitPtr const&);
 };
 
 #endif  // CIDLC_REPOSITORY_ID_GENERATOR_HPP
diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
index 0678c8cccd7..8e36ceadaa4 100644
--- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
@@ -132,7 +132,7 @@ namespace
     virtual void
     post (Type&)
     {
-      os << ";" << endl;
+      os << ";" << endl << endl;
     }
 
     virtual void
@@ -338,7 +338,7 @@ namespace
     traverse (UnconstrainedInterface& i)
     {
       if (i.context ().count ("facet_hdr_gen")) return;
-
+    
       ScopedName scoped (i.scoped_name ());
       Name stripped (scoped.begin () + 1, scoped.end ());
 
@@ -416,7 +416,6 @@ namespace
          << "_get_component (" << endl
          << STRS[ENV_SNGL_HDR] << ")" << endl
          << STRS[EXCP_SNGL] << ";" << endl
-         << endl
          << "protected:" << endl
          << "// Facet executor." << endl
          << i.scoped_name ().scope_name ()<< "::CCM_" << i.name ()
@@ -424,14 +423,14 @@ namespace
          << "// Context object." << endl
          << "::Components::CCMContext_var ctx_;" << endl
          << "};";
-
-      os << "typedef " << ctx.export_macro () << " "
-         << i.name () << "_Servant_T<int> "
+         
+      os << "typedef " << ctx.export_macro () << " " 
+         << i.name () << "_Servant_T<int> " 
          << i.name () << "_Servant;";
 
       // Close the CIAO_GLUE namespace.
       os << "}";
-
+      
       i.context ().set ("facet_hdr_gen", true);
     }
   };
@@ -736,33 +735,21 @@ namespace
       os << STRS[GLUE_NS]
          << regex::perl_s (t.scoped_name ().scope_name ().str (), "/::/_/")
          << "{";
-         
-      os << "class " << t.name () << "_Servant;" << endl;
 
       os << "class " << ctx.export_macro () << " " << t.name ()
          << "_Context" << endl
-         << "  : public virtual CIAO::Context_Impl<" << endl
-         << "      " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_Context," << endl
-         << "      " << t.name () << "_Servant," << endl
-         << "      " << t.scoped_name () << "," << endl
-         << "      " << t.scoped_name () << "_var" << endl
-         << "    >" << endl
+         << ": public virtual " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "_Context,"
+         << endl
+         << "public virtual TAO_Local_RefCounted_Object"
+         << endl
          << "{"
          << "public:" << endl;
 
       os << "// We will allow the servant glue code we generate to "
          << "access our state." << endl
-         << "friend class " << t.name () << "_Servant;" << endl;
-
-      os << "/// Hack for VC6." << endl
-         << "typedef CIAO::Context_Impl<" << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_Context," << endl
-         << "    " << t.name () << "_Servant," << endl
-         << "    " << t.scoped_name () << "," << endl
-         << "    " << t.scoped_name () << "_var" << endl
-         << "  > ctx_svnt_base;" << endl;
+         << "friend class " << t.name () << "_Servant;"
+         << endl;
 
       os << t.name () << "_Context (" << endl
          << "::Components::CCMHome_ptr home," << endl
@@ -772,6 +759,55 @@ namespace
       os << "virtual ~" << t.name () << "_Context (void);"
          << endl;
 
+      os << "// Operations from ::Components::CCMContext." << endl << endl;
+
+      os << "virtual ::Components::Principal_ptr" << endl
+         << "get_caller_principal (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl;
+
+      os << "virtual ::Components::CCMHome_ptr" << endl
+         << "get_CCM_home (" << endl
+         << STRS[ENV_SNGL_HDR_NOTUSED] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl ;
+
+      os << "virtual CORBA::Boolean" << endl
+         << "get_rollback_only (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IS] << "));" << endl;
+
+      os << "virtual ::Components::Transaction::UserTransaction_ptr" << endl
+         << "get_user_transaction (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IS] << "));" << endl;
+
+      os << "virtual CORBA::Boolean" << endl
+         << "is_caller_in_role (" << endl
+         << "const char *role" << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl;
+
+      os << "virtual void" << endl
+         << "set_rollback_only (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IS] << "));" << endl;
+
+      os << "// Operations from " << STRS[COMP_SC] << " interface."
+         << endl << endl;
+
+      os << "virtual CORBA::Object_ptr" << endl
+         << "get_CCM_object (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IS] << "));" << endl;
+
       os << "// Operations for " << t.name () << " receptacles"
          << " and event sources," << endl
          << "// defined in " << t.scoped_name ().scope_name () << "::CCM_"
@@ -794,7 +830,9 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "// CIAO-specific." << endl << endl;
+      os << "// CIAO-specific." << endl << endl
+         << "::CIAO::Session_Container *" << endl
+         << "_ciao_the_Container (void) const;" << endl;
 
       os << "static " << t.name () << "_Context *" << endl
          << "_narrow (" << endl
@@ -843,6 +881,11 @@ namespace
     virtual void
     post (Type& t)
     {
+      os << "::Components::CCMHome_var home_;" << endl
+         << "::CIAO::Session_Container *container_;" << endl << endl
+         << t.name () << "_Servant *servant_;" << endl
+         << t.scoped_name () << "_var component_;" << endl;
+
       // Component context class closer.
       os << "};";
 
@@ -1146,72 +1189,6 @@ namespace
       Traversal::Belongs belongs_;
     };
 
-    struct PortsEmitterPrivate : Traversal::EmitterData,
-                                 Traversal::SingleUserData,
-                                 Traversal::MultiUserData,
-                                 Traversal::PublisherData,
-                                 Traversal::ConsumerData,
-                                 Traversal::ProviderData,
-                                 EmitterBase
-    {
-      PortsEmitterPrivate (Context& c)
-        : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
-          simple_type_name_emitter_ (c.os ()),
-          stripped_type_name_emitter_ (c.os ())
-      {
-        belongs_.node_traverser (type_name_emitter_);
-        simple_belongs_.node_traverser (simple_type_name_emitter_);
-        stripped_belongs_.node_traverser (stripped_type_name_emitter_);
-      }
-
-      virtual void
-      traverse (SemanticGraph::Provider& p)
-      {
-        os << "::CORBA::Object_ptr" << endl
-           << "provide_" << p.name () << "_i (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
-      }
-
-      virtual void
-      traverse (SemanticGraph::SingleUser& u)
-      {
-      }
-
-      virtual void
-      traverse (SemanticGraph::MultiUser& u)
-      {
-      }
-
-      virtual void
-      traverse (SemanticGraph::Consumer& c)
-      {
-        os << "::Components::EventConsumerBase_ptr" << endl
-           << "get_consumer_" << c.name () << "_i (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
-      }
-
-      virtual void
-      traverse (SemanticGraph::Emitter& e)
-      {
-      }
-
-      virtual void
-      traverse (SemanticGraph::Publisher& p)
-      {
-      }
-
-    private:
-      TypeNameEmitter type_name_emitter_;
-      SimpleTypeNameEmitter simple_type_name_emitter_;
-      StrippedTypeNameEmitter stripped_type_name_emitter_;
-      Traversal::Belongs belongs_;
-      Traversal::Belongs simple_belongs_;
-      Traversal::Belongs stripped_belongs_;
-    };
-
   public:
     virtual void
     pre (Type& t)
@@ -1227,39 +1204,35 @@ namespace
          << "_Servant" << endl
          << "  : public virtual CIAO::Servant_Impl<" << endl
          << "      POA_" << stripped << "," << endl
-         << "      " << t.scoped_name ().scope_name () << "::CCM_"
+         << "      " << t.scoped_name ().scope_name () << "::CCM_" 
          << t.name () << "," << endl
          << "      " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_var," << endl
          << "      " << t.name () << "_Context" << endl
-         << "    >" << endl
+         << "    >," << endl
+         << "    " << STRS[INH_RCSB] << endl
          << "{"
          << "public:" << endl;
 
-      os << "/// Hack for VC6." << endl
-               << "typedef CIAO::Servant_Impl<" << endl
-               << "    POA_" << stripped << "," << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
+      os << "/// Hack for VC6 the most sucky compiler" << endl
+	       << "typedef CIAO::Servant_Impl<" << endl
+	       <<  "POA_" << stripped << "," << endl
+         << "      " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "," << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
+         << "      " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_var," << endl
-         << "    " << t.name () << "_Context" << endl
-         << "  > comp_svnt_base;" << endl << endl;
+         << "      " << t.name () << "_Context" << endl
+         << "    > our_base;" << endl;
 
       os << t.name () << "_Servant (" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
          << "_ptr executor," << endl
          << "::Components::CCMHome_ptr home," << endl
-         << "::CIAO::Session_Container *c);" << endl << endl;
+         << "::CIAO::Session_Container *c);" << endl;
 
       os << "virtual ~" << t.name () << "_Servant (void);"
          << endl << endl;
 
-      os << "virtual void" << endl
-         << "set_attributes (" << endl
-         << "const ::Components::ConfigValues &descr" << endl
-         << STRS[ENV_SRC] << ");" << endl << endl;
-
       os << "// Supported operations." << endl << endl;
 
       // Generate operations for all supported interfaces.
@@ -1364,6 +1337,24 @@ namespace
         component_emitter.traverse (t);
       }
 
+      os << "// Operations for Navigation interface." << endl << endl;
+
+      os << "virtual CORBA::Object_ptr" << endl
+         << "provide_facet (" << endl
+         << "const char *name" << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "));" << endl << endl;
+
+      os << "virtual ::Components::FacetDescriptions *" << endl
+         << "get_named_facets (" << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "));" << endl << endl;
+
       os << "// Operations for Receptacles interface." << endl << endl;
 
       os << "virtual " << STRS[COMP_CK] << " *" << endl
@@ -1390,8 +1381,37 @@ namespace
          << STRS[EXCP_CR] << "," << endl
          << STRS[EXCP_NC] << "));" << endl << endl;
 
+      os << "virtual ::Components::ConnectionDescriptions *" << endl
+         << "get_connections (" << endl
+         << "const char *name" << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "));" << endl << endl;
+
+      os << "virtual ::Components::ReceptacleDescriptions *" << endl
+         << "get_all_receptacles (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "virtual ::Components::ReceptacleDescriptions *" << endl
+         << "get_named_receptacles (" << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "));" << endl << endl;
+
       os << "// Operations for Events interface." << endl << endl;
 
+      os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
+         << "get_consumer (" << endl
+         << "const char *sink_name" << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "));" << endl << endl;
+
       os << "virtual " << STRS[COMP_CK] << " *" << endl
          << "subscribe (" << endl
          << "const char *publisher_name," << endl
@@ -1424,39 +1444,118 @@ namespace
          << STRS[EXCP_AC] << "," << endl
          << STRS[EXCP_IC] << "));" << endl << endl;
 
-      os << "// CIAO specific operations on the servant " << endl
-         << "CORBA::Object_ptr" << endl
-         << "get_facet_executor (const char *name" << endl
+      os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
+         << "disconnect_consumer (" << endl
+         << "const char *source_name" << endl
          << STRS[ENV_HDR] << ")" << endl
          << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS]<< "));" << endl << endl;
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "," << endl
+         << STRS[EXCP_NC] << "));" << endl << endl;
 
-      os << "private:" << endl << endl;
+      os << "virtual ::Components::ConsumerDescriptions *" << endl
+         << "get_named_consumers (" << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "));" << endl << endl;
 
-      // Generate protected operations for facets and event sinks.
-      {
-        Traversal::Component component_emitter;
+      os << "virtual ::Components::EmitterDescriptions *" << endl
+         << "get_all_emitters (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
 
-        Traversal::Inherits component_inherits;
-        component_inherits.node_traverser (component_emitter);
+      os << "virtual ::Components::EmitterDescriptions *" << endl
+         << "get_named_emitters(" << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "));" << endl << endl;
 
-        Traversal::Defines defines;
-        component_emitter.edge_traverser (defines);
-        component_emitter.edge_traverser (component_inherits);
+      os << "virtual ::Components::PublisherDescriptions *" << endl
+         << "get_all_publishers (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
 
-        PortsEmitterProtected ports_emitter (ctx);
-        defines.node_traverser (ports_emitter);
+      os << "virtual ::Components::PublisherDescriptions *" << endl
+         << "get_named_publishers(" << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "));" << endl << endl;
 
-        component_emitter.traverse (t);
-      }
+      os << "// Operations for CCMObject interface." << endl << endl;
 
-      os << "private:" << endl << endl
-         << "void" << endl
-         << "populate_port_tables (" << endl
+      os << "virtual CORBA::IRObject_ptr" << endl
+         << "get_component_def (" << endl
          << STRS[ENV_SNGL_HDR] << ")" << endl
          << STRS[EXCP_SNGL] << ";" << endl << endl;
 
-      // Generate private operations for ports.
+      os << "virtual ::Components::CCMHome_ptr" << endl
+         << "get_ccm_home (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "virtual ::Components::PrimaryKeyBase *" << endl
+         << "get_primary_key (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_NKA] << "));" << endl << endl;
+
+      os << "virtual void" << endl
+         << "configuration_complete (" << endl
+         << STRS[ENV_SNGL_HDR_NOTUSED] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_ICF] << "));" << endl << endl;
+
+      os << "virtual void" << endl
+         << "remove (" << endl
+         << STRS[ENV_SNGL_HDR_NOTUSED] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_RF] << "));" << endl << endl;
+
+      os << "virtual ::Components::ComponentPortDescription *" << endl
+         << "get_all_ports(" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "// Get component implementation." << endl
+         << "virtual CORBA::Object_ptr" << endl
+         << "_get_component (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "// CIAO-specific operations." << endl << endl;
+
+      os << "void" << endl
+         << "ciao_preactivate (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "void" << endl
+         << "ciao_activate (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "void" << endl
+         << "ciao_postactivate (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "/// @@NOTE: The busted operation." << endl;
+
+      os << "void" << endl
+         << "_ciao_passivate (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      // Generate protected operations for facets and event sinks.
       {
         Traversal::Component component_emitter;
 
@@ -1467,11 +1566,16 @@ namespace
         component_emitter.edge_traverser (defines);
         component_emitter.edge_traverser (component_inherits);
 
-        PortsEmitterPrivate ports_emitter (ctx);
+        PortsEmitterProtected ports_emitter (ctx);
         defines.node_traverser (ports_emitter);
 
         component_emitter.traverse (t);
       }
+          
+      os << "private:" << endl << endl
+         << "void populate_port_tables (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
     }
 
     virtual void
@@ -1687,7 +1791,7 @@ namespace
       {
         os << "," << endl;
       }
-
+      
     private:
       ReturnTypeNameEmitter returns_emitter_;
       Traversal::Returns returns_;
@@ -1705,94 +1809,15 @@ namespace
 
       os << "class " << ctx.export_macro () << " " << t.name ()
          << "_Servant" << endl
-         << "  : public virtual CIAO::Home_Servant_Impl<" << endl
-         << "      POA_" << stripped << "," << endl
-         << "      " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "," << endl
-         << "      " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_var," << endl
-         << "      ";
-         
-      Traversal::Home::manages (t, manages_);
-
-      os << "," << endl
-         << "      ";
-      
-      Traversal::Home::manages (t, manages_);
-
-      os << "_var," << endl
-         << "      ";
-      
-      Traversal::Home::manages (t, enclosing_manages_);
-
-      os << "::CCM_";
-      
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "," << endl
-         << "      ";
-      
-      Traversal::Home::manages (t, enclosing_manages_);
-
-      os << "::CCM_";
-      
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "_var," << endl
-         << "      ";
-      
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "_Servant" << endl
-         << "    >" << endl
+         << ": public virtual POA_" << stripped << "," << endl
+         << STRS[INH_RCSB] << endl
          << "{"
-         << "public:" << endl
-         << "/// Hack for VC6." << endl
-         << "typedef CIAO::Home_Servant_Impl<" << endl
-         << "    POA_" << stripped << "," << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "," << endl
-         << "    " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_var," << endl
-         << "    ";
-         
-      Traversal::Home::manages (t, manages_);
-
-      os << "," << endl
-         << "    ";
-      
-      Traversal::Home::manages (t, manages_);
-
-      os << "_var," << endl
-         << "    ";
-      
-      Traversal::Home::manages (t, enclosing_manages_);
-
-      os << "::CCM_";
-      
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "," << endl
-         << "    ";
-      
-      Traversal::Home::manages (t, enclosing_manages_);
-
-      os << "::CCM_";
-      
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "_var," << endl
-         << "    ";
-      
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "_Servant" << endl
-         << "  > home_svnt_base;" << endl << endl;
+         << "public:" << endl;
 
       os << t.name () << "_Servant (" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
          << "_ptr exe," << endl
-         << "::CIAO::Session_Container *c);" << endl << endl;
+         << "::CIAO::Session_Container *c);" << endl;
 
       os << "virtual ~" << t.name () << "_Servant (void);"
          << endl << endl;
@@ -1925,6 +1950,51 @@ namespace
         home_emitter.traverse (t);
       }
 
+      // @@@ (JP) Need primary key support.
+      os << "// Operations for keyless home interface." << endl << endl;
+
+      os << "virtual ::Components::CCMObject_ptr" << endl
+         << "create_component (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << "::Components::CreateFailure));" << endl << endl;
+
+      os << "// Operations for implicit home interface." << endl << endl;
+
+      os << "virtual ";
+
+      Traversal::Home::manages (t, manages_);
+
+      os << "_ptr" << endl
+         << "create (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << "::Components::CreateFailure));" << endl << endl;
+
+      os << "// Operations for CCMHome interface." << endl << endl;
+
+      os << "virtual ::CORBA::IRObject_ptr" << endl
+         << "get_component_def (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "virtual ::CORBA::IRObject_ptr" << endl
+         << "get_home_def (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "virtual void" << endl
+         << "remove_component (" << endl
+         << "::Components::CCMObject_ptr comp" << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_RF] << "));" << endl << endl;
+
+      os << "// Supported operations." << endl << endl;
+
       // Generate operations for all supported interfaces.
       {
         Traversal::Home home_emitter;
@@ -1987,10 +2057,57 @@ namespace
         home_emitter.traverse (t);
       }
 
+      os << "protected:" << endl
+         << "// CIAO-specific operations." << endl << endl;
+
+      Traversal::Home::manages (t, manages_);
+
+      os << "_ptr" << endl
+         << "_ciao_activate_component (" << endl;
+
+      Traversal::Home::manages (t, enclosing_manages_);
+
+      os << "::CCM_";
+
+      Traversal::Home::manages (t, simple_manages_);
+
+      os << "_ptr exe" << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "void" << endl
+         << "_ciao_passivate_component (" << endl;
+
+      Traversal::Home::manages (t, manages_);
+
+      os << "_ptr comp" << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
+
+      os << "protected:" << endl;
+
+      os << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "_var" << endl
+         << "executor_;" << endl << endl;
+
+      os << "::CIAO::Session_Container *" << endl
+         << "container_;" << endl << endl;
+
+      os << "ACE_Hash_Map_Manager_Ex<" << endl
+         << "PortableServer::ObjectId," << endl;
+
+      Traversal::Home::manages (t, simple_manages_);
+
+      os << "_Servant *," << endl
+         << "TAO_ObjectId_Hash," << endl
+         << "ACE_Equal_To<PortableServer::ObjectId>," << endl
+         << "ACE_SYNCH_MUTEX>" << endl
+         << "component_map_;" << endl << endl;
+
       // Home servant class closer.
       os << "};";
 
-      os << "extern \"C\" " << ctx.export_macro ()
+      os << "extern \"C\" " << ctx.export_macro () 
          << " ::PortableServer::Servant" << endl
          << "create" << t.name () << "_Servant (" << endl
          << "::Components::HomeExecutorBase_ptr p," << endl
@@ -2003,7 +2120,7 @@ namespace
       // Namespace closer.
       os << "}";
     }
-
+    
   private:
     TypeNameEmitter type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
@@ -2145,8 +2262,8 @@ ServantHeaderEmitter::pre (TranslationUnit& u)
 
   os << "#include \"ciao/Container_Base.h\"" << endl
      << "#include \"ciao/Servant_Impl_T.h\"" << endl
-     << "#include \"ciao/Context_Impl_T.h\"" << endl
-     << "#include \"ciao/Home_Servant_Impl_T.h\"" << endl
+     << "#include \"tao/LocalObject.h\"" << endl
+     << "#include \"tao/PortableServer/Key_Adapters.h\"" << endl
      << "#include \"ace/Active_Map_Manager_T.h\"" << endl << endl;
 }
 
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index ed7ea448eae..fae9db4bad2 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -305,40 +305,6 @@ namespace
     std::ostream& os;
   };
 
-  struct RepoIdEmitter : Traversal::Type
-  {
-    RepoIdEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << "\"" << t.context ().get<string> (STRS[REPO_ID]) << "\"";
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  struct ConsumerRepoIdEmitter : Traversal::Type
-  {
-    ConsumerRepoIdEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      string holder (t.context ().get<string> (STRS[REPO_ID]));
-      os << "\"" << holder.substr (0, holder.rfind (':'))
-         << "Consumer:1.0\"";
-    }
-
-  private:
-    std::ostream& os;
-  };
-
   struct InterfaceEmitter : Traversal::UnconstrainedInterface,
                             EmitterBase
   {
@@ -664,7 +630,7 @@ namespace
          << STRS[ENV_SNGL_ARG] << ");" << endl
          << "}"
          << "ACE_THROW_RETURN (CORBA::INTERNAL (), 0);" << endl
-         << "}" << endl;
+         << "}";
 
       // Close the CIAO_GLUE namespace.
       os << "}";
@@ -1166,8 +1132,9 @@ namespace
          << "::Components::CCMHome_ptr home," << endl
          << "::CIAO::Session_Container *c," << endl
          << t.name () << "_Servant *sv)" << endl
-         << "  : Context_Impl_Base (home, c)," << endl
-         << "    ctx_svnt_base (home, c, sv)" << endl
+         << ": home_ (::Components::CCMHome::_duplicate (home))," << endl
+         << "container_ (c)," << endl
+         << "servant_ (sv)" << endl
          << "{"
          << "}";
 
@@ -1176,6 +1143,108 @@ namespace
          << "{"
          << "}";
 
+      os << "// Operations from ::Components::CCMContext." << endl << endl;
+
+      os << "::Components::Principal_ptr" << endl
+         << t.name () << "_Context::"
+         << "get_caller_principal (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << endl
+         << "::CORBA::NO_IMPLEMENT ()," << endl
+         << "::Components::Principal::_nil ());" << endl
+         << "}";
+
+      os << "::Components::CCMHome_ptr" << endl
+         << t.name () << "_Context::"
+         << "get_CCM_home (" << endl
+         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "return ::Components::CCMHome::_duplicate (this->home_.in ());"
+         << endl
+         << "}";
+
+      os << "CORBA::Boolean" << endl
+         << t.name () << "_Context::"
+         << "get_rollback_only (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IS] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
+      os << "::Components::Transaction::UserTransaction_ptr" << endl
+         << t.name () << "_Context::"
+         << "get_user_transaction (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IS] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << endl
+         << "::CORBA::NO_IMPLEMENT ()," << endl
+         << "::Components::Transaction::UserTransaction::_nil ());" << endl
+         << "}";
+
+      os << "CORBA::Boolean" << endl
+         << t.name () << "_Context::"
+         << "is_caller_in_role (" << endl
+         << "const char * /* role */" << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
+      os << "void" << endl
+         << t.name () << "_Context::"
+         << "set_rollback_only (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IS] << "))" << endl
+         << "{"
+         << "ACE_THROW (CORBA::NO_IMPLEMENT ());" << endl
+         << "}";
+
+      os << "// Operations from " << STRS[COMP_SC] << "interface."
+         << endl << endl;
+
+      os << "CORBA::Object_ptr" << endl
+         << t.name () << "_Context::"
+         << "get_CCM_object (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IS] << "))" << endl
+         << "{"
+         << "if (CORBA::is_nil (this->component_.in ()))" << endl
+         << "{"
+         << "CORBA::Object_var obj =" << endl
+         << "this->container_->get_objref (" << endl
+         << "this->servant_" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK_RETURN (CORBA::Object::_nil ());" << endl
+         << "this->component_ =" << endl
+         << t.scoped_name () << "::_narrow (" << endl
+         << "obj.in ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK_RETURN (CORBA::Object::_nil ());" << endl
+         << "if (CORBA::is_nil (this->component_.in ()))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << endl
+         << "::CORBA::INTERNAL ()," << endl
+         << "::CORBA::Object::_nil ());" << endl
+         << "}"
+         << "}"
+         << "return " << t.scoped_name () << "::_duplicate (" << endl
+         << "this->component_.in ());" << endl
+         << "}";
+
       os << "// Operations for " << t.name () << " receptacles"
          << " and event sources," << endl
          << "// defined in " << t.scoped_name ().scope_name () << "::CCM_"
@@ -1199,7 +1268,13 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "// CIAO-specific." << endl << endl;
+      os << "// CIAO-specific." << endl << endl
+         << "::CIAO::Session_Container *" << endl
+         << t.name () << "_Context::"
+         << "_ciao_the_Container (void) const" << endl
+         << "{"
+         << "return this->container_;" << endl
+         << "}";
 
       os << t.name () << "_Context *" << endl
          << t.name () << "_Context::_narrow (" << endl
@@ -1272,10 +1347,10 @@ namespace
       Traversal::Belongs belongs_;
     };
 
-    struct NavigationGetFacetExecEmitter : Traversal::ProviderData,
-                                           EmitterBase
+    struct NavigationProvidesEmitter : Traversal::ProviderData,
+                                       EmitterBase
     {
-      NavigationGetFacetExecEmitter (Context& c)
+      NavigationProvidesEmitter (Context& c)
         : EmitterBase (c)
       {}
 
@@ -1285,7 +1360,7 @@ namespace
         os << "if (ACE_OS::strcmp (name, \""
            << t.name () << "\") == 0)" << endl
            << "{"
-           << "return this->executor_->get_" << t.name ()
+           << "return this->provide_" << t.name ()
            << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
            << "}";
       }
@@ -1580,6 +1655,25 @@ namespace
       SemanticGraph::Component& scope_;
     };
 
+    struct ConsumesGetEmitter : Traversal::ConsumerData,
+                                EmitterBase
+    {
+      ConsumesGetEmitter (Context& c)
+        : EmitterBase (c)
+      {}
+
+      virtual void
+      traverse (Type& c)
+      {
+        os << "if (ACE_OS::strcmp (sink_name, \""
+           << c.name () << "\") == 0)" << endl
+           << "{"
+           << "return this->get_consumer_" << c.name ()
+           << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
+           << "}";
+      }
+    };
+
     struct PublishesSubscribeEmitter : Traversal::PublisherData,
                                        EmitterBase
     {
@@ -1736,14 +1830,12 @@ namespace
           simple_type_name_emitter_ (c.os ()),
           servant_type_name_emitter_ (c.os ()),
           enclosing_type_name_emitter_ (c.os ()),
-          repo_id_emitter_ (c.os ()),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
         simple_belongs_.node_traverser (simple_type_name_emitter_);
         servant_belongs_.node_traverser (servant_type_name_emitter_);
         enclosing_belongs_.node_traverser (enclosing_type_name_emitter_);
-        repo_id_belongs_.node_traverser (repo_id_emitter_);
       }
 
       virtual void
@@ -1757,17 +1849,10 @@ namespace
            << STRS[ENV_SNGL_SRC] << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
-           << "if (! ::CORBA::is_nil (this->provide_"
+           << "if (::CORBA::is_nil (this->provide_"
            << p.name () << "_.in ()))" << endl
-           << "{"
-           << "return ";
-
-        Traversal::ProviderData::belongs (p, belongs_);
-
-        os << "::_duplicate (this->provide_" << p.name () << "_.in ());"
-           << "}";
+           << "{";
 
-        /*
         Traversal::ProviderData::belongs (p, enclosing_belongs_);
 
         os << "::CCM_";
@@ -1792,21 +1877,29 @@ namespace
 
         os << "::_nil ());" << endl
            << "}";
-        */
-        os << "::CORBA::Object_var obj =" << endl
-           << "this->provide_" << p.name () << "_i ("
-           << STRS[ENV_SNGL_ARG] << ");"
-           << "ACE_CHECK_RETURN (";
 
-        Traversal::ProviderData::belongs (p, belongs_);
+        Traversal::ProviderData::belongs (p, servant_belongs_);
 
-        os << "::_nil ());" << endl;
+        os << " *svt =" << endl
+           << "new ";
 
-        ScopedName scoped (scope_.scoped_name ());
-        Name stripped (scoped.begin () + 1, scoped.end ());
-        string unique_obj_name =
-          regex::perl_s (stripped.str (), "/::/_/") + "_" + p.name ().str ();
+        Traversal::ProviderData::belongs (p, servant_belongs_);
 
+        os << " (" << endl
+           << "fexe.in ()," << endl
+           << "this->context_);" << endl
+           << "PortableServer::ServantBase_var safe_servant (svt);"
+           << endl
+           << "::CORBA::Object_var obj =" << endl
+           << "this->container_->install_servant (" << endl
+           << "svt" << endl
+           << STRS[ENV_ARG] << ");"
+           << "ACE_CHECK_RETURN (";
+
+        Traversal::ProviderData::belongs (p, belongs_);
+
+        os << "::_nil ());"
+           << endl;
 
         Traversal::ProviderData::belongs (p, belongs_);
 
@@ -1821,8 +1914,10 @@ namespace
 
         Traversal::ProviderData::belongs (p, belongs_);
 
-        os << "::_nil ());" << endl
-           << "this->provide_" << p.name () << "_ = fo;"
+        os << "::_nil ());"
+           << endl
+           << "this->provide_" << p.name () << "_ = fo;" << endl
+           << "}"
            << "return ";
 
         Traversal::ProviderData::belongs (p, belongs_);
@@ -1830,99 +1925,6 @@ namespace
         os << "::_duplicate (this->provide_"
            << p.name () << "_.in ());" << endl
            << "}";
-
-        // Corresponding private provide_*_i() method.
-
-        os << "::CORBA::Object_ptr" << endl
-           << scope_.name ()
-           << "_Servant::provide_" << p.name () << "_i (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_SNGL] << endl
-           << "{"
-           << "::CORBA::Object_ptr ret =" << endl
-           << "this->lookup_facet (\"" << p.name () << "\");" << endl;
-
-        os << "if (! ::CORBA::is_nil (ret))" << endl
-           << "{"
-           << "return ret;"
-           << "}";
-
-        os << "CIAO::Port_Activator_T<" << endl
-           << "    ";
-        
-        Traversal::ProviderData::belongs (p, servant_belongs_);
-        
-        os << "," << endl
-           << "    ";
-        
-        Traversal::ProviderData::belongs (p, enclosing_belongs_);
-
-        os << "::CCM_";
-
-        Traversal::ProviderData::belongs (p, simple_belongs_);
-
-        os << "," << endl
-           << "    ::Components::CCMContext," << endl
-           << "    " << scope_.name () << "_Servant" << endl
-           << "  > *tmp = 0;" << endl
-           << "typedef CIAO::Port_Activator_T<" << endl
-           << "    ";
-
-        Traversal::ProviderData::belongs (p, servant_belongs_);
-        
-        os << "," << endl
-           << "    ";
-        
-        Traversal::ProviderData::belongs (p, enclosing_belongs_);
-        
-        os << "::CCM_";
-        
-        Traversal::ProviderData::belongs (p, simple_belongs_);
-        
-        os << "," << endl
-           << "    ::Components::CCMContext," << endl
-           << "    " << scope_.name () << "_Servant" << endl
-           << "  >" << endl
-           << "MACRO_MADNESS_TYPEDEF;" << endl;
-
-        os << "ACE_NEW_THROW_EX ( " << endl
-           << "tmp," << endl
-           << "MACRO_MADNESS_TYPEDEF (" << endl
-           << "\"" << unique_obj_name << "\"," << endl
-           << "\"" << p.name () << "\"," << endl
-           << "CIAO::Port_Activator::Facet," << endl
-           << "0," << endl
-           << "this->context_," << endl
-           << "this)," << endl
-           << "CORBA::NO_MEMORY ());" << endl;
-
-        os << "CIAO::Servant_Activator *sa = " << endl
-           << "this->container_->ports_servant_activator ();" << endl
-           << "if (!sa->register_port_activator (tmp))" << endl
-           << "{"
-           << "return 0;" << endl
-           << "}";
-
-        os << "::CORBA::Object_var obj =" << endl
-           << "this->container_->generate_reference (" << endl
-           << "\"" << unique_obj_name << "\"," << endl;
-
-        Traversal::ProviderData::belongs (p, repo_id_belongs_);
-
-        os << "," << endl
-           << "CIAO::Container::Facet_Consumer" << endl
-           << STRS[ENV_ARG] << ");"
-           << "ACE_CHECK_RETURN (";
-
-        Traversal::ProviderData::belongs (p, belongs_);
-
-        os << "::_nil ());" << endl
-           << "this->add_facet (" << endl
-           << "\"" << p.name () << "\"," << endl
-           << "obj.in ());" << endl;
-
-        os << "return obj._retn ();" << endl
-           << "}";
       }
 
     private:
@@ -1930,12 +1932,10 @@ namespace
       SimpleTypeNameEmitter simple_type_name_emitter_;
       ServantTypeNameEmitter servant_type_name_emitter_;
       EnclosingTypeNameEmitter enclosing_type_name_emitter_;
-      RepoIdEmitter repo_id_emitter_;
       Traversal::Belongs belongs_;
       Traversal::Belongs simple_belongs_;
       Traversal::Belongs servant_belongs_;
       Traversal::Belongs enclosing_belongs_;
-      Traversal::Belongs repo_id_belongs_;
       SemanticGraph::Component& scope_;
     };
 
@@ -1946,12 +1946,10 @@ namespace
         : EmitterBase (c),
           type_name_emitter_ (c.os ()),
           simple_type_name_emitter_ (c.os ()),
-          repo_id_emitter_ (c.os ()),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
         simple_belongs_.node_traverser (simple_type_name_emitter_);
-        repo_id_belongs_.node_traverser (repo_id_emitter_);
       }
 
       virtual void
@@ -2080,31 +2078,36 @@ namespace
            << STRS[ENV_SNGL_SRC] << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
-           << "if (! ::CORBA::is_nil (this->consumes_" << c.name ()
+           << "if (CORBA::is_nil (this->consumes_" << c.name ()
            << "_.in ()))" << endl
            << "{"
-           << "return ";
+           << scope_.name  () << "_Servant::";
 
-        Traversal::ConsumerData::belongs (c, belongs_);
+        Traversal::ConsumerData::belongs (c, simple_belongs_);
 
-        os << "Consumer::_duplicate (this->consumes_"
-           << c.name () << "_.in ());"
-           << "}";
+        os << "Consumer_" << c.name ()
+           << "_Servant *svt =" << endl
+           << "new " << scope_.name  ()
+           << "_Servant::";
+
+        Traversal::ConsumerData::belongs (c, simple_belongs_);
 
-        os << "::Components::EventConsumerBase_var obj =" << endl
-           << "this->get_consumer_" << c.name () << "_i (" << endl
-           << STRS[ENV_SNGL_ARG] << ");"
+        os << "Consumer_" << c.name ()
+           << "_Servant (" << endl
+           << "this->executor_.in ()," << endl
+           << "this->context_);"
+           << "PortableServer::ServantBase_var safe_servant (svt);"
+           << endl
+           << "CORBA::Object_var obj =" << endl
+           << "this->container_->install_servant (" << endl
+           << "svt" << endl
+           << STRS[ENV_ARG] << ");"
            << "ACE_CHECK_RETURN (";
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << "Consumer::_nil ());" << endl;
 
-        ScopedName scoped (scope_.scoped_name ());
-        Name stripped (scoped.begin () + 1, scoped.end ());
-        string unique_obj_name =
-          regex::perl_s (stripped.str (), "/::/_/") + "_" + c.name ().str ();
-
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << "Consumer_var eco =" << endl;
@@ -2118,8 +2121,9 @@ namespace
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
-        os << "Consumer::_nil ());" << endl
-           << "this->consumes_" << c.name () << "_ = eco;"
+        os<< "Consumer::_nil ());" << endl
+           << "this->consumes_" << c.name () << "_ = eco;" << endl
+           << "}"
            << "return ";
 
         Traversal::ConsumerData::belongs (c, belongs_);
@@ -2127,118 +2131,13 @@ namespace
         os << "Consumer::_duplicate (this->consumes_" << c.name ()
            << "_.in ());" << endl
            << "}";
-
-        // Corresponding private get_consumer_*_i() method.
-
-        os << "::Components::EventConsumerBase_ptr" << endl
-           << scope_.name  () << "_Servant::"
-           << "get_consumer_" << c.name () << "_i (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_SNGL] << endl
-           << "{"
-           << "::Components::EventConsumerBase_ptr ret =" << endl
-           << "this->lookup_consumer (\"" << c.name () << "\");" << endl;
-
-        os << "if (! ::CORBA::is_nil (ret))" << endl
-           << "{"
-           << "return ret;"
-           << "}";
-
-        os << "CIAO::Port_Activator_T<" << endl;
-
-        os << scope_.name  () << "_Servant::";
-
-        Traversal::ConsumerData::belongs (c, simple_belongs_);
-
-        os << "Consumer_" << c.name ()
-           << "_Servant," << endl
-           << c.scoped_name ().scope_name ().scope_name ()
-           << "::CCM_"
-           << c.scoped_name ().scope_name ().simple_name ()
-           << "," << endl
-           << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
-           << c.scoped_name ().scope_name ().simple_name ()
-           << "_Context," << endl
-           << scope_.name () << "_Servant"
-           << " > *tmp = 0;" << endl
-           << "typedef  CIAO::Port_Activator_T<" << endl;
-
-        os << scope_.name  () << "_Servant::";
-
-        Traversal::ConsumerData::belongs (c, simple_belongs_);
-
-        os << "Consumer_" << c.name ()
-           << "_Servant," << endl
-           << c.scoped_name ().scope_name ().scope_name ()
-           << "::CCM_"
-           << c.scoped_name ().scope_name ().simple_name ()
-           << "," << endl
-           << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
-           << c.scoped_name ().scope_name ().simple_name ()
-           << "_Context, " << endl
-           << scope_.name () << "_Servant"
-           << " > " << endl
-           << " MACRO_MADNESS_TYPEDEF;"
-           << endl << endl;
-
-        os << "ACE_NEW_THROW_EX ( " << endl
-           << "  tmp," << endl
-           << "  MACRO_MADNESS_TYPEDEF (" << endl
-           << "\"" << unique_obj_name << "\"," << endl
-           << "\"" << c.name () << "\"," << endl
-           << "CIAO::Port_Activator::Sink," << endl
-           << "this->executor_.in ()," << endl
-           << "this->context_," << endl
-           << "this)," << endl
-           << "CORBA::NO_MEMORY ());" << endl << endl;
-
-        os << "CIAO::Servant_Activator *sa = " << endl
-           << "this->container_->ports_servant_activator ();" <<endl
-           << "if (!sa->register_port_activator (tmp))" << endl
-           << "{"
-           << "return 0;" << endl
-           << "}";
-
-        os << "::CORBA::Object_var obj =" << endl
-           << "this->container_->generate_reference (" << endl
-           << "\"" << unique_obj_name << "\"," << endl;
-
-        Traversal::ConsumerData::belongs (c, repo_id_belongs_);
-
-        os << "," << endl
-           << "CIAO::Container::Facet_Consumer" << endl
-           << STRS[ENV_ARG] << ");"
-           << "ACE_CHECK_RETURN (";
-
-        Traversal::ConsumerData::belongs (c, belongs_);
-
-        os << "Consumer::_nil ());" << endl;
-
-        os << "::Components::EventConsumerBase_var ecb =" << endl
-           << "::Components::EventConsumerBase::_narrow (" << endl
-           << "obj.in ()" << endl
-           << STRS[ENV_ARG] << ");"
-           << "ACE_CHECK_RETURN (";
-
-        Traversal::ConsumerData::belongs (c, belongs_);
-
-        os << "Consumer::_nil ());" << endl;
-
-        os << "this->add_consumer (" << endl
-           << "\"" << c.name () << "\"," << endl
-           << "ecb.in ());" << endl;
-
-        os << "return ecb._retn ();" << endl
-           << "}";
-     }
+      }
 
     private:
       TypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
-      ConsumerRepoIdEmitter repo_id_emitter_;
       Traversal::Belongs belongs_;
       Traversal::Belongs simple_belongs_;
-      Traversal::Belongs repo_id_belongs_;
       SemanticGraph::Component& scope_;
     };
 
@@ -2287,9 +2186,13 @@ namespace
       traverse (SemanticGraph::Provider& p)
       {
         os << "obj_var =" << endl
-           << "this->provide_" << p.name () << "_i (" << endl
-           << STRS[ENV_SNGL_ARG] << ");"
+           << "  this->provide_" << p.name () << " (" << endl
+           << "  " << STRS[ENV_SNGL_ARG] << ");"
            << "ACE_CHECK;" << endl;
+
+        os << "this->add_facet (" << endl
+           << "\"" << p.name () << "\"," << endl
+           << "obj_var.in ());" << endl;
       }
 
       virtual void
@@ -2310,49 +2213,15 @@ namespace
       virtual void
       traverse (SemanticGraph::Consumer& p)
       {
-        os << "ecb_var =" << endl
-           << "this->get_consumer_" << p.name () << "_i (" << endl
-           << STRS[ENV_SNGL_ARG] << ");"
+        os << "ec_base_var =" << endl
+           << "  this->get_consumer_" << p.name () << " (" << endl
+           << "  " << STRS[ENV_SNGL_ARG] << ");"
            << "ACE_CHECK;" << endl;
-      }
-    };
 
-    struct SetAttributesEmitter : Traversal::ReadWriteAttribute,
-                                  EmitterBase
-    {
-      SetAttributesEmitter (Context& c)
-        : EmitterBase (c),
-          extract_emitter_ (c.os ()),
-          assign_emitter_ (c.os ())
-      {
-        extract_belongs_.node_traverser (extract_emitter_);
-        assign_belongs_.node_traverser (assign_emitter_);
-      }
-
-      virtual void
-      pre (SemanticGraph::ReadWriteAttribute& a)
-      {
-        os << "if (ACE_OS::strcmp (descr_name, \""
-           << a.name () << "\") == 0)" << endl
-           << "{";
-
-        Traversal::ReadWriteAttribute::belongs (a, extract_belongs_);
-
-        os << "descr_value >>= " << STRS[EXTRACT] << ";"
-           << "this->" << a.name () << " (";
-
-        Traversal::ReadWriteAttribute::belongs (a, assign_belongs_);
-
-        os << ");"
-           << "continue;"
-           << "}";
+        os << "this->add_consumer (" << endl
+           << "\"" << p.name () << "\"," << endl
+           << "ec_base_var.in ());" << endl;
       }
-
-    private:
-      ExtractedTypeDeclEmitter extract_emitter_;
-      AssignFromExtractedEmitter assign_emitter_;
-      Traversal::Belongs extract_belongs_;
-      Traversal::Belongs assign_belongs_;
     };
 
   public:
@@ -2373,31 +2242,12 @@ namespace
          << "_ptr exe," << endl
          << "::Components::CCMHome_ptr h," << endl
          << "::CIAO::Session_Container *c)" << endl
-         << "  : Servant_Impl_Base (c)," << endl
-         << "    comp_svnt_base (exe, c)" << endl
+         << "  : our_base (exe, c)" << endl
          << "{"
          << "this->context_ = "
-         << "new " << t.name () << "_Context (h, c, this);" << endl;
-
-      // Generate the macro to register a value factory for each
-      // eventtype consumed.
-      {
-        Traversal::Component component_emitter;
-
-        Traversal::Inherits inherits;
-        inherits.node_traverser (component_emitter);
-
-        Traversal::Defines defines;
-        component_emitter.edge_traverser (defines);
-        component_emitter.edge_traverser (inherits);
-
-        RegisterValueFactoryEmitter factory_emitter (ctx);
-        defines.node_traverser (factory_emitter);
-
-        component_emitter.traverse (t);
-      }
-
-      os << "ACE_TRY_NEW_ENV" << endl
+         << "new " << t.name () << "_Context (h, c, this);"
+         << endl
+         << "ACE_TRY_NEW_ENV" << endl
          << "{"
          << "::Components::SessionComponent_var scom =" << endl
          << "::Components::SessionComponent::_narrow (" << endl
@@ -2411,9 +2261,6 @@ namespace
          << STRS[ENV_ARG] << ");"
          << "ACE_TRY_CHECK;"
          << "}"
-         << "this->populate_port_tables (" << endl
-         << STRS[ENV_SNGL_ARG] << ");"
-         << "ACE_TRY_CHECK;"
          << "}"
          << "ACE_CATCHANY" << endl
          << "{"
@@ -2427,18 +2274,7 @@ namespace
          << "{"
          << "}";
 
-      // Override pure virtual set_attributes() operation.
-      os << "void" << endl
-         << t.name () << "_Servant::set_attributes (" << endl
-         << "const ::Components::ConfigValues &descr" << endl
-         << STRS[ENV_SRC_NOTUSED] << ")" << endl
-         << "{"
-         << "for (CORBA::ULong i = 0; i < descr.length (); ++i)" << endl
-         << "{"
-         << "const char *descr_name = descr[i]->name ();"
-         << "::CORBA::Any &descr_value = descr[i]->value ();" << endl;
-
-      // Generate string compare and set for each attribute.
+      // Generate provides_<facet> operation.
       {
         Traversal::Component component_emitter;
 
@@ -2449,20 +2285,30 @@ namespace
         component_emitter.edge_traverser (defines);
         component_emitter.edge_traverser (inherits);
 
-        SetAttributesEmitter set_attributes_emitter (ctx);
-        defines.node_traverser (set_attributes_emitter);
+        FacetProvidesEmitter provides_emitter (ctx, t);
+        defines.node_traverser (provides_emitter);
 
         component_emitter.traverse (t);
       }
 
+      os << "// Operations for Navigation interface." << endl << endl;
 
-      os << "ACE_UNUSED_ARG (descr_name);"
-         << "ACE_UNUSED_ARG (descr_value);" << endl;
-
-      os << "}"
+      os << "CORBA::Object_ptr" << endl
+         << t.name () << "_Servant::provide_facet (" << endl
+         << "const char *name" << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "))" << endl
+         << "{"
+         << "if (name == 0)" << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << endl
+         << "::CORBA::BAD_PARAM ()," << endl
+         << "::CORBA::Object::_nil ());" << endl
          << "}";
 
-      // Generate provides_<facet> operation.
+      // Generate an IF block for each facet inside provide_facet().
       {
         Traversal::Component component_emitter;
 
@@ -2473,12 +2319,49 @@ namespace
         component_emitter.edge_traverser (defines);
         component_emitter.edge_traverser (inherits);
 
-        FacetProvidesEmitter provides_emitter (ctx, t);
-        defines.node_traverser (provides_emitter);
+        NavigationProvidesEmitter navigation_provides_emitter (ctx);
+        defines.node_traverser (navigation_provides_emitter);
 
         component_emitter.traverse (t);
       }
 
+      os << "ACE_THROW_RETURN (" << endl
+         << STRS[EXCP_IN] << " ()," << endl
+         << "::CORBA::Object::_nil ());" << endl
+         << "}";
+
+      os << "::Components::FacetDescriptions *" << endl
+         << t.name () << "_Servant::get_named_facets (" << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
+      os << "::Components::EmitterDescriptions *" << endl
+         << t.name () << "_Servant::get_all_emitters ("
+         << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
+      os << "::Components::EmitterDescriptions *" << endl
+         << t.name () << "_Servant::get_named_emitters ("
+         << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
       // Generate subscribe_* and unsubscribe_* operations.
       {
         Traversal::Component component_emitter;
@@ -2595,6 +2478,39 @@ namespace
          << "ACE_UNUSED_ARG (ck);" << endl
          << "}";
 
+      os << "::Components::ConnectionDescriptions *" << endl
+         << t.name () << "_Servant::get_connections ("
+         << endl
+         << "const char * /* name */" << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
+      os << "::Components::ReceptacleDescriptions *" << endl
+         << t.name () << "_Servant::get_all_receptacles ("
+         << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
+      os << "::Components::ReceptacleDescriptions *" << endl
+         << t.name () << "_Servant::get_named_receptacles ("
+         << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
       // Generate generic operations for receptacles.
       {
         Traversal::Component component_emitter;
@@ -2612,6 +2528,43 @@ namespace
         component_emitter.traverse (t);
       }
 
+      os << STRS[COMP_ECB] << "_ptr" << endl
+         << t.name () << "_Servant::get_consumer (" << endl
+         << "const char *sink_name" << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "))" << endl
+         << "{"
+         << "if (sink_name == 0)" << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << endl
+         << STRS[EXCP_IN] << " ()," << endl
+         << STRS[COMP_ECB] << "::_nil ());" << endl
+         << "}";
+
+      // Generate an IF block in for each consumer in get_consumer().
+      {
+        Traversal::Component component_emitter;
+
+        Traversal::Inherits inherits;
+        inherits.node_traverser (component_emitter);
+
+        Traversal::Defines defines;
+        component_emitter.edge_traverser (defines);
+        component_emitter.edge_traverser (inherits);
+
+        ConsumesGetEmitter consumes_emitter (ctx);
+        defines.node_traverser (consumes_emitter);
+
+        component_emitter.traverse (t);
+      }
+
+      os << "ACE_THROW_RETURN (" << endl
+         << STRS[EXCP_IN] << " ()," << endl
+         << STRS[COMP_ECB] << "::_nil ());" << endl
+         << "}";
+
       os << "void" << endl
          << t.name () << "_Servant::connect_consumer ("
          << endl
@@ -2651,6 +2604,31 @@ namespace
          << STRS[EXCP_IN] << " ());" << endl
          << "}";
 
+      os << STRS[COMP_ECB] << "_ptr" << endl
+         << t.name () << "_Servant::disconnect_consumer ("
+         << endl
+         << "const char * /* source_name */" << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "," << endl
+         << STRS[EXCP_NC] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
+      os << "::Components::ConsumerDescriptions *" << endl
+         << t.name () << "_Servant::get_named_consumers ("
+         << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
       os << STRS[COMP_CK] << " *" << endl
          << t.name () << "_Servant::subscribe (" << endl
          << "const char *publisher_name," << endl
@@ -2732,6 +2710,30 @@ namespace
          << STRS[COMP_ECB] << "::_nil ());" << endl
          << "}";
 
+      // @@ (diego) These are not implemented. Whenever they are,
+      // they'll require a treatment as all the other ports above.
+
+      os << "::Components::PublisherDescriptions *" << endl
+         << t.name () << "_Servant::get_all_publishers ("
+         << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
+      os << "::Components::PublisherDescriptions *" << endl
+         << t.name () << "_Servant::get_named_publishers ("
+         << endl
+         << "const " << STRS[COMP_NAMES] << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
+         << "}";
+
       // Generate connect() and disconnect() for each emits declaration.
       {
         Traversal::Component component_emitter;
@@ -2749,21 +2751,146 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "CORBA::Object_ptr" << endl
+      os << "// Operations for CCMObject interface." << endl << endl;
+
+      os << "CORBA::IRObject_ptr" << endl
+         << t.name () << "_Servant::get_component_def (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << endl
+         << "::CORBA::NO_IMPLEMENT ()," << endl
+         << "::CORBA::IRObject::_nil ());" << endl
+         << "}";
+
+      os << "::Components::CCMHome_ptr" << endl
+         << t.name () << "_Servant::get_ccm_home (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "return this->context_->get_CCM_home "
+         << "(ACE_ENV_SINGLE_ARG_PARAMETER);" << endl
+         << "}";
+
+      os << "::Components::PrimaryKeyBase *" << endl
+         << t.name () << "_Servant::get_primary_key (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_NKA] << "))" << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << STRS[EXCP_NKA] << " (), 0);" << endl
+         << "}";
+
+      os << "void" << endl
          << t.name ()
-         << "_Servant::get_facet_executor (const char *name" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << "_Servant::configuration_complete (" << endl
+         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
          << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "))" << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_ICF] << "))" << endl
          << "{"
-         << "if (name == 0)" << endl
+         << "// CIAO to-do" << endl
+         << "}";
+
+      os << "void" << endl
+         << t.name () << "_Servant::remove (" << endl
+         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_RF] << "))" << endl
          << "{"
+         << "// CIAO to-do" << endl
+         << "}";
+
+      os << "::Components::ComponentPortDescription *" << endl
+         << t.name () << "_Servant::get_all_ports (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "::Components::ComponentPortDescription_var retv =" << endl
+         << "new OBV_Components::ComponentPortDescription;" << endl
+         << "::Components::FacetDescriptions_var facets_desc =" << endl
+         << "this->get_all_facets (" << STRS[ENV_SNGL_ARG] << ");"
+         << "ACE_CHECK_RETURN (0);" << endl
+         << "::Components::ReceptacleDescriptions_var receptacle_desc ="
+         << endl
+         << "this->get_all_receptacles (" << STRS[ENV_SNGL_ARG] << ");"
+         << "ACE_CHECK_RETURN (0);" << endl
+         << "::Components::ConsumerDescriptions_var consumer_desc =" << endl
+         << "this->get_all_consumers (" << STRS[ENV_SNGL_ARG] << ");"
+         << "ACE_CHECK_RETURN (0);" << endl
+         << "::Components::EmitterDescriptions_var emitter_desc =" << endl
+         << "this->get_all_emitters (" << STRS[ENV_SNGL_ARG] << ");"
+         << "ACE_CHECK_RETURN (0);" << endl
+         << "::Components::PublisherDescriptions_var publisher_desc ="
+         << endl
+         << "this->get_all_publishers (" << STRS[ENV_SNGL_ARG] << ");"
+         << "ACE_CHECK_RETURN (0);" << endl
+         << "retv->facets (facets_desc.in ());"
+         << "retv->receptacles (receptacle_desc.in ());"
+         << "retv->consumers (consumer_desc.in ());"
+         << "retv->emitters (emitter_desc.in ());"
+         << "retv->publishers (publisher_desc.in ());" << endl
+         << "return retv._retn ();" << endl
+         << "}";
+
+      os << "CORBA::Object_ptr" << endl
+         << t.name () << "_Servant::_get_component (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << STRS[COMP_SC] << "_var sc =" << endl
+         << STRS[COMP_SC] << "::_narrow (" << endl
+         << "this->context_" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK_RETURN (::CORBA::Object::_nil ());" << endl
+         << "if (! ::CORBA::is_nil (sc.in ()))" << endl
+         << "{"
+         << "return sc->get_CCM_object (" << STRS[ENV_SNGL_ARG] << ");"
+         << endl
+         << "}"
+         << "::Components::EntityContext_var ec =" << endl
+         << "::Components::EntityContext::_narrow (" << endl
+         << "this->context_" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK_RETURN (::CORBA::Object::_nil ());" << endl
+         << "if (! ::CORBA::is_nil (ec.in ()))" << endl
+         << "{"
+         << "return ec->get_CCM_object (" << STRS[ENV_SNGL_ARG] << ");"
+         << endl
+         << "}"
          << "ACE_THROW_RETURN (" << endl
-         << "::CORBA::BAD_PARAM ()," << endl
+         << "::CORBA::INTERNAL ()," << endl
          << "::CORBA::Object::_nil ());" << endl
          << "}";
 
-      // Generate an IF block for each facet inside provide_facet().
+      os << "// CIAO-specific operations." << endl << endl;
+
+      os << "void" << endl
+         << t.name () << "_Servant::ciao_preactivate (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "::Components::SessionComponent_var temp =" << endl
+         << "::Components::SessionComponent::_narrow (" << endl
+         << "this->executor_.in ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK;" << endl
+         << "if (! ::CORBA::is_nil (temp.in ()))" << endl
+         << "{"
+         << "temp->ciao_preactivate (" << STRS[ENV_SNGL_ARG] << ");" << endl
+         << "}"
+         << "}";
+
+      os << "void" << endl
+         << t.name () << "_Servant::ciao_activate (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{";
+
+      // Generate the macro to register a value factory for each
+      // eventtype consumed.
       {
         Traversal::Component component_emitter;
 
@@ -2774,14 +2901,60 @@ namespace
         component_emitter.edge_traverser (defines);
         component_emitter.edge_traverser (inherits);
 
-        NavigationGetFacetExecEmitter navigation_facet_exec_emitter (ctx);
-        defines.node_traverser (navigation_facet_exec_emitter);
+        RegisterValueFactoryEmitter factory_emitter (ctx);
+        defines.node_traverser (factory_emitter);
 
         component_emitter.traverse (t);
       }
 
-      os << " return CORBA::Object::_nil ();"
+      os << "::Components::SessionComponent_var temp =" << endl
+         << "::Components::SessionComponent::_narrow (" << endl
+         << "this->executor_.in ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK;" << endl
+         << "if (! ::CORBA::is_nil (temp.in ()))" << endl
+         << "{"
+         << "temp->ccm_activate (" << STRS[ENV_SNGL_ARG] << ");" << endl
+         << "}"
+         << "}";
+
+      os << "void" << endl
+         << t.name () << "_Servant::ciao_postactivate (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "::Components::SessionComponent_var temp =" << endl
+         << "::Components::SessionComponent::_narrow (" << endl
+         << "this->executor_.in ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK;" << endl
+         << "if (! ::CORBA::is_nil (temp.in ()))" << endl
+         << "{"
+         << "temp->ciao_postactivate (" << STRS[ENV_SNGL_ARG] << ");"
+//         << "ACE_CHECK;"
+         << "}"
+// @@@ JP - This is commented out for now until other issues in
+// DaNCe get resolved
+//         << "this->populate_port_tables (" << STRS[ENV_SNGL_ARG]
+//         << ");"
          << "}";
+
+      os << "void" << endl
+         << t.name () << "_Servant::_ciao_passivate (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "::Components::SessionComponent_var temp =" << endl
+         << "::Components::SessionComponent::_narrow (" << endl
+         << "this->executor_.in ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK;" << endl
+         << "if (! ::CORBA::is_nil (temp.in ()))" << endl
+         << "{"
+         << "temp->ccm_passivate (" << STRS[ENV_SNGL_ARG] << ");" << endl
+         << "}"
+         << "}";
+
       os << "// Supported operations." << endl << endl;
 
       // Generate operations for all supported interfaces.
@@ -2870,7 +3043,7 @@ namespace
       }
 
       os << "// Private method to populate the port tables."
-         << endl;
+         << endl << endl;
 
       os << "void" << endl
          << t.name () << "_Servant::populate_port_tables (" << endl
@@ -2878,7 +3051,7 @@ namespace
          << STRS[EXCP_SNGL] << endl
          << "{"
          << "::CORBA::Object_var obj_var;"
-         << "::Components::EventConsumerBase_var ecb_var;" << endl;
+         << "::Components::EventConsumerBase_var ec_base_var;" << endl;
 
       {
         Traversal::Component component_emitter;
@@ -3181,7 +3354,7 @@ namespace
         os << "{"
            << "ACE_THROW_RETURN (" << endl
            << "::CORBA::NO_IMPLEMENT ()," << endl;
-
+           
         Traversal::HomeFinder::returns (hf, simple_returns_);
 
         os << "::_nil ());"
@@ -3219,8 +3392,9 @@ namespace
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
          << "_ptr exe," << endl
          << "::CIAO::Session_Container *c)" << endl
-         << "  : CIAO::Home_Servant_Impl_Base (c)," << endl
-         << "    " << "home_svnt_base (exe, c)" << endl
+         << ": executor_ (" << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "::_duplicate (exe))," << endl
+         << "container_ (c)" << endl
          << "{"
          << "}";
 
@@ -3417,6 +3591,380 @@ namespace
 
         home_emitter.traverse (t);
       }
+
+      os << "// Operations for keyless home interface." << endl << endl;
+
+      os << "::Components::CCMObject_ptr" << endl
+         << t.name () << "_Servant::create_component (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << "::Components::CreateFailure))" << endl
+         << "{"
+         << "return this->create (" << STRS[ENV_SNGL_ARG] << ");" << endl
+         << "}";
+
+      os << "// Operations for implicit home interface." << endl << endl;
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_ptr" << endl
+         << t.name () << "_Servant::create (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << "::Components::CreateFailure))" << endl
+         << "{"
+         << "if (this->executor_.in () == 0)" << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << endl
+         << "::CORBA::INTERNAL ()," << endl;
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::_nil ());" << endl
+         << "}"
+         << STRS[COMP_EC] << "_var _ciao_ec =" << endl
+         << "this->executor_->create (" << STRS[ENV_SNGL_ARG] << ");"
+         << "ACE_CHECK_RETURN (";
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::_nil ());" << endl;
+
+      {
+        EnclosingTypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::CCM_";
+
+      {
+        SimpleTypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_var _ciao_comp =" << endl;
+
+      {
+        EnclosingTypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::CCM_";
+
+      {
+        SimpleTypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::_narrow (" << endl
+         << "_ciao_ec.in ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK_RETURN (";
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::_nil ());" << endl
+         << "return this->_ciao_activate_component (" << endl
+         << "_ciao_comp.in ()" << endl
+         << STRS[ENV_ARG] << ");" << endl
+         << "}";
+
+      os << "// Operations for CCMHome interface." << endl << endl;
+
+      os << "::CORBA::IRObject_ptr" << endl
+         << t.name () << "_Servant::get_component_def (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << endl
+         << "::CORBA::NO_IMPLEMENT ()," << endl
+         << "::CORBA::IRObject::_nil ());" << endl
+         << "}";
+
+      os << "::CORBA::IRObject_ptr" << endl
+         << t.name () << "_Servant::get_home_def (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "ACE_THROW_RETURN (" << endl
+         << "::CORBA::NO_IMPLEMENT ()," << endl
+         << "::CORBA::IRObject::_nil ());" << endl
+         << "}";
+
+      os << "void" << endl
+         << t.name () << "_Servant::remove_component (" << endl
+         << "::Components::CCMObject_ptr comp" << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_RF] << "))" << endl
+         << "{";
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_var _ciao_comp =" << endl;
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::_narrow (" << endl
+         << "comp" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK;" << endl
+         << "if (CORBA::is_nil (_ciao_comp.in ()))" << endl
+         << "{"
+         << "ACE_THROW (CORBA::INTERNAL ());" << endl
+         << "}"
+         << "_ciao_comp->remove (" << STRS[ENV_SNGL_ARG] << ");"
+         << "ACE_CHECK;" << endl
+         << "this->_ciao_passivate_component (" << endl
+         << "_ciao_comp.in ()" << endl
+         << STRS[ENV_ARG] << ");" << endl
+         << "}";
+
+      os << "// CIAO-specific operations." << endl << endl;
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_ptr" << endl
+         << t.name ()
+         << "_Servant::_ciao_activate_component (" << endl;
+
+      {
+        EnclosingTypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::CCM_";
+
+      {
+        SimpleTypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_ptr exe" << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "::CORBA::Object_var hobj =" << endl
+         << "this->container_->get_objref (" << endl
+         << "this" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK_RETURN (";
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+       os << "::_nil ());"
+         << endl
+         << "::Components::CCMHome_var home =" << endl
+         << "::Components::CCMHome::_narrow (" << endl
+         << "hobj.in ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK_RETURN (";
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::_nil ());"
+         << endl;
+
+      {
+        SimpleTypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_Servant *svt =" << endl
+         << "new ";
+
+      {
+        SimpleTypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_Servant ("
+         << endl
+         << "exe," << endl
+         << "home.in ()," << endl
+         << "this->container_);" << endl
+         << "PortableServer::ServantBase_var safe (svt);"
+         << "PortableServer::ObjectId_var oid;" << endl
+         << "CORBA::Object_var objref =" << endl
+         << "this->container_->install_component (" << endl
+         << "svt," << endl
+         << "oid.out ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK_RETURN (";
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::_nil ());"
+         << endl;
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_var ho =" << endl;
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::_narrow (" << endl
+         << "objref.in ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK_RETURN (";
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "::_nil ());"
+         << endl
+         << "if (this->component_map_.bind (oid.in (), svt) == 0)" << endl
+         << "{"
+         << "safe._retn ();" << endl
+         << "}"
+         << "return ho._retn ();" << endl
+         << "}";
+
+      os << "void" << endl
+         << t.name ()
+         << "_Servant::_ciao_passivate_component (" << endl;
+
+      {
+        TypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_ptr comp" << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << "PortableServer::ObjectId_var oid;" << endl
+         << "this->container_->uninstall_component (" << endl
+         << "comp," << endl
+         << "oid.out ()" << endl
+         << STRS[ENV_ARG] << ");"
+         << "ACE_CHECK;" << endl;
+
+      {
+        SimpleTypeNameEmitter name_emitter (os);
+        Traversal::Manages manages_;
+        manages_.node_traverser (name_emitter);
+
+        manages (t, manages_);
+      }
+
+      os << "_Servant *servant = 0;"
+         << endl
+         << "if (this->component_map_.unbind (oid.in (), servant) == 0)"
+         << endl
+         << "{"
+         << "PortableServer::ServantBase_var safe (servant);" << endl
+         << "servant->_ciao_passivate (" << STRS[ENV_SNGL_ARG] << ");"
+         << "ACE_CHECK;" << endl
+         << "}"
+         << "}";
     }
 
     virtual void
@@ -3513,9 +4061,7 @@ ServantSourceEmitter::pre (TranslationUnit& u)
                              + "/");
 
   os << "#include \"" << file_name << "\"" << endl
-     << "#include \"Cookies.h\"" << endl
-     << "#include \"ciao/Servant_Activator.h\"" << endl
-     << "#include \"ciao/Port_Activator_T.h\"" << endl << endl;
+     << "#include \"Cookies.h\"" << endl << endl;
 }
 
 void
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.cpp b/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
index 6603518da0c..863a7813d78 100644
--- a/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
+++ b/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
@@ -15,141 +15,6 @@ TypeNameEmitter::TypeNameEmitter (ostream& os_)
 {
 }
 
-void
-TypeNameEmitter::traverse (Void&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Boolean&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Octet&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Char&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Wchar&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Short&)
-{
-}
-
-void
-TypeNameEmitter::traverse (UnsignedShort&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Long&)
-{
-}
-
-void
-TypeNameEmitter::traverse (UnsignedLong&)
-{
-}
-
-void
-TypeNameEmitter::traverse (LongLong&)
-{
-}
-
-void
-TypeNameEmitter::traverse (UnsignedLongLong&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Float&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Double&)
-{
-}
-
-void
-TypeNameEmitter::traverse (String&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Wstring&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Object&)
-{
-}
-
-void
-TypeNameEmitter::traverse (ValueBase&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Any&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Enum&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Struct&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Union&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Interface&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::ValueType&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::EventType&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Component&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Home&)
-{
-}
-
 // ====================================================================
 
 ReturnTypeNameEmitter::ReturnTypeNameEmitter (ostream& os_)
@@ -345,6 +210,12 @@ INArgTypeNameEmitter::INArgTypeNameEmitter (ostream& os_)
 }
 
 void
+INArgTypeNameEmitter::traverse (Void&)
+{
+  // No-op, but the base class method is pure virtual.
+}
+
+void
 INArgTypeNameEmitter::traverse (Boolean&)
 {
   os << "::CORBA::Boolean";
@@ -508,6 +379,12 @@ INOUTArgTypeNameEmitter::INOUTArgTypeNameEmitter (ostream& os_)
 }
 
 void
+INOUTArgTypeNameEmitter::traverse (Void&)
+{
+  // No-op, but the base class method is pure virtual.
+}
+
+void
 INOUTArgTypeNameEmitter::traverse (Boolean&)
 {
   os << "::CORBA::Boolean &";
@@ -671,6 +548,12 @@ OUTArgTypeNameEmitter::OUTArgTypeNameEmitter (ostream& os_)
 }
 
 void
+OUTArgTypeNameEmitter::traverse (Void&)
+{
+  // No-op, but the base class method is pure virtual.
+}
+
+void
 OUTArgTypeNameEmitter::traverse (Boolean&)
 {
   os << "::CORBA::Boolean_out";
@@ -834,6 +717,11 @@ NullReturnEmitter::NullReturnEmitter (ostream& os_)
 }
 
 void
+NullReturnEmitter::traverse (Void&)
+{
+}
+
+void
 NullReturnEmitter::traverse (Boolean&)
 {
   os << "return false;";
@@ -938,8 +826,7 @@ NullReturnEmitter::traverse (Any&)
 void
 NullReturnEmitter::traverse (SemanticGraph::Enum& e)
 {
-  os << e.scoped_name () << " retval;" << endl
-     << "return retval;";
+  os << e.scoped_name ();
 }
 
 void
@@ -1014,529 +901,4 @@ NullReturnEmitter::traverse (SemanticGraph::Home& h)
   os << "return " << h.scoped_name () << "::_nil ();";
 }
 
-// ====================================================================
-
-NullRHSEmitter::NullRHSEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-NullRHSEmitter::traverse (Boolean&)
-{
-  os << "= false;";
-}
-
-void
-NullRHSEmitter::traverse (Octet&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Char&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Wchar&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Short&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (UnsignedShort&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Long&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (UnsignedLong&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (LongLong&)
-{
-  os << "= ACE_CDR_LONGLONG_INITIALIZER;";
-}
-
-void
-NullRHSEmitter::traverse (UnsignedLongLong&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Float&)
-{
-  os << "= 0.0f;";
-}
-
-void
-NullRHSEmitter::traverse (Double&)
-{
-  os << "= 0.0;";
-}
-
-void
-NullRHSEmitter::traverse (String&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Wstring&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Object&)
-{
-  os << "= ::CORBA::Object::_nil ();";
-}
-
-void
-NullRHSEmitter::traverse (ValueBase&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Any&)
-{
-  // This will hopefully work both if the lhs is a pointer (for example
-  // RetunrTypeNameEmitter) or not (for example INArgTypeNameEmitter).
-  os << ";";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << ";";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Struct& s)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (var_size)
-  {
-    os << "= 0;";
-  }
-  else
-  {
-    os << ";";
-  }
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Union& u)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (var_size)
-  {
-    os << "= 0;";
-  }
-  else
-  {
-    os << ";";
-  }
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::UnboundedSequence& s)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << "= " << i.scoped_name () << "::_nil ();";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::ValueType& v)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::EventType& e)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << "= " << c.scoped_name () << "::_nil ();";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << "= " << h.scoped_name () << "::_nil ();";
-}
-
-// ====================================================================
-
-ExtractedTypeDeclEmitter::ExtractedTypeDeclEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Boolean&)
-{
-  os << "::CORBA::Boolean " << STRS[EXTRACT_TMP] << " = false;"
-     << "::CORBA::Any::to_boolean " << STRS[EXTRACT] 
-     << " (" << STRS[EXTRACT_TMP] << ");";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Octet&)
-{
-  os << "::CORBA::Octet " << STRS[EXTRACT_TMP] << " = 0;"
-     << "::CORBA::Any::to_octet " << STRS[EXTRACT] 
-     << " (" << STRS[EXTRACT_TMP] << ");";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Char&)
-{
-  os << "::CORBA::Char " << STRS[EXTRACT_TMP] << " = 0;"
-     << "::CORBA::Any::to_char " << STRS[EXTRACT] 
-     << " (" << STRS[EXTRACT_TMP] << ");";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Wchar&)
-{
-  os << "::CORBA::WChar " << STRS[EXTRACT_TMP] << " = 0;"
-     << "::CORBA::Any::to_wchar " << STRS[EXTRACT] 
-     << " (" << STRS[EXTRACT_TMP] << ");";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Short&)
-{
-  os << "::CORBA::Short " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (UnsignedShort&)
-{
-  os << "::CORBA::UShort " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Long&)
-{
-  os << "::CORBA::Long " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (UnsignedLong&)
-{
-  os << "::CORBA::ULong " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (LongLong&)
-{
-  os << "::CORBA::LongLong " << STRS[EXTRACT] 
-     << " = ACE_CDR_LONGLONG_INITIALIZER;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (UnsignedLongLong&)
-{
-  os << "::CORBA::ULongLong " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Float&)
-{
-  os << "::CORBA::Float " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Double&)
-{
-  os << "::CORBA::Double " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (String&)
-{
-  os << "const char * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Wstring&)
-{
-  os << "::CORBA::WChar * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Object&)
-{
-  os << "::CORBA::Object_ptr " << STRS[EXTRACT] 
-     << " = ::CORBA::Object::_nil ();";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (ValueBase&)
-{
-  os << "::CORBA::ValueBase * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Any&)
-{
-  os << "::CORBA::Any * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << e.scoped_name () << "" << STRS[EXTRACT] << ";";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Struct& s)
-{
-  os << s.scoped_name () << "" << STRS[EXTRACT] << ";";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Union& u)
-{
-  os << u.scoped_name () << "" << STRS[EXTRACT] << ";";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::UnboundedSequence& s)
-{
-  os << s.scoped_name () << " * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << i.scoped_name () << "_ptr " << STRS[EXTRACT] << " = "
-     << i.scoped_name () << "::_nil ();";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::ValueType& v)
-{
-  os << v.scoped_name () << " * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::EventType& e)
-{
-  os << e.scoped_name () << " * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << c.scoped_name () << "_ptr " << STRS[EXTRACT] << " = "
-     << c.scoped_name () << "::_nil ();";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << h.scoped_name () << "_ptr " << STRS[EXTRACT] << " = "
-     << h.scoped_name () << "::_nil ();";
-}
-
-// ====================================================================
-
-AssignFromExtractedEmitter::AssignFromExtractedEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-AssignFromExtractedEmitter::traverse (Boolean&)
-{
-  os << STRS[EXTRACT] << ".ref_";
-}
-
-void
-AssignFromExtractedEmitter::traverse (Octet&)
-{
-  os << STRS[EXTRACT] << ".ref_";
-}
-
-void
-AssignFromExtractedEmitter::traverse (Char&)
-{
-  os << STRS[EXTRACT] << ".ref_";
-}
-
-void
-AssignFromExtractedEmitter::traverse (Wchar&)
-{
-  os << STRS[EXTRACT] << ".ref_";
-}
-
-void
-AssignFromExtractedEmitter::traverse (Short&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (UnsignedShort&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Long&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (UnsignedLong&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (LongLong&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (UnsignedLongLong&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Float&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Double&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (String&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Wstring&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Object&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (ValueBase&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Any&)
-{
-  os << "*" << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Enum&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Struct&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Union&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Interface&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::ValueType&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::EventType&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Component&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Home&)
-{
-  os << STRS[EXTRACT];
-}
 
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
index cab1c29e1b8..8a66e400d53 100644
--- a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
+++ b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
@@ -43,35 +43,6 @@ class TypeNameEmitter : public Traversal::Void,
                         public Traversal::Component,
                         public Traversal::Home
 {
-public:
-  virtual void traverse (Void&);
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-  
 protected:
   TypeNameEmitter (std::ostream&);
 
@@ -123,6 +94,7 @@ class INArgTypeNameEmitter : public TypeNameEmitter
 public:
   INArgTypeNameEmitter (std::ostream&);
 
+  virtual void traverse (Void&);
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
@@ -159,6 +131,7 @@ class INOUTArgTypeNameEmitter : public TypeNameEmitter
 public:
   INOUTArgTypeNameEmitter (std::ostream&);
 
+  virtual void traverse (Void&);
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
@@ -195,6 +168,7 @@ class OUTArgTypeNameEmitter : public TypeNameEmitter
 public:
   OUTArgTypeNameEmitter (std::ostream&);
 
+  virtual void traverse (Void&);
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
@@ -232,115 +206,7 @@ class NullReturnEmitter : public TypeNameEmitter
 public:
   NullReturnEmitter (std::ostream&);
 
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Generates the appropriate NULL value, including the assignment operator,
-// if needed, for the rhs of an assignment statement.
-//
-//
-class NullRHSEmitter : public TypeNameEmitter
-{
-public:
-  NullRHSEmitter (std::ostream&);
-
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Declares and initializes a variable to use for any extraction.
-//
-//
-class ExtractedTypeDeclEmitter : public TypeNameEmitter
-{
-public:
-  ExtractedTypeDeclEmitter (std::ostream&);
-  
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Declares and initializes a variable to use for any extraction.
-//
-//
-class AssignFromExtractedEmitter : public TypeNameEmitter
-{
-public:
-  AssignFromExtractedEmitter (std::ostream&);
-  
+  virtual void traverse (Void&);
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
diff --git a/TAO/CIAO/CIDLC/cidlc.cpp b/TAO/CIAO/CIDLC/cidlc.cpp
index 5961e28869f..d7db7708d53 100644
--- a/TAO/CIAO/CIDLC/cidlc.cpp
+++ b/TAO/CIAO/CIDLC/cidlc.cpp
@@ -23,7 +23,9 @@
 #include "ExecutorMappingGenerator.hpp"
 #include "ServantGenerator.hpp"
 #include "ExecImplGenerator.hpp"
+/*
 #include "RepositoryIdGenerator.hpp"
+*/
 #include "DescriptorGenerator.hpp"
 #include "SizeTypeCalculator.hpp"
 
@@ -96,7 +98,9 @@ main (int argc, char* argv[])
     ExecutorMappingGenerator lem_gen;
     ServantGenerator svnt_gen (cl);
     ExecImplGenerator impl_gen (cl);
+    /*
     RepositoryIdGenerator repid_gen;
+    */
     DescriptorGenerator desc_gen;
     SizeTypeCalculator sizetype_calc;
 
@@ -194,6 +198,8 @@ main (int argc, char* argv[])
       return 0;
     }
 
+    //}
+
     Diagnostic::Stream dout;
     ErrorDetector detector (cerr.rdbuf ());
     cerr.rdbuf (&detector);
@@ -281,11 +287,6 @@ main (int argc, char* argv[])
       sizetype_calc.calculate (tu);
     }
 
-    // Compute repository IDs in a separate pass.
-    {
-      if (!repid_gen.generate (tu)) return 1;
-    }
-
     // Generate servant code.
     {
       svnt_gen.generate (tu, file_path);
@@ -297,6 +298,14 @@ main (int argc, char* argv[])
       impl_gen.generate (tu, file_path);
     }
 
+    /*
+
+    // Compute repository IDs in a separate pass.
+    {
+      repid_gen.generate (tu);
+    }
+
+    */
     // Generate descriptor code.
     {
       desc_gen.generate (cl, tu);
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 359c70cc43b..3666fb33f71 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,958 +1,3 @@
-Thu Sep 16 10:15:04 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/ciao/Servant_Impl_Base.h:
-        
-          Added inheritance to Servant_Impl_Base of 
-          POA_Components::CCMObject to bring it in sync with the
-          version in regular CIAO/ciao.
-          
-        * DAnCE/ciao/Servant_Impl_T.h:
-        
-          Made inheritance of Servant_Impl_Base virtual, to bring it
-          in sync with the version in regular CIAO/ciao.
-
-Thu Sep 16 08:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ciao/Servant_Activator.cpp:
-        * CIAO/ciao/Servant_Activator.cpp:
-          Fixed compile errors in Borland build
-
-Tue Sep 14 20:43:31 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Context_Impl_Base.h:
-        * DAnCE/ciao/Context_Impl_Base.h:
-
-          Moved a sufficiently substantial included file above the
-          #pragma once directive, so that some compilers will not
-          complain that it's obsolete.
-
-Tue Sep 14 15:02:24 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/ciao/Context_Impl_Base.cpp:
-        * DAnCE/ciao/Context_Impl_Base.h:
-        * DAnCE/ciao/Context_Impl_T.cpp:
-        * DAnCE/ciao/Context_Impl_T.h:
-        * DAnCE/ciao/Home_Servant_Impl_Base.cpp:
-        * DAnCE/ciao/Home_Servant_Impl_Base.h:
-        * DAnCE/ciao/Home_Servant_Impl_T.cpp:
-        * DAnCE/ciao/Home_Servant_Impl_T.h:
-        * ciao/Context_Impl_Base.cpp:
-        * ciao/Context_Impl_Base.h:
-        * ciao/Context_Impl_T.cpp:
-        * ciao/Context_Impl_T.h:
-        * ciao/Home_Servant_Impl_Base.cpp:
-        * ciao/Home_Servant_Impl_Base.h:
-        * ciao/Home_Servant_Impl_T.cpp:
-        * ciao/Home_Servant_Impl_T.h:
-
-          New files, duplicated in CIAO/ciao and
-          CIAO/DAnCE/ciao, containing base classes
-          for the CIDL-compiler-generated context
-          and home servant classes. A template class
-          sits in the hierarchy between the generated
-          class and its skeleton base class (in the
-          case of the home servant) or its executor
-          base (in the case of the context). The
-          template class also inherits from a
-          non-template class which is used to hold
-          members and operations not using any template
-          parameters.
-
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * DAnCE/ciao/CCM_Core.mpc:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-        * DAnCE/ciao/Servant_Impl_Base.h:
-        * DAnCE/ciao/Servant_Impl_T.cpp:
-        * DAnCE/ciao/Servant_Impl_T.h:
-        * ciao/CCM_Core.mpc:
-        * ciao/Servant_Impl_Base.cpp:
-        * ciao/Servant_Impl_Base.h:
-        * ciao/Servant_Impl_T.cpp:
-        * ciao/Servant_Impl_T.h:
-
-	  Modified existing files to correspond with the
-          new files described above and:
-
-	  - Added implementations for the component servant
-            operations provide_facet(), get_named_facets(),
-	    get_consumer() and get_named_consumers().
-
-	  - Added inheritance of CCMObject to the non-template
-	    base class, to enable operations in the template
- 	    base class, which used no template parameters but
- 	    which were there only to be in the inheritance
-	    hierarchy from skeleton to generated servant, to
-	    be moved to the non-template base class, and
-	    thus not be reinstantiated with every new type.
-
-	  - Moved operations from generated code to one of
-	    the two base classes.
-
-Mon Sep 13 13:18:33 2004  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * RepositoryManager/Update_Plan.h
-
-          Fixed a waring in Windows build by changing "class" to "struct"
-          in forward declaration.
-
-        * examples/BasicSP/BasicSP.mpc
-        * examples/BasicSP/BMClosedED/BMClosedED.mpc
-        * examples/BasicSP/BMDevice/BMDevice.mpc
-        * examples/BasicSP/BMDisplay/BMDisplay.mpc
-        * examples/BasicSP/EC/EC.mpc
-
-          Changed the output stub, servant, and executor library names
-          for all the components in BasicSP example. The reason is
-          becasue all the DnC descriptors are tightly coupled with the
-          output library names. I might come back switch this change
-          back since this will conflict with the BasicSP example in
-          CIAO_ROOT/examples.
-
-Mon Sep 13 13:07:33 2004  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-
-          Fixed a bug inside create_connections () method.
-
-Mon Sep 13 15:16:33 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/tests/NodeApplicationTest/run_test.pl:
-	* DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
-	* DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
-
-	  Fixed the paths in the scripts.
-
-Mon Sep 13 07:11:06 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Port_Activator.h:
-	* DAnCE/ciao/Servant_Activator.cpp:
-	* ciao/Port_Activator.h:
-	* ciao/Servant_Activator.cpp:
-
-	  Fixes for MSVC++ compilation errors. Inspite of being careful I
-	  introduced a couple of VC++ anathemas.
-
-Mon Sep 13 06:16:31 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Container_Base.cpp:
-	* ciao/Container_Base.cpp:
-
-	  Fixed wrong ACE_CHECK usage. This should fix compilation errors
-	  in Full_Reactors build.
-
-Mon Sep 13 04:20:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/CCM_Core.mpc:
-
-	  Removed iorinterceptor and objreftemplate from CIAO_DnC_Server
-	  project. No reason to believe that they need thes. This should
-	  hopefully remove the warnings in our daily builds.
-
-	* examples/Hello/Sender/Sender_exec.cpp:
-
-	  Added a simple debug statement.
-
-	* performance-tests/Benchmark/Benchmark.mpc:
-
-	  Tried fixing the link errors on the scoreboard.
-
-Mon Sep 13 03:50:08 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/CCM_Core.mpc:
-	* DAnCE/ciao/Container_Base.cpp:
-	* DAnCE/ciao/Container_Base.h:
-	* DAnCE/ciao/Container_Base.inl:
-	* DAnCE/ciao/Port_Activator.cpp:
-	* DAnCE/ciao/Port_Activator.h:
-	* DAnCE/ciao/Port_Activator_T.cpp:
-	* DAnCE/ciao/Port_Activator_T.h:
-	* DAnCE/ciao/Servant_Activator.cpp:
-	* DAnCE/ciao/Servant_Activator.h:
-
-	  Replicated changes to DAnCE. DAnCE testing hasn't been completed
-	  yet.
-
-Sun Sep 12 22:10:38 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* CIDLC/ServantHeaderGenerator.cpp:
-	* CIDLC/ServantSourceGenerator.cpp:
-
-	  Changes to the CIDL which uses the servant and port activators
-	  checked in now.
-
-Mon Sep 13 03:00:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	To overcome the long standing problem in DAnCE, we are now making
-        the facet and consumer servants to be on demand activatable. This
-        would make sure that application level ports are not activated
-        until used. This should help address the problems between DAnCE
-        and existing way of doing things. These changes should be useful
-        even after old CIAO is removed since we want to give existing
-        component applications the same activation semantics with DAnCE.
-
-	This checkin addresses old CIAO. DAnCE and CIDLC changes will come
-        in soon.
-
-	* ciao/Servant_Activator.cpp:
-	* ciao/Servant_Activator.h:
-
-	  New files for facet and consumer activations. We now have a
-	  seperate servant activator for facet and consumer ports. The
-	  servant activator acts like a factory activating the right port
-	  activators which can create the right servant for every port.
-
-	* ciao/Port_Activator.cpp:
-	* ciao/Port_Activator.h:
-	* ciao/Port_Activator_T.cpp:
-	* ciao/Port_Activator_T.h:
-
-	  Concrete port activators for every port.
-
-	* ciao/CCM_Core.mpc:
-
-	  Added the new files for building.
-
-	* ciao/Container_Base.cpp:
-	* ciao/Container_Base.h:
-	* ciao/Container_Base.inl:
-
-	  Changes to the Container to use the above servant activator. The
-	  continer creates the servant activator and sets that in the POA
-	  meant for facet and consumers.
-
-Fri Sep 10 23:08:15 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Container_Base.cpp:
-	* DAnCE/ciao/Container_Base.h:
-	* ciao/Container_Base.cpp:
-	* ciao/Container_Base.h:
-
-	  Reverted this change "Sat Sep 11 03:35:24 2004  Balachandran
-	  Natarajan  <bala@dre.vanderbilt.edu>"
-
-Fri Sep 10 22:53:58 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/CCM_Core.mpc:
-	* ciao/CCM_Core.mpc:
-
-	  Linked with TAO_Utils library
-
-Sat Sep 11 03:35:24 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Container_Base.cpp:
-	* DAnCE/ciao/Container_Base.h:
-	* ciao/Container_Base.cpp:
-	* ciao/Container_Base.h:
-
-	  Removed install_servant () since it is not used.
-
-Fri Sep 10 22:28:45 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* CIDLC/ServantSourceGenerator.cpp:
-
-	  Changes to accomodate the accessor renaming.
-
-Sat Sep 11 03:22:06 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* ciao/Container_Base.cpp:
-	* ciao/Container_Base.h:
-	* ciao/Container_Base.inl:
-	* DAnCE/ciao/Container_Base.cpp:
-	* DAnCE/ciao/Container_Base.h:
-	* DAnCE/ciao/Container_Base.inl:
-
-	  Made a few changes. They are
-
-	  . Added a second POA into the container. One of the POA's will
-	    host the component and the other POA will host the facet and
-	    consumer servants. Obviously the two POA's have different sets
-	    of policies. The new POA is primarily targeted to activate
-	    facet and consumer servants on demand.
-
-	  . Renamed the accessor to the ORB and POA. Made them const
-            methods
-
-	  . Improved documentation and a number of costeic changes.
-
-
- 	* DAnCE/RepositoryManager/Repository_Manager.cpp:
-	* DAnCE/RepositoryManager/Update_Plan.cpp:
-	* DAnCE/RepositoryManager/Update_Plan.h:
-
-	  BUnch of cosmetic changes to be conformant with ACE+TAI coding
-	  guidelines.
-
-	* DAnCE/ciao/Servant_Impl_Base.cpp:
-	* DAnCE/ciao/Servant_Impl_T.cpp:
-	* ciao/Servant_Impl_Base.cpp:
-	* ciao/Servant_Impl_T.cpp:
-
-	  Fixed simple compilation errors and warnings.
-
-Thu Sep  9 17:07:59 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/IDL3/Events/Abstract/Abstract.idl:
-
-          Uncommented IDL testing multiple inheritance of eventtypes.
-
-Thu Sep  9 10:30:22 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/ciao/Container_Base.cpp:
-        * DAnCE/ciao/Container_Base.h:
-        * ciao/Container_Base.cpp:
-
-          Added generate_reference() method to DAnCE version of
-          Container_Base, and fixed ACE_CHECK macro mistake in
-          both versions.
-
-Wed Sep  8 11:52:45 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/ciao/Servant_Impl_Base.h:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-
-          Updated files with changes made to the corresponding files
-          in regular CIAO/ciao.
-
-Tue Sep  7 22:14:43 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-	* CCF/CCF/IDL2/SemanticGraph/Elements.hpp:
-	* CCF/CCF/IDL2/Traversal/Elements.hpp:
-	* CIDLC/ExecutorMappingGenerator.cpp:
-
-	  Fixed unused argument warnings.
-
-Tue Sep  7 15:48:19 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-        * ciao/Servant_Impl_Base.cpp:
-
-          Cosmetic changes.
-
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * DAnCE/ciao/Servant_Impl_T.cpp:
-        * DAnCE/ciao/Servant_Impl_T.h:
-        * ciao/Servant_Impl_T.cpp:
-        * ciao/Servant_Impl_T.h:
-
-          Moved several methods from the generated servant class to the
-          template Servant_Impl base class.
-
-Tue Sep  7 10:44:10 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/CIDLC.mpc:
-        * CIDLC/CIDLC.vcproj:
-        * CIDLC/RepositoryIdGenerator.cpp:
-        * CIDLC/RepositoryIdGenerator.hpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/cidlc.cpp:
-
-          - Updated the RepositoryIdGenerator and re-added the source
-            and header files to the build. This generator creates
-            repository ids for interfaces and eventtypes, and stores
-            them internally in a context variable for later access
-            in code generation. It also handles modifications to the
-            repository ids stemming from 'typeprefix' or 'typeid'
-            declarations.
-
-          - Added generation of 'provide_<facet name>_i' and
-            'get_consumer_<event consumer name>_i' methods in the servant,
-            which create dummy object references and store them in the
-            appropriate port table in the servant base class.
-
-          - Re-implemented the generated 'provide_<facet name>' and
-            'get_consumer_<event consumer name>' methods. They now
-            use the container's POA to activate the dummy objects
-            created by the corresponding _i methods described above.
-            The activation takes place upon the first outside access
-            of these objects. If an object has already been activated,
-            it will simply be found in its port table and returned.
-            Thanks to Bala for the prototype code for this feature.
-
-        * ciao/Container_Base.cpp:
-        * ciao/Container_Base.h:
-
-          Added 'generate_reference' utility method called by the
-          '_i' methods described above.
-
-        * ciao/Servant_Impl_Base.cpp:
-        * ciao/Servant_Impl_Base.h:
-
-          Added 'lookup_facet' and 'lookup_consumer' methods used in
-          generated servant code to determine if a desired object has
-          been activated already (and added to a port table) or not.
-
-Mon Aug 30 12:52:28 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* performance-tests/Benchmark/Benchmark.mpc:
-
-	  Fixes for link errors in the daily builds
-
-Sun Aug 29 19:25:21 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* tools/XML_Helpers/XMLHelpers.mpc:
-
-	  Fix for link errors in Debian_Core builds.
-
-Sun Aug 29 19:02:42 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/ciao/CCM_Core.mpc:
-
-	  Added valuetype seperately to the Deployment_svnt project.
-
-Sun Aug 29 18:10:13 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h:
-	* DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h:
-	* DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h:
-	* DAnCE/examples/BasicSP/EC/EC_svnt.h:
-
-	  These files should not be in the repository.
-
-Sat Aug 28 18:44:00 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc:
-
-	  Fixed a compile erros in the daily builds.
-
-Sat Aug 28 09:22:15 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/examples/BasicSP/BasicSP.mpc:
-	* DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc:
-	* DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc:
-	* DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc:
-	* DAnCE/examples/BasicSP/EC/EC.mpc:
-
-	  Fixed the project names and shared librray names so that they
-	  don't collide with the regual BasicSP test. Ideally there
-	  shouldn't be any duplicate code. I waill talk to Gan about
-	  this.
-
-Thu Aug 26 16:45:10 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/IDL3/Lookup/README:
-        * tests/IDL3/Lookup/lookup_test.idl:
-        * tests/IDL3/Lookup/lookup_test.mpc:
-
-          New files, a test for the IDL compiler lookup of declarations
-          in base interfaces, valuetypes, components, and homes, and
-          in supported interfaces, referenced by the local name in the
-          derived IDL type. Thanks to Boris Kolpackov
-          <boris@dre.vanderbilt.edu> for reporting the bug and for
-          providing an example IDL file that illustrates the various
-          cases.
-
-Thu Aug 26 13:24:40 2004  Gan Deng <gan.deng@vanderbilt.edu>
-
-        * DAnCE/examples/BaiscSP/*.*:
-
-          Created above directory and subdictories to add an example for
-          using DAnCE.
-
-Thu Aug 26 12:28:40 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/CIDLC.vcproj:
-
-          Added missing files to project.
-
-Thu Aug 26 11:25:39 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/CIDL/CodeGen/CodeGen.mpc:
-
-          Changed dependency from ciao_server to ciao_servant.
-
-Wed Aug 25 11:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/DnC_Dump.h:
-          Removed not needed qualifier
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-          Removed not needed ; after namespace closure
-
-Wed Aug 25 11:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/Config_Error_Handler.h:
-          Removed not needed ; after namespace closure
-
-Tue Aug 24 11:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/Config.h:
-          Removed not needed ; after namespace closure
-
-Mon Aug 23 21:47:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/Config_Handlers/XSCRT/Elements.hpp:
-	* DAnCE/Config_Handlers/XSCRT/Elements.ipp:
-	* DAnCE/Config_Handlers/XSCRT/Elements.tpp:
-	* DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp:
-	* DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp:
-	* DAnCE/Config_Handlers/XSCRT/Parser.hpp:
-	* DAnCE/Config_Handlers/XSCRT/Parser.ipp:
-	* DAnCE/Config_Handlers/XSCRT/Parser.tpp:
-	* DAnCE/Config_Handlers/XSCRT/Traversal.hpp:
-	* DAnCE/Config_Handlers/XSCRT/Traversal.ipp:
-	* DAnCE/Config_Handlers/XSCRT/Traversal.tpp:
-	* DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp:
-	* DAnCE/Config_Handlers/XSCRT/XMLSchema.ipp:
-	* DAnCE/Config_Handlers/XSCRT/XMLSchema.tpp:
-
-	  Added XSCRT 0.0.4 into the repository to compile the handlers.
-
-Mon Aug 23 21:32:50 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* CIDLC/TypeNameEmitter.cpp:
-
-	  Fixed a compiler error in the daily builds showing up from a
-	  non-const declaration of a char * for extraction into an Any.
-
-	* DAnCE/Config_Handlers/Config.h:
-
-	  Deployment.h has been renamed to Config.h
-
-	* DAnCE/Config_Handlers/Process_Element.h:
-	* DAnCE/Config_Handlers/Basic_Handler.h:
-
-	  Include Config.h
-
-	* DAnCE/Config_Handlers/Basic_Deployment_Data.cpp:
-	* DAnCE/Config_Handlers/Basic_Deployment_Data.hpp:
-	* DAnCE/Config_Handlers/Deployment.cpp:
-	* DAnCE/Config_Handlers/Deployment.hpp:
-	* DAnCE/Config_Handlers/ccd.cpp:
-	* DAnCE/Config_Handlers/ccd.hpp:
-	* DAnCE/Config_Handlers/cdd.cpp:
-	* DAnCE/Config_Handlers/cdd.hpp:
-	* DAnCE/Config_Handlers/cdp.cpp:
-	* DAnCE/Config_Handlers/cdp.hpp:
-	* DAnCE/Config_Handlers/cid.cpp:
-	* DAnCE/Config_Handlers/cid.hpp:
-	* DAnCE/Config_Handlers/cpd.cpp:
-	* DAnCE/Config_Handlers/cpd.hpp:
-	* DAnCE/Config_Handlers/iad.cpp:
-	* DAnCE/Config_Handlers/iad.hpp:
-	* DAnCE/Config_Handlers/pcd.cpp:
-	* DAnCE/Config_Handlers/pcd.hpp:
-	* DAnCE/Config_Handlers/toplevel.cpp:
-	* DAnCE/Config_Handlers/toplevel.hpp:
-	* DAnCE/Config_Handlers/Config_Handlers.mpc:
-
-	  Generated code from XSC which is going to be used for the next
-	  generation handlers. They have been added in the MPC but guarded
-	  with requires += dummy_label since they give lot of warnings.
-
-Mon Aug 23 08:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
-          Fixed typo in vpath
-
-Sun Aug 22 22:23:12 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/Config_Handlers/Config_Handlers.mpc:
-
-	  Fixed VC6 compilation errors.
-
-Mon Aug 23 01:07:24 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/StandardConfigurator_Impl.cpp:
-	* ciao/StandardConfigurator_Impl.cpp:
-
-	  Fixed unused variable warnings.
-
-Sun Aug 22 21:28:34 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/ciao/Servant_Impl_Base.cpp:
-	* DAnCE/ciao/Servant_Impl_Base.h:
-	* DAnCE/ciao/StandardConfigurator_Impl.cpp:
-	* DAnCE/ciao/StandardConfigurator_Impl.h:
- 	* DAnCE/ciao/CCM_Core.mpc:
-
-          Added these files to the DAnCE builds. These were from the
-	  following change
-
-	  Tue Aug 17 14:29:00 2004  Jules White <jules@dre.vanderbilt.edu>
-
-	* ciao/CCM_Core.mpc:
-	* ciao/Servant_Impl_Base.cpp:
-	* ciao/Servant_Impl_Base.h:
-	* ciao/StandardConfigurator_Impl.cpp:
-	* ciao/StandardConfigurator_Impl.h:
-
-	  Fixed compilation errors in builds where exceptions have been
-	  turned off.
-
-Sun Aug 22 22:11:49 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
-	  Fixed redeclaration error in VC6 builds.
-
-Sun Aug 22 20:08:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* CIDLC/ServantSourceGenerator.cpp:
-
-	  Fixed unused variable warnings in the generated code.
-
-Sun Aug 22 17:06:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* tools/IDL3_to_IDL2/be_global.cpp:
-	* tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
-	  Fixed unused variable warnings in our daily builds.
-
-Sun Aug 22 16:26:01 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* performance-tests/Protocols/Receiver/Receiver.mpc:
-
-	  Fixed a compile error in our daily builds.
-
-Fri Aug 20 16:01:55 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
-
-          Fixed typo in source file name.
-
-Fri Aug 20 10:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ciao/Container_Base.h:
-          Fixed compile errors
-
-Fri Aug 20 07:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Container_Base.h:
-          Fixed compile errors
-
-Thu Aug 19 17:13:22 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/Literals.cpp:
-        * CIDLC/Literals.hpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/TypeNameEmitter.cpp:
-        * CIDLC/TypeNameEmitter.hpp:
-
-          Added code generation for the set_attributes() method called
-          on the servant by the deployer.
-
-Thu Aug 19 16:09:45 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Container_Base.h:
-	* ciao/Container_Base.h:
-
-	  Fixed a compilation error reported by  Roland Schimmack <Roland
-	  dot Schimmack at gmx dot de>
-
-Thu Aug 19 08:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * PROBLEM-REPORT-FORM:
-          Ask for the default.features file used by MPC.
-
-Wed Aug 18 14:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/NodeDaemon_Impl.h:
-          Added missing pragma pop
-
-Tue Aug 17 14:29:00 2004  Jules White <jules@dre.vanderbilt.edu>
-
-        * CIAO/ciao/Servant_Impl_Base.h:
-        * CIAO/ciao/Servant_Impl_Base.cpp:
-          Added a method to create and return the StandardConfigurator for a component.
-          Overrided _default_POA so that it returns the POA of the servant's container.
-
-        * CIAO/ciao/StandardConfigurator_Impl.h:
-        * CIAO/ciao/StandardConfigurator_Impl.cpp:
-          Created an implementation of the StandardConfigurator interface.
-
-Mon Aug 16 22:15:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp:
-	* DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h:
-
-	  Fixed compilation errors in builds where exceptions have been
-	  turned off.
-
-Mon Aug 16 22:09:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* performance-tests/Protocols/Sender/Sender.mpc:
-
-	  Fix for link errors on the scoreboard.
-
-Mon Aug 16 21:01:49 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* performance-tests/Benchmark/Benchmark.mpc:
-
-	  Fix for link errors on the scoreboard.
-
-Mon Aug 16 16:44:13 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp:
-	* CIAO/DAnCE/NodeManager/Node_Daemon.cpp:
-	* CIAO/DAnCE/ciao/CCM_Container.idl:
-	* CIAO/ciao/CCM_Container.idl:
-	  Changed #include "orbsvcs/orbsvcs/..." to #include "orbsvcs/...".
-
-Mon Aug 16 16:36:49 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
-          Changed conversion for eventtypes to generate, instead of the
-          original eventtype, a valuetype with Components::EventBase added
-          to its inheritance list. This is completely equivalent to the
-          original eventtype and has the advantage that it eliminates the
-          need to use the -Sm option (disabling CCM equivalent IDL
-          preprocessing) when running the IDL compiler on a converted
-          file. Thanks to Bala Natarajan <bala@dre.vanderbilt.edu> for
-          the suggestion.
-
-Mon Aug 16 14:14:15 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl:
-
-	  Do not do the compile the implied data part of the IDL.
-
-Mon Aug 16 12:42:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/Config_Handlers/CAD_Handler.h:
-	* DAnCE/Config_Handlers/CEPE_Handler.h:
-	* DAnCE/Config_Handlers/CPK_Handler.h:
-	* DAnCE/Config_Handlers/CPR_Handler.h:
-	* DAnCE/Config_Handlers/Cap_Handler.h:
-	* DAnCE/Config_Handlers/CompIntrDesc_Handler.h:
-	* DAnCE/Config_Handlers/CompPkgDesc_Handler.h:
-	* DAnCE/Config_Handlers/DT_Handler.h:
-	* DAnCE/Config_Handlers/Domain_Handler.h:
-	* DAnCE/Config_Handlers/ERE_Handler.h:
-	* DAnCE/Config_Handlers/IAD_Handler.h:
-	* DAnCE/Config_Handlers/ID_Handler.h:
-	* DAnCE/Config_Handlers/IR_Handler.h:
-	* DAnCE/Config_Handlers/MID_Handler.h:
-	* DAnCE/Config_Handlers/NIA_Handler.h:
-	* DAnCE/Config_Handlers/PCI_Handler.h:
-	* DAnCE/Config_Handlers/PC_Handler.h:
-	* DAnCE/Config_Handlers/Plan_Handler.h:
-	* DAnCE/Config_Handlers/Process_Element.h:
-	* DAnCE/Config_Handlers/Property_Handler.h:
-	* DAnCE/Config_Handlers/RS_Handler.h:
-	* DAnCE/Config_Handlers/RUK_Handler.h:
-	* DAnCE/Config_Handlers/Requirement_Handler.h:
-	* DAnCE/Config_Handlers/SPK_Handler.h:
-	* DAnCE/Config_Handlers/SP_Handler.h:
-	* DAnCE/Config_Handlers/TPD_Handler.h:
-	* DAnCE/Config_Handlers/Utils.h:
-
-	  Use ciao/ to include any header files from core ciao.
-
-	* DAnCE/ciao/CCM_Core.mpc:
-	* DAnCE/tests/Config_Handlers/handler_test.mpb:
-	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
-
-	  Use the right libraries for linking. This should probably
-	  address some of the core build errors on the scoreboard.
-
-Sun Aug 15 18:32:49 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
-        * tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h:
-        * tools/IDL3_to_IDL2/be_extern.h:
-        * tools/IDL3_to_IDL2/be_global.cpp:
-        * tools/IDL3_to_IDL2/be_global.h:
-        * tools/IDL3_to_IDL2/be_helper.cpp:
-        * tools/IDL3_to_IDL2/be_helper.h:
-        * tools/IDL3_to_IDL2/be_init.cpp:
-        * tools/IDL3_to_IDL2/be_produce.cpp:
-        * tools/IDL3_to_IDL2/be_sunsoft.cpp:
-        * tools/IDL3_to_IDL2/be_sunsoft.h:
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h:
-        * tools/IDL3_to_IDL2/README:
-
-          New files implementing a tool that inputs an IDL file with IDL3
-          constructs and generates another IDL file with the IDL3
-          constructs converted to the spec-defined IDL2 equivalents. Using
-          the generated file instead of the original one in applications
-          will allow the developer to reference the IDL2 equivalent types
-          in application IDL, rather than just in C++ code as before.
-          The generated IDL file has a '_IDL2' suffix added to the
-          original file name just before the '.idl' extension.
-
-Sun Aug 15 09:17:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* performance-tests/Benchmark/Benchmark.mpc:
-
-	  Added missing libraries as reported by our daily builds.
-
-Sun Aug 15 09:12:36 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/tests/Config_Handlers/handler_test.mpb:
-
-	  Fixed the handlers to link in CIAO_DnC_Container too.
-
-Sat Aug 14 14:44:24 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/Config_Handlers/Config_Handlers.mpc:
-
-	  Do not include /usr/lib to be in libpaths. This is odd and
-	  shouldn't be there at the application level. Applications should
-	  only be bothered about using $XERCESCROOT and the like. If the
-	  application doesn't specify the compiler, linker and the loader
-	  knows where to pick things from.
-
-Sat Aug 14 14:07:53 2004  Aniruddha Gokhale  <a.gokhale@vanderbilt.edu>
-
-	* DAnCE/NodeManager/Node_Daemon.cpp:
-
-	  Included "ace/os_include/os_netdb.h since otherwise the
-	  MAXHOSTNAMELEN constant was not found.
-
-Sat Aug 14 15:36:28 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/NodeManager/NodeDaemon_Impl.cpp:
-	* DAnCE/NodeManager/NodeDaemon_Impl.h:
-	* DAnCE/NodeManager/Node_Daemon.cpp:
-
-	  Cosmetic fixes for fuzz errors and other simple fixes for the
-	  daily builds.
-
-	* DAnCE/NodeManager/README:
-
-	  Added a README file in the directory.
-
-Sat Aug 14 04:20:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ExecutionManager/ExecutionManager_Impl.h:
-	* DAnCE/ciao/ComponentsC.h:
-	* ciao/ComponentsC.h:
-
-	  Removed a trailing ; at the end of namespace closure. g++-3.4.1
-	  starts getting seizures once it locates a trailing ;.
-
-Sat Aug 14 03:29:18 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/tests/Config_Handlers/handler_test.mpb:
-	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
-	* tools/XML_Helpers/XMLHelpers.mpc:
-
-	  Tried fixing some warnings and errors in the builds. I am not
-	  able to reproduce it and so I am taking a blind shot.
-
-Thu Aug 12 14:14:00 Jules White <jules@dre.vanderbilt.edu>
-
-	* docs/schema/cdp.xsd:
-	* docs/schema/Modified_Deployment.xsd:
-
-          Changed the schema so that it was more compliant with the spec.
-
-Thu Aug 12 15:25:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/NEWS:
-	* DAnCE/ciao/Servant_Impl_T.cpp:
-	* DAnCE/ciao/Servant_Impl_T.h:
-
-	  Updates at this
-
-Thu Aug 12 11:35:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Servant_Impl_T.cpp:
-	* DAnCE/ciao/Servant_Impl_T.h:
-
-	  Propogating the changes from "Mon Aug  9 11:38:04 2004  Jeff
-	  Parsons <j.parsons@vanderbilt.edu>"  to DAnCE.
-
-	* DAnCE/tests/Config_Handlers/Handler_Test.cpp:
-	* DAnCE/tests/Config_Handlers/Handler_Test.h:
-
-	  Cleaned up things so that it is more portable.
-
-	* DAnCE/tests/Config_Handlers/handler_test.mpb:
-
-	  Put Handler_Test as a template file.
-
-Thu Aug 12 16:20:19 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/tests/Config_Handlers/Handler_Test.cpp:
-	* DAnCE/tests/Config_Handlers/Handler_Test.h:
-	* DAnCE/tests/Config_Handlers/Handler_Test.i:
-
-	  Fixed fuzz errors.
-
-Wed Aug 11 22:37:31 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/NodeManager/Node_Daemon.cpp:
-	* tests/RTCCM/DiffServ/Sender/Sender_exec.cpp:
-
-	  Fixed fuzz errors.
-
-Wed Aug 11 22:15:26 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
-
-	  Fixed yet another problem with MPC file. Should by now compile
-	  clean on the scoreboard. Let us see hwo it goes.
-
-Wed Aug 11 20:08:58 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* CIDLC/CIDLC.mpc:
-
-	  Fixed library paths. This seems to have been busted.
-
-Wed Aug 11 14:38:00 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ExecutionManager/Execution_Manager.cpp:
-
-	  Made certain parts exception safe and fixed fuzz errors.
-
-	* tests/CIDL/CodeGen/CodeGen.mpc:
-
-	  The MPC file was busted which lead to errors in the daily
-	  builds.
-
-	* tests/RTCCM/DiffServ/Receiver/Receiver.mpc:
-
-	  Fixed errors in he MPC file.
-
-	* tests/RTCCM/DiffServ/Sender/Sender_exec.cpp:
-
-	  Fixed fuzz errors.
-
-Wed Aug 11 12:45:09 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* CIDLC/CIDLC.mpc:
-
-	  Added new files startting with Exec* into the CIDLC project.
-
-	* CIAOTAO.mwc:
-
-	  Added tests section to the above file.
-
-Wed Aug 11 15:08:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* tests/CIDL/CodeGen/CodeGen.mpc:
-
-	  Fix for the compilation errors in the daily builds.
-
-Mon Aug  9 11:38:04 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Servant_Impl_T.cpp:
-        * ciao/Servant_Impl_T.h:
-
-          Moved the body of the destructor and the same_component()
-          method from the generated servant class to the base class.
-
-Sat Aug  7 17:55:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
-
-	  Prevented compilation errors if CIDL is not built.
-
-Sat Aug  7 16:43:45 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* tests/CIDL/CodeGen/CodeGen.mpc:
-	* tests/IDL3/Homes/Basic/Basic.mpc:
-
-	  Changed the name of the stub library and project names. There
-	  was a clash in project and library names.
-
 Thu Aug  5 17:42:56 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * CIDLC/ExecImplGenerator.cpp:
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h
index a8d31ea54f1..6c7089915b6 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h
@@ -11,7 +11,7 @@
 #ifndef BASIC_HANDLER_H
 #define BASIC_HANDLER_H
 
-#include "Config.h"
+#include "Deployment.h"
 
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h
index 515a59d70c2..1e867628279 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h
@@ -11,17 +11,18 @@
 #define CAD_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
+#include "Config_Handler_export.h"
+#include "ace/SString.h"
+#include "ace/Hash_Map_Manager.h"
+#include "ace/Null_Mutex.h"
+
+#include "Basic_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Basic_Handler.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h
index 18eabeff80e..3d1fb12b00b 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h
@@ -11,13 +11,13 @@
 #define CEPE_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
+#include "Config_Handler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Config_Handler_export.h"
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/dom/DOM.hpp>
 #include "XercesString.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h
index 2c34055e08e..2eaa7b6a216 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h
@@ -12,7 +12,7 @@
 #define CPK_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 
 #include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h
index 8e9c8132f17..4d56f71a3ca 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h
@@ -11,13 +11,13 @@
 #define CPR_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
+#include "Config_Handler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Config_Handler_export.h"
 #include "ace/SString.h"
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/dom/DOM.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h
index f680961f75d..2abfcf09deb 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h
@@ -12,7 +12,7 @@
 #define CAP_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h
index 7c4e2e22898..7932ebd4b30 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h
@@ -4,7 +4,7 @@
 #define COMPINTRDESC_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h
index 9cd81ffa5f5..202afca9b2c 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h
@@ -12,7 +12,7 @@
 #define COMPPKGDESC_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h
index ba1b8b5514c..4c039938d90 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h
@@ -42,7 +42,7 @@ namespace CIAO
 
     };
 
-  }
+  };
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
index 12ab9879d79..d8b0271f991 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
@@ -2,14 +2,13 @@
 
 project (Config_Handlers) : ciao_deployment_stub {
 
-  after     += CIAO_DnC_Server
   sharedname = Config_Handlers
   dynamicflags   = CONFIG_HANDLER_BUILD_DLL
   macros   += XML_USE_PTHREADS
   requires += exceptions
-  includes += $(XERCESCROOT)/include 
-  libpaths += $(XERCESCROOT)/lib
-  libs     += xerces-c CIAO_DnC_Server TAO_IFR_Client TAO_Valuetype
+  includes += /usr/include $(XERCESCROOT)/include 
+  libpaths += /usr/lib $(XERCESCROOT)/lib
+  libs     += xerces-c CIAO_DnC_Server TAO_IFR_Client
 
   Source_Files {
     Utils.cpp
@@ -47,42 +46,3 @@ project (Config_Handlers) : ciao_deployment_stub {
     XercesString.cpp
   }
 }
-
-project (XSC_Config_Handlers) : ciao_deployment_stub {
-
-  requires += dummy_label
-
-  sharedname = XSC_Config_Handlers
-  dynamicflags   = CONFIG_HANDLER_BUILD_DLL
-  macros   += XML_USE_PTHREADS
-  requires += exceptions
-  includes += $(XERCESCROOT)/include  .
-  libpaths += $(XERCESCROOT)/lib
-  libs     += xerces-c CIAO_DnC_Server TAO_IFR_Client
-
-  Source_Files {
-    Basic_Deployment_Data.cpp
-    ccd.cpp
-    cdd.cpp
-    cdp.cpp
-    cid.cpp
-    cpd.cpp
-    Deployment.cpp
-    iad.cpp
-    pcd.cpp
-    toplevel.cpp
-  }
-
-  Header_Files {
-    Basic_Deployment_Data.hpp
-    ccd.hpp
-    cdd.hpp
-    cdp.hpp
-    cid.hpp
-    cpd.hpp
-    Deployment.hpp
-    iad.hpp
-    pcd.hpp
-    toplevel.hpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h
index 8cd04c66650..faac487e828 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h
@@ -12,6 +12,7 @@
 #define DT_HANDLER_H
 #include /**/ "ace/pre.h"
 
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "tao/ORB.h"
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.h b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.h
new file mode 100644
index 00000000000..a3fc3b72004
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.h
@@ -0,0 +1,17 @@
+//==================================================================
+/**
+ *  @file  Deployment.h
+ *
+ *  $Id$
+ *
+ *  @author Emre Turkay <emre.turkay@vanderbilt.edu>
+ */
+//=====================================================================
+
+#ifndef DEPLOYMENT_H
+#define DEPLOYMENT_H
+
+#define BEGIN_DEPLOYMENT_NAMESPACE namespace CIAO { namespace Config_Handler {
+#define END_DEPLOYMENT_NAMESPACE }; };
+
+#endif // DEPLOYMENT_H
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
index b20b98469e9..47d7899432b 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
@@ -37,8 +37,8 @@ namespace Deployment
 
     public:
       /// Dump functions for CORBA sequences
-      static void dump (const char* caption,
-                        const ::CORBA::StringSeq &str_seq);
+      static void DnC_Dump::dump (const char* caption,
+                                  const ::CORBA::StringSeq &str_seq);
 
       template <typename SEQUENCE>
         static void dump_sequence (const char* caption, const SEQUENCE &seq);
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h
index 327bfe54bba..a29e7cf7fd1 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h
@@ -11,7 +11,7 @@
 #define DOMAIN_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "Basic_Handler.h"
 #include "XercesString.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h
index 272bd8ecc63..3fdafe87009 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h
@@ -13,13 +13,13 @@
 #define ERE_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
+#include "Config_Handler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Config_Handler_export.h"
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/dom/DOM.hpp>
 #include "XercesString.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h
index 8cbfabd510e..a46de1d885f 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h
@@ -12,7 +12,7 @@
 #define IAD_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
index c2142cfb706..ef7f9c5c86d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
@@ -12,7 +12,7 @@
 #define ID_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 
 #include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h
index d7ff20f1c99..9e159ed2636 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h
@@ -12,7 +12,7 @@
 #define IR_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "Basic_Handler.h"
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h
index 4c99ef81621..17c3a2c4a3d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h
@@ -4,7 +4,7 @@
 #define MID_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h
index cc3b1fd2a11..38ad44beed2 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h
@@ -12,7 +12,7 @@
 #define NIA_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "Basic_Handler.h"
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h
index 95cefcf5a90..841db0fc0a6 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h
@@ -12,7 +12,7 @@
 #define PCI_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h
index 9dfa24dd354..224f298f0a4 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h
@@ -12,7 +12,7 @@
 #define PC_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "Basic_Handler.h"
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h
index c4994e4255d..3983e4f1faf 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h
@@ -11,17 +11,17 @@
 #define PLAN_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
+#include "DeploymentC.h"
 #include "Basic_Handler.h"
 #include "Config_Handler_export.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h b/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h
index bec9e523fe4..c60c1e14b75 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h
@@ -12,8 +12,8 @@
 #ifndef PROCESS_ELEMENT_H
 #define PROCESS_ELEMENT_H
 
-#include "ciao/DeploymentC.h"
-#include "Config.h"
+#include "DeploymentC.h"
+#include "Deployment.h"
 #include "Basic_Handler.h"
 #include "Config_Handler_export.h"
 #include "ace/SString.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h
index 1e392aea185..3367a2e1348 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h
@@ -10,14 +10,16 @@
 
 #ifndef PROPERTY_HANDLER_H
 #define PROPERTY_HANDLER_H
-#include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include /**/ "ace/pre.h"
 
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
+
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/dom/DOM.hpp>
 #include "XercesString.h"
+
 using Config_Handler::XStr;
 using xercesc::XMLString;
 using xercesc::DOMText;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h
index dff3a6e149d..11d858b4141 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h
@@ -12,7 +12,7 @@
 #define RS_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 
 #include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h
index b988eead549..70536e39072 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h
@@ -12,7 +12,7 @@
 #define RUK_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h
index c01ead11cab..b960e9b70d7 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h
@@ -12,7 +12,7 @@
 #define REQUIREMENT_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 
 #include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h
index 7a9caa3c2a0..51b6f1eb8b2 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h
@@ -12,7 +12,7 @@
 #define SPK_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 
 #include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h
index a45dcf7d508..a5402097793 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h
@@ -12,7 +12,7 @@
 #define SP_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 
 #include <xercesc/util/XercesDefs.hpp>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h
index 20b7020bd58..30265026f8c 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h
@@ -12,7 +12,7 @@
 #define TPD_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 #include "Config_Handler_export.h"
 #include "Basic_Handler.h"
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Utils.h b/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
index c47cd4a37c2..dd051603d40 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handler_export.h"
-#include "ciao/DeploymentC.h"
+#include "DeploymentC.h"
 
 #include "tao/Basic_Types.h"
 #include "XercesString.h"
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
index 1d009de77a6..ebc5aab66e3 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
@@ -126,7 +126,7 @@ namespace CIAO
       TAO::Utils::Servant_Var<CIAO::DomainApplicationManager_Impl> dam_servant_;
     };
 
-}
+};
 
 #include /**/ "ace/post.h"
 #endif /* EXECUTIONMANAGER_IMPL_H */
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 7c8101ee800..3a253faa012 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -28,7 +28,7 @@
 #include "tao/IORTable/IORTable.h"
 
 // Include Name Service header
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "ace/SString.h"
 #include "ace/Read_Buffer.h"
@@ -102,17 +102,14 @@ write_IOR(const char* ior)
   return 0;
 }
 
-bool
+int
 register_with_ns (const char * name_context,
                   CORBA::ORB_ptr orb,
-                  CIAO::ExecutionManagerDaemon_ptr obj
-                  ACE_ENV_ARG_DECL)
+                  CIAO::ExecutionManagerDaemon_ptr obj)
 {
   // Naming Service related operations
   CORBA::Object_var naming_context_object =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var naming_context =
     CosNaming::NamingContext::_narrow (naming_context_object.in ());
@@ -121,15 +118,12 @@ register_with_ns (const char * name_context,
   CosNaming::Name name (1);
   name.length (1);
   // Register the name with the NS
-  name[0].id = name_context;
+  name[0].id = CORBA::string_dup (name_context);
 
   // Register the servant with the Naming Service
-  naming_context->bind (name,
-                        obj
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  naming_context->bind (name, obj);
 
-  return true;
+  return 0;
 }
 
 int
@@ -137,8 +131,6 @@ main (int argc, char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      // @@ Error checking is very bad! Need to be fixed!
-      // -- bala
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
@@ -166,8 +158,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (adapter.in ()))
@@ -183,18 +174,14 @@ main (int argc, char *argv[])
 
       // Implicit activation
       PortableServer::ServantBase_var safe_daemon (daemon_servant);
-      CIAO::ExecutionManagerDaemon_var daemon =
-        daemon_servant->_this ();
+      CIAO::ExecutionManagerDaemon_var daemon = daemon_servant->_this ();
 
       // Now register daemon with IOR table and write its IOR.
-      CORBA::String_var str =
-        orb->object_to_string (daemon.in ()
-                               ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var str = orb->object_to_string (daemon.in ()
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      adapter->bind ("ExecutionManager",
-                     str.in ()
-                     ACE_ENV_ARG_PARAMETER);
+      adapter->bind ("ExecutionManager", str.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (write_to_ior_)
@@ -202,17 +189,10 @@ main (int argc, char *argv[])
       else if (register_with_ns_)
         {
           // Register this name with the Naming Service
-          (void) register_with_ns (name,
-                                   orb.in (),
-                                   daemon.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          register_with_ns (name, orb.in (), daemon.in ());
         }
 
-#if 0
-      ACE_DEBUG ((LM_INFO,
-                  "CIAO_ExecutionMananger IOR: %s\n", str.in ()));
-#endif /*if 0*/
+      ACE_DEBUG ((LM_INFO, "CIAO_ExecutionMananger IOR: %s\n", str.in ()));
 
       // Activate POA manager
       PortableServer::POAManager_var mgr
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 86ef0881fa8..2021a7b5839 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -239,8 +239,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
     const CORBA::ULong facet_len = facets->length ();
     const CORBA::ULong consumer_len = consumers->length ();
 
-    CORBA::ULong curr_len = retv->length ();
-    retv->length (curr_len + facet_len + consumer_len);
+    retv->length (facet_len + consumer_len);
 
     CORBA::ULong i = 0;
     for (i = 0; i < facet_len; ++i)
@@ -309,7 +308,7 @@ startLaunch (const Deployment::Properties & configProperty,
   Deployment::ComponentInfos_var comp_info;
 
   // For debugging.
-  if (true) //(CIAO::debug_level () > 1)
+  if (CIAO::debug_level () > 1)
   {
     const CORBA::ULong info_len = infos.length ();
     for (CORBA::ULong i = 0; i < info_len; ++i)
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp
index a48fa385a45..49cb6647fb1 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp
@@ -3,6 +3,9 @@
 #include "NodeDaemon_Impl.h"
 #include "../NodeApplicationManager/NodeApplicationManager_Impl.h"
 
+// @@ (OO) Method definitions should never use "_WITH_DEFAULTS"
+//         versions of emulated exception parameters.  Please remove
+//         the "_WITH_DEFAULTS"
 CIAO::NodeDaemon_Impl::NodeDaemon_Impl (const char *name,
                                         CORBA::ORB_ptr orb,
                                         PortableServer::POA_ptr poa,
@@ -19,30 +22,27 @@ CIAO::NodeDaemon_Impl::NodeDaemon_Impl (const char *name,
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      //create the call back poa for NAM.
-      PortableServer::POAManager_var mgr
-        = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->callback_poa_ =
-        this->poa_->create_POA ("callback_poa",
-                                mgr.in (),
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  {
+    //create the call back poa for NAM.
+    PortableServer::POAManager_var mgr
+      = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-    }
+    this->callback_poa_ =
+      this->poa_->create_POA ("callback_poa",
+                              mgr.in (),
+                              0
+                              ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+  }
   ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeDaemon_Impl::constructor\t\n");
-      // @@ This is bogus and will not work with emulated exceptions
-      // -- Bala
-      ACE_RE_THROW;
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                         "NodeDaemon_Impl::constructor\t\n");
+    ACE_RE_THROW;
+  }
   ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 CIAO::NodeDaemon_Impl::~NodeDaemon_Impl ()
@@ -125,12 +125,19 @@ CIAO::NodeDaemon_Impl::preparePlan (const Deployment::DeploymentPlan &plan
                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
+          // Obtain the Object Reference
+          //CORBA::Object_var obj =
+          //  this->poa_->servant_to_reference (app_mgr ACE_ENV_ARG_PARAMETER);
+          //ACE_TRY_CHECK;
+
+          //this->manager_ =
+          //  Deployment::NodeApplicationManager::_narrow (obj.in ());
+
           if (CORBA::is_nil (this->manager_.in ()))
             {
-              ACE_ERROR ((LM_ERROR,
-                          "CIAO.NodeDaemon (%P|%t) -- ",
-                          "preparePlan: NodeApplicationManager ref",
-                          "is nil\n"));
+              ACE_DEBUG ((LM_DEBUG,
+                          "NodeDaemon_Impl:preparePlan: "
+                          "NodeApplicationManager ref is nil\n"));
               ACE_TRY_THROW (Deployment::StartError ());
             }
         }
@@ -152,8 +159,7 @@ CIAO::NodeDaemon_Impl::preparePlan (const Deployment::DeploymentPlan &plan
 void
 CIAO::NodeDaemon_Impl::destroyManager (Deployment::NodeApplicationManager_ptr
                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StopError))
+  ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError))
 {
   ACE_TRY
     {
@@ -163,12 +169,10 @@ CIAO::NodeDaemon_Impl::destroyManager (Deployment::NodeApplicationManager_ptr
                                      ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    this->poa_->deactivate_object (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+    this->poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    this->manager_ =
-      Deployment::NodeApplicationManager::_nil ();
+    this->manager_ = Deployment::NodeApplicationManager::_nil ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h
index a30fe5a2244..7266604d2f7 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file NodeDaemon_Impl.h
@@ -6,11 +7,11 @@
  *  $Id$
  *
  *  This file contains servant implementation for Deployment:NodeManager
- *  interface. In the current design of the NodeManager, as with the
- *  legacy  implementation of CIAO, Each NodeManager corresponds to
- *  ONE NodeApplication Manager. Though, the name intuitively suggests
- *  that there be one NodeManager  for every node, our design, allows
- *  the end-user to have multiple components run on the same node.
+ *  interface. In the current design of the NodeManager, as with the legacy
+ *  implementation of CIAO, Each NodeManager corresponds to ONE NodeApplication
+ *  Manager. Though, the name intuitively suggests that there be one NodeManager
+ *  for every node, our design, allows the end-user to have multiple components
+ *  run on the same node.
  *
  *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
  */
@@ -27,21 +28,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
 
 namespace CIAO
 {
   /**
    * @class NodeDaemon_Impl
    *
-   * @brief Servant implementation CIAO's daemon process control
-   * interface
+   * @brief Servant implementation CIAO's daemon process control interface
    *
    * This class implements the CIAO:NodeDaemon interface.
    *
@@ -58,9 +51,10 @@ namespace CIAO
                      PortableServer::POA_ptr p,
                      const char * nodeapp_loc,
                      int spawn_delay)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                ACE_THROW_SPEC ((CORBA::SystemException));
 
-    /// POA operation..
+    /// Get the containing POA.  This operation does *not*
+    /// increase the reference count of the POA.
     virtual PortableServer::POA_ptr _default_POA (void);
 
     /// CIAO::Daemon defined attributes/operations.
@@ -94,11 +88,12 @@ namespace CIAO
                        Deployment::StopError));
 
   protected:
-    /// Since this class is reference counted, making this
-    /// destructor protected to enforce proper memory managment
-    /// through the reference counting mechanism (i.e. to
-    /// disallow calling operator delete() on an instance of
-    /// this class.
+    // Since this class is reference counted, making this
+    // destructor protected to enforce proper memory managment
+    // through the reference counting mechanism (i.e. to
+    // disallow calling operator delete() on an instance of
+    // this class.
+    /// Destructor
     virtual ~NodeDaemon_Impl (void);
 
     // Keep a pointer to the managing ORB serving this servant.
@@ -121,13 +116,9 @@ namespace CIAO
 
     // Cache reference of last NodeAppManager
     Deployment::NodeApplicationManager_var manager_;
+
   };
 }
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #if defined (__ACE_INLINE__)
 # include "NodeDaemon_Impl.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Daemon.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Daemon.cpp
index 11dd2165059..f29c5d50922 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Node_Daemon.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/Node_Daemon.cpp
@@ -1,14 +1,35 @@
 // $Id$
 
+//==============================================================
+/**
+ * @file Node_Daemon.cpp
+ *
+ * @brief CIAO's Node Daemon implementation
+ *
+ * NodeDaemon is the bootstraping mechanism to create new
+ * NodeApplication on the localhost.  We currently depend on
+ * starting the NodeApplicationManager process on some port of all
+ * the hosts that have NodeApplication install to function properly.
+ * The port to run this daemon can be set by using the TAO ORB options
+ * command of -ORBEndpoint <port>. This replaces the earlier CIAO_Daemon
+ * implementation of CIAO as defined in the CCM specification.
+ *
+ * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
+ * @author Tao Lu <lu@dre.vanderbilt.edu>
+ */
+//===============================================================
+
 #include "NodeDaemon_Impl.h"
-#include "orbsvcs/CosNamingC.h"
 #include "tao/IORTable/IORTable.h"
+
+// Include Name Service header
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+
 #include "ace/SString.h"
 #include "ace/Read_Buffer.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
-#include "ace/os_include/os_netdb.h"
 #include "ciao/Server_init.h"
 #include "ciao/CIAO_common.h"
 
@@ -90,17 +111,14 @@ write_IOR(const char* ior)
   return 0;
 }
 
-bool
+int
 register_with_ns (const char * name_context,
                   CORBA::ORB_ptr orb,
-                  CIAO::NodeDaemon_ptr obj
-                  ACE_ENV_ARG_DECL)
+                  CIAO::NodeDaemon_ptr obj)
 {
   // Naming Service related operations
   CORBA::Object_var naming_context_object =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var naming_context =
     CosNaming::NamingContext::_narrow (naming_context_object.in ());
@@ -108,12 +126,13 @@ register_with_ns (const char * name_context,
   // Initialize the Naming Sequence
   CosNaming::Name name (1);
   name.length (1);
-  name[0].id = name_context;
+  // Register the name with the NS
+  name[0].id = CORBA::string_dup (name_context);
 
   // Register the servant with the Naming Service
   naming_context->bind (name, obj);
 
-  return true;
+  return 0;
 }
 
 int
@@ -122,7 +141,6 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       // Initialize orb
-      // @@TODO: Add error checking. There is absoluteley none.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
@@ -177,39 +195,30 @@ main (int argc, char *argv[])
                       spawn_delay),
                       -1);
       PortableServer::ServantBase_var safe_daemon (daemon_servant);
-
       // Implicit activation
-      CIAO::NodeDaemon_var daemon =
-        daemon_servant->_this ();
 
-      CORBA::String_var str =
-        orb->object_to_string (daemon.in ()
-                               ACE_ENV_ARG_PARAMETER);
+      CIAO::NodeDaemon_var daemon = daemon_servant->_this ();
+
+      CORBA::String_var str = orb->object_to_string (daemon.in ()
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      adapter->bind ("NodeManager",
-                     str.in ()
-                     ACE_ENV_ARG_PARAMETER);
+      adapter->bind ("NodeManager", str.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (write_to_ior_)
         write_IOR (str.in ());
       else if (register_with_ns_)
         {
-          char name [MAXHOSTNAMELEN + 1];
+          char name [100];
           if (ACE_OS::hostname (name, 100) == -1)
             {
-              ACE_ERROR ((LM_ERROR,
-                          "gethostname call failed! \n"));
+              ACE_DEBUG ((LM_DEBUG, "gethostname call failed! \n"));
               exit (1);
             }
 
           // Register this name with the Naming Service
-          (void) register_with_ns (name,
-                                   orb.in (),
-                                   daemon.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          register_with_ns (name, orb.in (), daemon.in ());
         }
 
       ACE_DEBUG ((LM_INFO, "CIAO_NodeDaemon IOR: %s\n", str.in ()));
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index fa5b840ef43..60055845cad 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -4,7 +4,6 @@
 #include "RepositoryManager_Impl.h"
 #include "Repository_Manager_conf.h"
 #include "Config_Handlers/TPD_Handler.h"
-#include "Config_Handlers/DnC_Dump.h"
 
 CIAO::RepositoryManager_Impl::RepositoryManager_Impl
    (CORBA::ORB_ptr orb,
@@ -80,9 +79,7 @@ installPackage (const char* installation_name,
                                                    DOMNodeFilter::SHOW_TEXT);
       Deployment::PackageConfiguration pc;
       pc_handler.process_PackageConfiguration (pc);
-      //Deployment::DnC_Dump::dump (pc);
-      this->pc_table_.bind (installation_name, (pc));
-      //Deployment::DnC_Dump::dump (*(&pc));
+      this->pc_table_.bind (installation_name, &(pc));
     }
   catch (CORBA::Exception& ex)
     {
@@ -133,18 +130,11 @@ CIAO::RepositoryManager_Impl::findPackageByName (const char* name
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::NoSuchName))
 {
-  Deployment::PackageConfiguration pc;
+  Deployment::PackageConfiguration* pc = 0;
   if (pc_table_.find (name, pc) == 0)
     {
-      //Deployment::PackageConfiguration* dup_pc = pc;
-      //Deployment::DnC_Dump::dump (*pc);
-      //return dup_pc;
-      Deployment::PackageConfiguration_var pc_var = 0;
-      ACE_NEW_THROW_EX (pc_var,
-                        Deployment::PackageConfiguration (pc),
-                        CORBA::NO_MEMORY ());
-      //Deployment::DnC_Dump::dump (*pc_var);
-      return pc_var._retn ();
+      Deployment::PackageConfiguration* dup_pc = pc;
+      return dup_pc;
     }
   else
     {
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
index afe7dd36542..2ad95826023 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
@@ -144,7 +144,7 @@ namespace CIAO
       // destructor
 
       typedef ACE_Hash_Map_Manager_Ex<const char *,
-        Deployment::PackageConfiguration,
+        Deployment::PackageConfiguration*,
         ACE_Hash<const char *>, ACE_Equal_To<const char *>,
         TAO_SYNCH_MUTEX> pc_table;
 
@@ -157,7 +157,7 @@ namespace CIAO
 
       pc_table pc_table_;
     };
-}
+};
 
 #include /**/ "ace/post.h"
 #endif /* REPOSITORYMANAGER_IMPL_H */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
index 4605a1ea41b..312d01d0bfd 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
@@ -3,7 +3,6 @@
 #include "RepositoryManager_Impl.h"
 #include "Update_Plan.h"
 #include "ExecutionManager/ExecutionManagerC.h"
-#include "Config_Handlers/DnC_Dump.h"
 #include "NodeManager/NodeDaemonC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/streams.h"
@@ -68,10 +67,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   // Initialize the ORB so that CORBA::Any will work
   //
-  CORBA::ORB_var orb =
-    CORBA::ORB_init (argc,
-                     argv,
-                     "");
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
   try
     {
@@ -106,9 +102,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           return 1;
         }
 
-      //DOMDocument* tpd_doc = tpd_parser->parseURI (package_url);
+      DOMDocument* tpd_doc = tpd_parser->parseURI (package_url);
 
-      //ACE_UNUSED_ARG (tpd_doc);
+      ACE_UNUSED_ARG (tpd_doc);
 
       if (tpd_handler.getErrors())
         {
@@ -119,7 +115,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           ACE_DEBUG ((LM_DEBUG, "Null DOM Document obtained, \
                       May be the URL is wrong!!\n"));
-          throw CIAO::Null_Dom_Document ();
+          throw Null_Dom_Document ();
         }
 
       // free up DOMBuilder. DOMBuilder also deletes the DOMDocument memory.
@@ -143,14 +139,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       rep_impl->installPackage ("PC", package_url);
       pc = rep_impl->findPackageByName ("PC");
-      //Deployment::DnC_Dump::dump (*pc);
 
-      CIAO::REF_MAP ref_map;
-      CIAO::REF_MAP primary_ref_map;
+      REF_MAP ref_map;
+      REF_MAP primary_ref_map;
 
       // traverse the PackageConfiguration IDL data structure and
       // update the deployment plan IDL data structure.
-      CIAO::traverse_package (pc, plan, ref_map, primary_ref_map);
+      traverse_package (pc, plan, ref_map, primary_ref_map);
 
       //Deployment::DnC_Dump::dump (plan);
 
@@ -259,7 +254,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   catch (CORBA::Exception& ex)
     {
       ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
-      while (true);
+      while (true); 
       return -1;
     }
   catch (const DOMException& e)
@@ -278,13 +273,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
       //ACE_PRINT_EXCEPTION ("Caught DOM Exception: ");
       ACE_ERROR ((LM_ERROR, "Caught DOM exception\n"));
-      while (true);
+      while (true); 
       return -1;
     }
   catch (...)
     {
       ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
-      while (true);
+      while (true); 
       return -1;
     }
 
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
index f8f16019b95..76f4fa242ca 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
@@ -7,77 +7,54 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/streams.h"
 
-ACE_RCSID (DAnCE,
-           RepositoryManager,
-           "$Id$")
-
-using namespace Deployment;
-
-namespace CIAO
+void traverse_package (Deployment::PackageConfiguration* &pc,
+                       Deployment::DeploymentPlan &plan,
+                       REF_MAP &ref_map, REF_MAP &primary_ref_map)
 {
-  void
-  traverse_package (PackageConfiguration* &pc,
-                    DeploymentPlan &plan,
-                    REF_MAP &ref_map,
-                    REF_MAP &primary_ref_map)
-  {
-    // traverse the package configuration structure to get to the
-    // BasePackage which consists of assemblies.
-    //
-    CORBA::ULong bp_len =
-      pc->basePackage.length ();
-
-    for (CORBA::ULong x = 0; x != bp_len; ++x)
-      {
-        CORBA::ULong impl_len =
-          pc->basePackage[x].implementation.length ();
-
-        for (CORBA::ULong y = 0;
-             y != impl_len;
-             ++y)
-          {
-            // traverse the .cpd file and get to the referenced .cid file
-            //
-            ComponentImplementationDescription cid =
-              pc->basePackage[x].implementation[y].referencedImplementation;
-            CORBA::ULong assembly_len = cid.assemblyImpl.length ();
-
-            for (CORBA::ULong z = 0;
-                 z != assembly_len;
-                 ++z)
-              {
-                // traverse the .cid file and get to each
-                // of the "assemblyImpl" tags.
-                //
-                ComponentAssemblyDescription assembly =
-                  cid.assemblyImpl[z];
-                //
-                // traverse the individual assembly.
-                //
-                traverse_assembly (assembly, plan, ref_map, primary_ref_map);
-              }
-          }
-      }
-  }
-
-  void
-  traverse_assembly (ComponentAssemblyDescription &assembly,
-                     DeploymentPlan &plan,
-                     REF_MAP &ref_map, REF_MAP &primary_ref_map)
-  {
-    // traverse the assembly (ComponentAssemblyDescription) and
-    // processes the instances and the connection within the assembly.
-    //
-    CORBA::ULong ins_len = assembly.instance.length ();
-    for (CORBA::ULong k = 0; k < ins_len; ++k)
-      {
-        SubcomponentInstantiationDescription ins =
-          assembly.instance[k];
-        const char* in_name = ins.name;
-
-      CORBA::ULong plan_ins_len =
-        plan.instance.length ();
+  // traverse the package configuration structure to get to the
+  // BasePackage which consists of assemblies.
+  //
+  CORBA::ULong bp_len = pc->basePackage.length ();
+  for (CORBA::ULong x = 0; x < bp_len; ++x)
+    {
+      CORBA::ULong impl_len = pc->basePackage[x].implementation.length ();
+      for (CORBA::ULong y = 0; y < impl_len; ++y)
+        {
+          // traverse the .cpd file and get to the referenced .cid file
+          //
+          Deployment::ComponentImplementationDescription cid =
+            pc->basePackage[x].implementation[y].referencedImplementation;
+          CORBA::ULong assembly_len = cid.assemblyImpl.length ();
+          for (CORBA::ULong z = 0; z < assembly_len; ++z)
+            {
+              // traverse the .cid file and get to each
+              // of the "assemblyImpl" tags.
+              //
+              Deployment::ComponentAssemblyDescription assembly =
+                cid.assemblyImpl[z];
+              //
+              // traverse the individual assembly.
+              //
+              traverse_assembly (assembly, plan, ref_map, primary_ref_map);
+            }
+        }
+    }
+}
 
+void traverse_assembly (Deployment::ComponentAssemblyDescription &assembly,
+                        Deployment::DeploymentPlan &plan,
+                        REF_MAP &ref_map, REF_MAP &primary_ref_map)
+{
+  // traverse the assembly (ComponentAssemblyDescription) and
+  // processes the instances and the connection within the assembly.
+  //
+  CORBA::ULong ins_len = assembly.instance.length ();
+  for (CORBA::ULong k = 0; k < ins_len; ++k)
+    {
+      Deployment::SubcomponentInstantiationDescription ins =
+        assembly.instance[k];
+      const char* in_name = ins.name;
+      CORBA::ULong plan_ins_len = plan.instance.length ();
       for (CORBA::ULong l = 0; l < plan_ins_len; ++l)
         {
           const char* plan_name = plan.instance[l].name;
@@ -87,47 +64,43 @@ namespace CIAO
                                           ref_map, primary_ref_map);
             }
         }
-      }
-
-    CORBA::ULong assembly_conn_len =
-      assembly.connection.length ();
-
-    for (CORBA::ULong m = 0; m < assembly_conn_len; ++m)
-      {
-        AssemblyConnectionDescription
-          assembly_connection = assembly.connection[m];
-        traverse_assembly_connection (assembly,
-                                      assembly_connection,
-                                      plan);
-      }
-  }
+    }
+  CORBA::ULong assembly_conn_len = assembly.connection.length ();
+  for (CORBA::ULong m = 0; m < assembly_conn_len; ++m)
+    {
+      Deployment::AssemblyConnectionDescription
+         assembly_connection = assembly.connection[m];
+      traverse_assembly_connection (assembly,
+                                    assembly_connection,
+                                    plan);
+    }
+}
 
-  void
-  traverse_assembly_connection (ComponentAssemblyDescription
-                                &assembly,
-                                AssemblyConnectionDescription
-                                &assembly_connection,
-                                DeploymentPlan &plan)
-  {
-    // traverse the assembly connection and get information about the
-    // portName and the instances at each end of the connection.
-    // Also traverse the InterfaceDescriptions for each of those instances
-    // and populate the portKind information.
-    //
-    CORBA::ULong con_length (plan.connection.length ());
-    plan.connection.length (con_length + 1);
-    CORBA::ULong iepe_len = assembly_connection.internalEndpoint.length ();
-    for (CORBA::ULong n = 0; n < iepe_len; ++n)
-      {
-        CORBA::ULong iep_len (plan.connection[con_length].
-                              internalEndpoint.length ());
+void traverse_assembly_connection (Deployment::ComponentAssemblyDescription
+                                   &assembly,
+                                   Deployment::AssemblyConnectionDescription
+                                   &assembly_connection,
+                                   Deployment::DeploymentPlan &plan)
+{
+  // traverse the assembly connection and get information about the
+  // portName and the instances at each end of the connection.
+  // Also traverse the InterfaceDescriptions for each of those instances
+  // and populate the portKind information.
+  //
+  CORBA::ULong con_length (plan.connection.length ());
+  plan.connection.length (con_length + 1);
+  CORBA::ULong iepe_len = assembly_connection.internalEndpoint.length ();
+  for (CORBA::ULong n = 0; n < iepe_len; ++n)
+    {
+      CORBA::ULong iep_len (plan.connection[con_length].
+                            internalEndpoint.length ());
       plan.connection[con_length].internalEndpoint
-        .length (iep_len + 1);
+                   .length (iep_len + 1);
       plan.connection[con_length].internalEndpoint
-        [iep_len].portName = assembly_connection.
-        internalEndpoint[n].portName;
+          [iep_len].portName = assembly_connection.
+                               internalEndpoint[n].portName;
       CORBA::ULong ins_ref = assembly_connection.internalEndpoint[n].
-        instanceRef;
+                             instanceRef;
       const char* ins_name = assembly.instance[ins_ref].name;
       CORBA::ULong plan_ins_len = plan.instance.length ();
       for (CORBA::ULong w = 0; w < plan_ins_len; ++w)
@@ -143,243 +116,233 @@ namespace CIAO
       traverse_interface (assembly.instance[ins_ref],
                           plan.connection[con_length].
                           internalEndpoint[iep_len]);
-      }
-  }
-
-  void
-  traverse_interface (SubcomponentInstantiationDescription
-                      &instance,
-                      PlanSubcomponentPortEndpoint
-                      &pspe)
-  {
-    // traverse the InterfaceDescription of the instance and get information
-    // about the portkind of the port.
-    //
-    CORBA::ULong pack_len = instance.package.length ();
-    for (CORBA::ULong m = 0; m < pack_len; ++m)
-      {
-        ComponentPackageDescription
-          package = instance.package[m];
-
-        ComponentInterfaceDescription
-          cid = package.realizes;
-
-        CORBA::ULong port_len = cid.port.length ();
-
-        for (CORBA::ULong n = 0; n < port_len; ++n)
-          {
-            const char* main_port_name = cid.port[n].name;
-            const char* port_name = pspe.portName;
-            if (strcmp (main_port_name, port_name) == 0)
-              {
-                pspe.kind = cid.port[n].kind;
-              }
-          }
-      }
-  }
+    }
+}
 
-  void
-  traverse_assembly_instance (
-                              SubcomponentInstantiationDescription
-                              &instance,
-                              DeploymentPlan &plan, int l,
-                              REF_MAP &ref_map, REF_MAP &primary_ref_map)
-  {
-    // Each instance has a package.
-    //   Each package has an implementation and their correspoding artifacts.
-    // Traverse this information and populate the artifact and the
-    // implementation information within the DeploymentPlan.
-    //
-    ART_REF_MAP art_ref_map;
+void traverse_interface (Deployment::SubcomponentInstantiationDescription
+                         &instance,
+                         Deployment::PlanSubcomponentPortEndpoint
+                         &pspe)
+{
+  // traverse the InterfaceDescription of the instance and get information
+  // about the portkind of the port.
+  //
+  CORBA::ULong pack_len = instance.package.length ();
+  for (CORBA::ULong m = 0; m < pack_len; ++m)
+    {
+      Deployment::ComponentPackageDescription
+        package = instance.package[m];
 
-    CORBA::ULong pack_len = instance.package.length ();
+      Deployment::ComponentInterfaceDescription
+        cid = package.realizes;
 
-    for (CORBA::ULong m = 0; m < pack_len; ++m)
-      {
-        ComponentPackageDescription
-          package = instance.package[m];
-        CORBA::ULong pack_impl_len = package.implementation.length ();
+      CORBA::ULong port_len = cid.port.length ();
 
-        for (CORBA::ULong n = 0; n < pack_impl_len; ++n)
-          {
-            PackagedComponentImplementation
-              impl = package.implementation[n];
-            CORBA::ULong impl_length (plan.implementation.length ());
-            plan.implementation.length (impl_length + 1);
-            plan.implementation[impl_length].name = plan.instance[l].name;
-            plan.instance[l].implementationRef = impl_length;
-            CORBA::ULong mono_impl_len =
-              impl.referencedImplementation.monolithicImpl.length ();
+      for (CORBA::ULong n = 0; n < port_len; ++n)
+        {
+          const char* main_port_name = cid.port[n].name;
+          const char* port_name = pspe.portName;
+          if (strcmp (main_port_name, port_name) == 0)
+            {
+              pspe.kind = cid.port[n].kind;
+            }
+        }
+    }
+}
 
-            for (CORBA::ULong p = 0; p < mono_impl_len; ++p)
-              {
-                MonolithicImplementationDescription
-                  mid = impl.referencedImplementation.monolithicImpl[p];
+void traverse_assembly_instance (Deployment::
+                                 SubcomponentInstantiationDescription
+                                 &instance,
+                                 Deployment::DeploymentPlan &plan, int l,
+                                 REF_MAP &ref_map, REF_MAP &primary_ref_map)
+{
+  // Each instance has a package.
+  //   Each package has an implementation and their correspoding artifacts.
+  // Traverse this information and populate the artifact and the
+  // implementation information within the DeploymentPlan.
+  //
+  ART_REF_MAP art_ref_map;
+
+  CORBA::ULong pack_len = instance.package.length ();
+
+  for (CORBA::ULong m = 0; m < pack_len; ++m)
+    {
+      Deployment::ComponentPackageDescription
+        package = instance.package[m];
+      CORBA::ULong pack_impl_len = package.implementation.length ();
+
+      for (CORBA::ULong n = 0; n < pack_impl_len; ++n)
+        {
+          Deployment::PackagedComponentImplementation
+            impl = package.implementation[n];
+          CORBA::ULong impl_length (plan.implementation.length ());
+          plan.implementation.length (impl_length + 1);
+          plan.implementation[impl_length].name = plan.instance[l].name;
+          plan.instance[l].implementationRef = impl_length;
+          CORBA::ULong mono_impl_len = 
+            impl.referencedImplementation.monolithicImpl.length ();
+
+          for (CORBA::ULong p = 0; p < mono_impl_len; ++p)
+            {
+              Deployment::MonolithicImplementationDescription
+                mid = impl.referencedImplementation.monolithicImpl[p];
 
-                update_artifacts (mid, plan, plan.instance[l],
+              update_artifacts (mid, plan, plan.instance[l],
                                 ref_map, primary_ref_map, art_ref_map,
-                                  plan.implementation[impl_length]);
-              }
-            update_impl_config_property (impl, plan.implementation[impl_length],
-                                         plan.instance[l]);
-          }
-      }
-  }
-
-  void
-  update_artifacts (MonolithicImplementationDescription &mid,
-                    DeploymentPlan &plan,
-                    InstanceDeploymentDescription &instance,
-                    REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                    ART_REF_MAP &art_ref_map,
-                    MonolithicDeploymentDescription &mdd)
-  {
-    CORBA::ULong prim_art_len = mid.primaryArtifact.length ();
-    for (CORBA::ULong q = 0; q < prim_art_len; ++q)
-      {
-        ImplementationArtifactDescription
-          pack_iad = mid.primaryArtifact[q].referencedArtifact;
-        ACE_TString artifact_name = (const char*)mid.primaryArtifact[q].name;
-        int arti_len;
-        CORBA::ULong art_length (plan.artifact.length ());
+                                plan.implementation[impl_length]);
+            }
+          update_impl_config_property (impl, plan.implementation[impl_length],
+                                       plan.instance[l]);
+        }
+    }
+}
 
-        if (ref_map.find (artifact_name, arti_len) != 0)
-          {
-            plan.artifact.length (art_length + 1);
-            plan.artifact[art_length].name = mid.primaryArtifact[q].name;
-            plan.artifact[art_length].node = instance.node;
-            ref_map.bind (artifact_name, art_length);
-            primary_ref_map.bind (artifact_name, art_length);
-            CORBA::ULong art_ref_len (mdd.artifactRef.length ());
-            mdd.artifactRef.length (art_ref_len + 1);
-            mdd.artifactRef[art_ref_len] = art_length;
-            update_artifact_location (pack_iad,
+void update_artifacts (Deployment::MonolithicImplementationDescription &mid,
+                       Deployment::DeploymentPlan &plan,
+                       Deployment::InstanceDeploymentDescription &instance,
+                       REF_MAP &ref_map, REF_MAP &primary_ref_map,
+                       ART_REF_MAP &art_ref_map,
+                       Deployment::MonolithicDeploymentDescription &mdd)
+{
+  CORBA::ULong prim_art_len = mid.primaryArtifact.length ();
+  for (CORBA::ULong q = 0; q < prim_art_len; ++q)
+    {
+      Deployment::ImplementationArtifactDescription
+        pack_iad = mid.primaryArtifact[q].referencedArtifact;
+      ACE_TString artifact_name = (const char*)mid.primaryArtifact[q].name;
+      int arti_len;
+      CORBA::ULong art_length (plan.artifact.length ());
+
+      if (ref_map.find (artifact_name, arti_len) != 0)
+        {
+          plan.artifact.length (art_length + 1);
+          plan.artifact[art_length].name = mid.primaryArtifact[q].name;
+          plan.artifact[art_length].node = instance.node;
+          ref_map.bind (artifact_name, art_length);
+          primary_ref_map.bind (artifact_name, art_length);
+          CORBA::ULong art_ref_len (mdd.artifactRef.length ());
+          mdd.artifactRef.length (art_ref_len + 1);
+          mdd.artifactRef[art_ref_len] = art_length;
+          update_artifact_location (pack_iad,
+                                    plan.artifact[art_length]);
+          update_artifact_property (pack_iad,
                                     plan.artifact[art_length]);
-            update_artifact_property (pack_iad,
-                                      plan.artifact[art_length]);
-          }
-        update_common_artifact_and_art_ref (pack_iad,
-                                            primary_ref_map, ref_map,
+        }
+      update_common_artifact_and_art_ref (pack_iad,
+                                          primary_ref_map, ref_map,
                                           art_ref_map, mdd,
-                                            plan, instance);
-      }
-  }
-
-  void
-  update_common_artifact_and_art_ref (
-                                      ImplementationArtifactDescription
-                                      &pack_iad,
-                                      REF_MAP &primary_ref_map,
-                                      REF_MAP &ref_map,
-                                      ART_REF_MAP &art_ref_map,
-
-                                      MonolithicDeploymentDescription &mid,
-                                      DeploymentPlan &plan,
+                                          plan, instance);
+    }
+}
 
+void update_common_artifact_and_art_ref (Deployment::
+                                         ImplementationArtifactDescription
+                                         &pack_iad,
+                                         REF_MAP &primary_ref_map,
+                                         REF_MAP &ref_map,
+                                         ART_REF_MAP &art_ref_map,
+                                         Deployment::
+                                         MonolithicDeploymentDescription &mid,
+                                         Deployment::DeploymentPlan &plan,
+                                         Deployment::
                                          InstanceDeploymentDescription
                                          &instance)
-  {
-    CORBA::ULong deps_len = pack_iad.dependsOn.length ();
-    for (CORBA::ULong g = 0; g < deps_len; ++g)
-      {
-        ACE_TString dep_name =
-          (const char*)pack_iad.dependsOn[g].name;
-        int arti_len;
-
-        if (ref_map.find (dep_name, arti_len) == 0)
-          {
-            if (primary_ref_map.find (dep_name, arti_len) != 0)
-              {
-                if (art_ref_map.find (arti_len, arti_len) != 0)
-                  {
-                    update_impl_art_ref (mid, arti_len);
-                    art_ref_map.bind (arti_len, arti_len);
-                  }
-              }
-          }
-        else
-          {
-            ImplementationArtifactDescription
-              depends_iad = pack_iad.dependsOn[g].
-              referencedArtifact;
-            CORBA::ULong new_art_length (plan.artifact.length ());
-            plan.artifact.length (new_art_length + 1);
-            plan.artifact[new_art_length].name =
-              pack_iad.dependsOn[g].name;
-            plan.artifact[new_art_length].node = instance.node;
-            update_artifact_location (depends_iad,
-                                      plan.artifact
-                                      [new_art_length]);
-            ref_map.bind (
-                          (const char*)plan.artifact[new_art_length].name,
-                          new_art_length);
-            update_impl_art_ref (mid, new_art_length);
-            art_ref_map.bind (new_art_length, new_art_length);
-          }
-      }
-  }
-
-  void
-  update_impl_config_property (PackagedComponentImplementation
-                               &impl,
-                               MonolithicDeploymentDescription
-                               &mid,
+{
+  CORBA::ULong deps_len = pack_iad.dependsOn.length ();
+  for (CORBA::ULong g = 0; g < deps_len; ++g)
+    {
+      ACE_TString dep_name =
+         (const char*)pack_iad.dependsOn[g].name;
+      int arti_len;
+
+      if (ref_map.find (dep_name, arti_len) == 0)
+        {
+          if (primary_ref_map.find (dep_name, arti_len) != 0)
+            {
+              if (art_ref_map.find (arti_len, arti_len) != 0)
+                {
+                  update_impl_art_ref (mid, arti_len);
+                  art_ref_map.bind (arti_len, arti_len);
+                }
+            }
+        }
+      else
+        {
+          Deployment::ImplementationArtifactDescription
+             depends_iad = pack_iad.dependsOn[g].
+                  referencedArtifact;
+          CORBA::ULong new_art_length (plan.artifact.length ());
+          plan.artifact.length (new_art_length + 1);
+          plan.artifact[new_art_length].name =
+            pack_iad.dependsOn[g].name;
+          plan.artifact[new_art_length].node = instance.node;
+          update_artifact_location (depends_iad,
+                                    plan.artifact
+                                    [new_art_length]);
+          ref_map.bind (
+             (const char*)plan.artifact[new_art_length].name,
+              new_art_length);
+          update_impl_art_ref (mid, new_art_length);
+          art_ref_map.bind (new_art_length, new_art_length);
+        }
+    }
+}
 
+void update_impl_config_property (Deployment::PackagedComponentImplementation
+                                  &impl,
+                                  Deployment::MonolithicDeploymentDescription
+                                  &mid,
+                                  Deployment::
                                   InstanceDeploymentDescription
-                               &instance)
-  {
-    CORBA::ULong pro_len =
+                                  &instance)
+{
+  CORBA::ULong pro_len = 
     impl.referencedImplementation.configProperty.length ();
+  for (CORBA::ULong x = 0; x < pro_len; ++x)
+    {
+      CORBA::ULong impl_pro_len (mid.execParameter.length ());
+      mid.execParameter.length (impl_pro_len + 1);
+      mid.execParameter[impl_pro_len]
+                = impl.referencedImplementation.configProperty[x];
+      CORBA::ULong ins_pro_len (instance.configProperty. length ());
+      instance.configProperty.length (ins_pro_len + 1);
+      instance.configProperty[ins_pro_len]
+                = impl.referencedImplementation.configProperty[x];
+    }
+}
 
-    for (CORBA::ULong x = 0; x < pro_len; ++x)
-      {
-        CORBA::ULong impl_pro_len (mid.execParameter.length ());
-        mid.execParameter.length (impl_pro_len + 1);
-        mid.execParameter[impl_pro_len]
-          = impl.referencedImplementation.configProperty[x];
-        CORBA::ULong ins_pro_len (instance.configProperty. length ());
-        instance.configProperty.length (ins_pro_len + 1);
-        instance.configProperty[ins_pro_len]
-          = impl.referencedImplementation.configProperty[x];
-      }
-  }
-
-  void
-  update_impl_art_ref (MonolithicDeploymentDescription &mid,
-                       int arti_len)
-  {
-    CORBA::ULong new_art_ref_len (mid.artifactRef.length ());
-    mid.artifactRef.length (new_art_ref_len + 1);
-    mid.artifactRef[new_art_ref_len] = arti_len;
-  }
+void update_impl_art_ref (Deployment::MonolithicDeploymentDescription
+                          &mid, int arti_len)
+{
+  CORBA::ULong new_art_ref_len (mid.artifactRef.length ());
+  mid.artifactRef.length (new_art_ref_len + 1);
+  mid.artifactRef[new_art_ref_len] = arti_len;
+}
 
-  void
-  update_artifact_location (ImplementationArtifactDescription
-                            &pack_iad,
-                            ArtifactDeploymentDescription
-                            &plan_artifact)
-  {
-    CORBA::ULong loc_len = pack_iad.location.length ();
-    for (CORBA::ULong e = 0; e < loc_len; ++e)
-      {
-        CORBA::ULong art_loc_len (plan_artifact.location.length ());
-        plan_artifact.location.length (art_loc_len + 1);
-        plan_artifact.location[art_loc_len] = pack_iad.location[e];
-      }
-  }
+void update_artifact_location (Deployment::ImplementationArtifactDescription
+                               &pack_iad,
+                               Deployment::ArtifactDeploymentDescription
+                               &plan_artifact)
+{
+  CORBA::ULong loc_len = pack_iad.location.length ();
+  for (CORBA::ULong e = 0; e < loc_len; ++e)
+    {
+      CORBA::ULong art_loc_len (plan_artifact.location.length ());
+      plan_artifact.location.length (art_loc_len + 1);
+      plan_artifact.location[art_loc_len] = pack_iad.location[e];
+    }
+}
 
-  void
-  update_artifact_property (ImplementationArtifactDescription
-                            &pack_iad,
-                            ArtifactDeploymentDescription
-                            &plan_artifact)
-  {
-    CORBA::ULong para_len = pack_iad.execParameter.length ();
-    for (CORBA::ULong f = 0; f < para_len; ++f)
-      {
-        CORBA::ULong art_pro_len (plan_artifact.execParameter.length ());
-        plan_artifact.execParameter.length (art_pro_len + 1);
-        plan_artifact.execParameter[art_pro_len] = pack_iad.execParameter[f];
-      }
-  }
+void update_artifact_property (Deployment::ImplementationArtifactDescription
+                               &pack_iad,
+                               Deployment::ArtifactDeploymentDescription
+                               &plan_artifact)
+{
+  CORBA::ULong para_len = pack_iad.execParameter.length ();
+  for (CORBA::ULong f = 0; f < para_len; ++f)
+    {
+      CORBA::ULong art_pro_len (plan_artifact.execParameter.length ());
+      plan_artifact.execParameter.length (art_pro_len + 1);
+      plan_artifact.execParameter[art_pro_len] = pack_iad.execParameter[f];
+    }
 }
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
index 3a67955bd2f..018a090cb94 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
@@ -12,101 +12,86 @@
  *
  *======================================================================*/
 
-#ifndef CIAO_REPOSITORY_MANAGER_UPDATE_PLAN_H
-#define CIAO_REPOSITORY_MANAGER_UPDATE_PLAN_H
-#include /**/ "ace/pre.h"
+#ifndef UPDATE_PLAN_H
+#define UPDATE_PLAN_H
 
+#include "DeploymentC.h"
 #include "ace/Hash_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-namespace Deployment
-{
-  struct SubcomponentInstantiationDescription;
-  struct DeploymentPlan;
-  struct ComponentAssemblyDescription;
-  struct SubcomponentInstantiationDescription;
-  struct AssemblyConnectionDescription;
-}
-
-namespace CIAO
-{
-  class Null_Dom_Document { };
-  // exception thrown when we have a null dom document.
-
-  typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP;
-  typedef ACE_Hash_Map_Manager<int, int, ACE_Null_Mutex> ART_REF_MAP;
-
-  void
-  traverse_assembly_instance (Deployment::
-                              SubcomponentInstantiationDescription &instance,
-                              Deployment::DeploymentPlan &plan,
-                              int l,
-                              REF_MAP &ref_map,
-                              REF_MAP &primary_ref_map);
-
-  void traverse_assembly (Deployment::ComponentAssemblyDescription &assembly,
-                          Deployment::DeploymentPlan &plan,
-                          REF_MAP &ref_map, REF_MAP &primary_ref_map);
-
-  void traverse_interface (Deployment::SubcomponentInstantiationDescription
-                           &instance,
-                           Deployment::PlanSubcomponentPortEndpoint
-                           &pspe);
-
-  void traverse_assembly_connection (Deployment::ComponentAssemblyDescription
-                                     &assembly,
-                                     Deployment::AssemblyConnectionDescription
-                                     &assembly_connection,
-                                     Deployment::DeploymentPlan &plan);
-
-  void traverse_package (Deployment::PackageConfiguration* &pc,
-                         Deployment::DeploymentPlan &plan,
-                         REF_MAP &ref_map, REF_MAP &primary_ref_map);
-
-  void update_artifacts (Deployment::MonolithicImplementationDescription &mid,
-                         Deployment::DeploymentPlan &plan,
-                         Deployment::InstanceDeploymentDescription &instance,
-                         REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                         ART_REF_MAP &art_ref_map,
-                         Deployment::MonolithicDeploymentDescription &mdd);
-
-  void update_artifact_location (Deployment::ImplementationArtifactDescription
-                                 &pack_iad,
-                                 Deployment::ArtifactDeploymentDescription
-                                 &plan_artifact);
-
-  void update_artifact_property (Deployment::ImplementationArtifactDescription
-                                 &pack_iad,
-                                 Deployment::ArtifactDeploymentDescription
-                                 &plan_artifact);
-
-  void update_impl_art_ref (Deployment::MonolithicDeploymentDescription
-                            &mid, int art_len);
-
-  void update_impl_config_property (Deployment::
-                                    PackagedComponentImplementation &impl,
-                                    Deployment::
-                                    MonolithicDeploymentDescription &mid,
-                                    Deployment::
-                                    InstanceDeploymentDescription
-                                    &instance);
-
-  void update_common_artifact_and_art_ref (Deployment::
-                                           ImplementationArtifactDescription &pack_iad,
-                                           REF_MAP &primary_ref_map,
-                                           REF_MAP &ref_map,
-                                           ART_REF_MAP &art_ref_map,
-                                           Deployment::MonolithicDeploymentDescription
-                                           &mid,
-                                           Deployment::DeploymentPlan &plan,
-                                           Deployment::
-                                           InstanceDeploymentDescription
-                                           &instance);
-}
+class Null_Dom_Document { };
+// exception thrown when we have a null dom document.
+
+typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP;
+typedef ACE_Hash_Map_Manager<int, int, ACE_Null_Mutex> ART_REF_MAP;
+
+void traverse_assembly_instance (Deployment::
+                                 SubcomponentInstantiationDescription
+                                 &instance,
+                                 Deployment::DeploymentPlan &plan, int l,
+                                 REF_MAP &ref_map, REF_MAP &primary_ref_map);
+
+void traverse_assembly (Deployment::ComponentAssemblyDescription &assembly,
+                        Deployment::DeploymentPlan &plan,
+                        REF_MAP &ref_map, REF_MAP &primary_ref_map);
+
+void traverse_interface (Deployment::SubcomponentInstantiationDescription
+                         &instance,
+                         Deployment::PlanSubcomponentPortEndpoint
+                         &pspe);
+
+void traverse_assembly_connection (Deployment::ComponentAssemblyDescription
+                                   &assembly,
+                                   Deployment::AssemblyConnectionDescription
+                                   &assembly_connection,
+                                   Deployment::DeploymentPlan &plan);
+
+void traverse_package (Deployment::PackageConfiguration* &pc,
+                       Deployment::DeploymentPlan &plan,
+                       REF_MAP &ref_map, REF_MAP &primary_ref_map);
+
+void update_artifacts (Deployment::MonolithicImplementationDescription &mid,
+                       Deployment::DeploymentPlan &plan,
+                       Deployment::InstanceDeploymentDescription &instance,
+                       REF_MAP &ref_map, REF_MAP &primary_ref_map,
+                       ART_REF_MAP &art_ref_map,
+                       Deployment::MonolithicDeploymentDescription &mdd);
+
+void update_artifact_location (Deployment::ImplementationArtifactDescription
+                               &pack_iad,
+                               Deployment::ArtifactDeploymentDescription
+                               &plan_artifact);
+
+void update_artifact_property (Deployment::ImplementationArtifactDescription
+                               &pack_iad,
+                               Deployment::ArtifactDeploymentDescription
+                               &plan_artifact);
+
+void update_impl_art_ref (Deployment::MonolithicDeploymentDescription
+                          &mid, int art_len);
+
+void update_impl_config_property (Deployment::
+                                  PackagedComponentImplementation &impl,
+                                  Deployment::
+                                  MonolithicDeploymentDescription &mid,
+                                  Deployment::
+                                  InstanceDeploymentDescription
+                                  &instance);
+
+void update_common_artifact_and_art_ref (Deployment::
+                                  ImplementationArtifactDescription &pack_iad,
+                                  REF_MAP &primary_ref_map,
+                                  REF_MAP &ref_map,
+                                  ART_REF_MAP &art_ref_map,
+                                  Deployment::MonolithicDeploymentDescription
+                                  &mid,
+                                  Deployment::DeploymentPlan &plan,
+                                  Deployment::
+                                  InstanceDeploymentDescription
+                                  &instance);
 
 #include /**/ "ace/post.h"
-#endif /* CIAO_REPOSITORY_MANAGER_UPDATE_PLAN_H*/
+#endif /* UPDATE_PLAN_H */
diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Container.idl b/TAO/CIAO/DAnCE/ciao/CCM_Container.idl
index 220a09ea261..0b7d23562fc 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Container.idl
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Container.idl
@@ -17,7 +17,7 @@
 #define CCM_CONTAINER_IDL
 
 #include "CCM_Component.idl"
-#include "orbsvcs/SecurityLevel2.idl"
+#include "orbsvcs/orbsvcs/SecurityLevel2.idl"
 #include "CCM_Transaction.idl"
 
 // *************** Basic Container interfaces ***************
diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
index 8384d770c0a..b8a0c253087 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
@@ -31,7 +31,7 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 }
 
-project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client {
+project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, iorinterceptor, objreftemplate, valuetype, ifr_client {
   after += CIAO_DnC_Client
   sharedname  = CIAO_DnC_Container
   libs       += CIAO_DnC_Client
@@ -62,7 +62,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
 // Valuetype library must be linked for this project.
 // Please don't remove.
 project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client {
-  sharedname   =  CIAO_Deployment_stub
+  sharedname   =  Deployment_stub
   after        += CIAO_DnC_Client
 
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
@@ -91,11 +91,11 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client {
 
 // CIAO_DnC_Client library must be linked for this project.
 // Please don't remove.
-project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype,ifr_client {
+project(Deployment_svnt) : taolib_with_idl, portableserver, ifr_client {
   after        += Deployment_stub
-  sharedname   =  CIAO_Deployment_svnt
+  sharedname   =  Deployment_svnt
   dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
-  libs         += CIAO_Deployment_stub CIAO_DnC_Client
+  libs         += Deployment_stub CIAO_DnC_Client
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
   idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
   idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
@@ -115,11 +115,10 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype,ifr_client
 
 }
 
-project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, ifr_client, utils, security {
+project (CIAO_DnC_Server) : orbsvcslib, portableserver, iorinterceptor, objreftemplate, valuetype, ifr_client, security {
   after        += CIAO_DnC_Container Deployment_svnt
-  includes     += $(CIAO_ROOT)/DAnCE
   sharedname   =  CIAO_DnC_Server
-  libs         += CIAO_DnC_Client CIAO_DnC_Container CIAO_Deployment_svnt CIAO_Deployment_stub
+  libs         += CIAO_DnC_Client CIAO_DnC_Container Deployment_svnt Deployment_stub
   idlflags     += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
   dynamicflags =  CIAO_SERVER_BUILD_DLL
 
@@ -130,13 +129,8 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, ifr_client, u
   Source_Files {
     Container_Base.cpp
     NodeApplication_Impl.cpp
-    Context_Impl_Base.cpp
-    Home_Servant_Impl_Base.cpp
-    Servant_Impl_Base.cpp
     Server_init.cpp
-    Servant_Activator.cpp
-    Port_Activator.cpp
-    StandardConfigurator_Impl.cpp
+    Servant_Impl_Base.cpp
   }
 
   Header_Files {
@@ -145,10 +139,7 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, ifr_client, u
   }
 
   Template_Files {
-    Context_Impl_T.cpp
-    Home_Servant_Impl_T.cpp
     Servant_Impl_T.cpp
-    Servant_Activator_T.cpp
   }
 }
 
diff --git a/TAO/CIAO/DAnCE/ciao/ComponentsC.h b/TAO/CIAO/DAnCE/ciao/ComponentsC.h
index 4ef065c4e8d..32e5a755e83 100644
--- a/TAO/CIAO/DAnCE/ciao/ComponentsC.h
+++ b/TAO/CIAO/DAnCE/ciao/ComponentsC.h
@@ -72,7 +72,7 @@
 // Traits specializations.
 namespace TAO
 {
-}
+};
 
 // TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
index f1fce5ec95f..794e3927437 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
@@ -2,429 +2,300 @@
 
 #include "Container_Base.h"
 #include "ace/DLL.h"
-#include "tao/Utils/PolicyList_Destroyer.h"
 #include "ace/OS_NS_stdio.h"
-#include "Servant_Activator.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Container_Base.inl"
 #endif /* __ACE_INLINE__ */
 
-namespace CIAO
+////////////////////////////////////////////////////////////////
+
+CIAO::Container::Container (CORBA::ORB_ptr o)
+  : orb_ (CORBA::ORB::_duplicate (o))
 {
+}
 
-////////////////////////////////////////////////////////////////
-  Container::Container (CORBA::ORB_ptr o)
-    : orb_ (CORBA::ORB::_duplicate (o))
-  {
-  }
-
-  Container::~Container ()
-  {
-  }
-
-  PortableServer::POA_ptr
-  Container::the_POA (void) const
-  {
-    return this->component_poa_.in ();
-  }
-
-  CORBA::ORB_ptr
-  Container::the_ORB (void) const
-  {
-    return this->orb_.in ();
-  }
-
-  ///////////////////////////////////////////////////////////////
-
-  ACE_Atomic_Op <ACE_SYNCH_MUTEX, long>
-  Session_Container::serial_number_ (0);
-
-  Session_Container::Session_Container (CORBA::ORB_ptr o,
-                                        bool static_config_flag,
-                                        const Static_Config_EntryPoints_Maps* maps)
+CIAO::Container::~Container ()
+{
+}
+
+PortableServer::POA_ptr
+CIAO::Container::_ciao_the_POA (void)
+{
+  return this->poa_.in ();
+}
+
+CORBA::ORB_ptr
+CIAO::Container::_ciao_the_ORB ()
+{
+  return this->orb_.in ();
+}
+
+///////////////////////////////////////////////////////////////
+
+ACE_Atomic_Op <ACE_SYNCH_MUTEX, long>
+CIAO::Session_Container::serial_number_ (0);
+
+CIAO::Session_Container::Session_Container (CORBA::ORB_ptr o,
+                                            int static_config_flag,
+                                            const Static_Config_EntryPoints_Maps* maps
+                                            )
   : Container (o),
     number_ (0),
     static_config_flag_ (static_config_flag),
-    static_entrypts_maps_ (maps),
-    sa_ (0)
-  {
-  }
-
-  Session_Container::~Session_Container ()
-  {
-  }
-
-  int
-  Session_Container::init (const char *name,
-                           const CORBA::PolicyList *more_policies
-                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    char buffer[MAXPATHLEN];
-
-    if (name == 0)
-      {
-        this->number_ = ++Session_Container::serial_number_;
-        ACE_OS::sprintf (buffer, "CIAO::Session_Container-%ld",
-                         this->number_);
-        name = buffer;
-      }
-
-    CORBA::Object_var poa_object =
-      this->orb_->resolve_initial_references("RootPOA"
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    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_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    this->create_component_POA (name,
-                                more_policies,
-                                root_poa.in ()
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    this->create_facet_consumer_POA (root_poa.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    return 0;
-  }
-
-  void
-  Session_Container::create_component_POA (const char *name,
-                                           const CORBA::PolicyList *p,
-                                           PortableServer::POA_ptr root
-                                           ACE_ENV_ARG_DECL)
-  {
-    // Set up proper poa policies here.  Default policies seems to be
-    // fine for session container.  If you add some other default
-    // policies here, then you need to "add" more_policies below
-    // instead of simply assigning more_policies to the init policy
-    // list.
-    CORBA::PolicyList policies (0);
-
-    if (p != 0)
-      policies = *p;
-
-    PortableServer::POAManager_var poa_manager =
-      root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->component_poa_ =
-      root->create_POA (name,
-                        poa_manager.in (),
-                        policies
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  void
-  Session_Container::create_facet_consumer_POA (
-      PortableServer::POA_ptr root
-      ACE_ENV_ARG_DECL)
-  {
-    PortableServer::POAManager_var poa_manager =
-      root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    TAO::Utils::PolicyList_Destroyer policies (3);
-    policies.length (3);
-
-    policies[0] =
-      root->create_id_assignment_policy (PortableServer::USER_ID
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    policies[1] =
-      root->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    // Servant Retention Policy
-    policies[2] =
-      root->create_servant_retention_policy (PortableServer::RETAIN
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->facet_cons_poa_ =
-      root->create_POA ("facet_consumer_poa",
-                        poa_manager.in (),
-                        policies
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    ACE_NEW_THROW_EX (this->sa_,
-                      Servant_Activator (this->orb_.in ()),
-                      CORBA::NO_MEMORY ());
-
-    this->facet_cons_poa_->set_servant_manager (
-        this->sa_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  CORBA::Object_ptr
-  Session_Container::install_servant (PortableServer::Servant p,
-                                      Container::OA_Type t
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      tmp = this->component_poa_.in ();
-    else
-      tmp = this->facet_cons_poa_.in ();
-
-    PortableServer::ObjectId_var oid
-      = tmp->activate_object (p
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    CORBA::Object_var objref
-      = tmp->id_to_reference (oid.in ()
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    return objref._retn ();
-  }
-
-  CORBA::Object_ptr
-  Session_Container::install_component (PortableServer::Servant p,
-                                        PortableServer::ObjectId_out oid
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    PortableServer::ObjectId_var id =
-      this->component_poa_->activate_object (p
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    CORBA::Object_var objref
-      = this->component_poa_->id_to_reference (id.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    oid = id._retn ();
-
-    return objref._retn ();
-  }
-
-
-  //@@ Apparently we need to be cautious when handling the exception
-  //   thrown here. We should make sure that new DnC interfaces
-  //   NodeApplication/NodeApplicationManager etc will cache the new
-  //   exceptions--> rethrow of new exceptions is needed.
-  //                                            --Tao
-  Components::CCMHome_ptr
-  Session_Container::ciao_install_home (const char *exe_dll_name,
-                                        const char *exe_entrypt,
-                                        const char *sv_dll_name,
-                                        const char *sv_entrypt
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Deployment::UnknownImplId,
-                     Deployment::ImplEntryPointNotFound,
-                     Deployment::InstallationFailure))
-  {
-
-    HomeFactory hcreator = 0;
-    ServantFactory screator = 0;
-
-    if (this->static_config_flag_ == 0)
-      {
-        ACE_DLL executor_dll, servant_dll;
-
-        if (exe_dll_name == 0 || sv_dll_name == 0)
-          ACE_THROW_RETURN (Deployment::UnknownImplId (),
-                            Components::CCMHome::_nil ());
-
-        if (executor_dll.open (exe_dll_name,
-                               ACE_DEFAULT_SHLIB_MODE,
-                               0) != 0
-            || servant_dll.open (sv_dll_name,
-                                 ACE_DEFAULT_SHLIB_MODE,
-                                 0) != 0)
-          {
-            ACE_THROW_RETURN (Deployment::UnknownImplId (),
-                              Components::CCMHome::_nil ());
-          }
-
-        if (exe_entrypt == 0 || sv_entrypt == 0)
-          ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (),
-                            Components::CCMHome::_nil ());
-
-        // @@ (OO) Please use a static_cast<> here instead of a C-style
-        //         cast.  ANSI C++ casts are the preferred (and modern)
-        //         way of casting in ACE/TAO/CIAO.
-        hcreator = (HomeFactory) executor_dll.symbol (exe_entrypt);
-        screator = (ServantFactory) servant_dll.symbol (sv_entrypt);
+    static_entrypts_maps_ (maps)
+{
+}
+
+CIAO::Session_Container::~Session_Container ()
+{
+}
+
+int
+CIAO::Session_Container::init (const char *name,
+                               const CORBA::PolicyList *more_policies
+                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  char buffer[MAXPATHLEN];
+
+  if (name == 0)
+    {
+      this->number_ = ++CIAO::Session_Container::serial_number_;
+      ACE_OS::sprintf (buffer, "CIAO::Session_Container-%ld",
+                        this->number_);
+      name = buffer;
     }
-    else
-      {
-        if (static_entrypts_maps_ == 0 ||
-            static_entrypts_maps_->home_creator_funcptr_map_ == 0 ||
-            static_entrypts_maps_->home_servant_creator_funcptr_map_ == 0)
-          ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (),
-                            Components::CCMHome::_nil ());
-
-        ACE_CString exe_entrypt_str (exe_entrypt);
-        static_entrypts_maps_->home_creator_funcptr_map_->
-          find (exe_entrypt_str, hcreator);
-
-        ACE_CString sv_entrypt_str (sv_entrypt);
-        static_entrypts_maps_->home_servant_creator_funcptr_map_->
-          find (sv_entrypt_str, screator);
-      }
-
-    if (hcreator == 0 || screator == 0)
-      ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (),
-                        Components::CCMHome::_nil ());
-
-    Components::HomeExecutorBase_var home_executor = hcreator ();
-    if (CORBA::is_nil (home_executor.in ()))
-      ACE_THROW_RETURN (Deployment::InstallationFailure (),
-                        Components::CCMHome::_nil ());
-
-    PortableServer::Servant home_servant = screator (home_executor.in (),
-                                                     this
-                                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::CCMHome::_nil ());
-
-    if (home_servant == 0)
-      ACE_THROW_RETURN (Deployment::InstallationFailure (),
-                        Components::CCMHome::_nil ());
-
-    PortableServer::ServantBase_var safe (home_servant);
-
-    CORBA::Object_var objref =
-      this->install_servant (home_servant,
-                             Container::Component
-                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::CCMHome::_nil ());
-
-    Components::CCMHome_var homeref =
-      Components::CCMHome::_narrow (objref.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    return homeref._retn ();
-
-  }
-
-  void
-  Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref
+
+   CORBA::Object_var poa_object =
+     this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   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_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   // Set up proper poa policies here.  Default policies seems to be
+   // fine for session container.  If you add some other default
+   // policies here, then you need to "add" more_policies below
+   // instead of simply assigning more_policies to the init policy
+   // list.
+   CORBA::PolicyList policies (0);
+
+   if (more_policies != 0)
+     policies = *more_policies;
+
+   this->poa_ = root_poa->create_POA (name,
+                                      PortableServer::POAManager::_nil (),
+                                      policies
+                                      ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   PortableServer::POAManager_var poa_manager =
+     this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   return 0;
+}
+
+CORBA::Object_ptr
+CIAO::Session_Container::install_servant (PortableServer::Servant p
                                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    this->uninstall (homeref,
-                     Container::Component
-                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  void
-  Session_Container::uninstall (CORBA::Object_ptr objref,
-                                Container::OA_Type t
-                                ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      tmp = this->component_poa_.in ();
-    else
-      tmp = this->facet_cons_poa_.in ();
-
-    PortableServer::ObjectId_var oid =
-      tmp->reference_to_id (objref
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    tmp->deactivate_object (oid.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  }
-
-  void
-  Session_Container::uninstall (PortableServer::Servant svt,
-                                Container::OA_Type t
-                                ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      tmp = this->component_poa_.in ();
-    else
-      tmp = this->facet_cons_poa_.in ();
-
-    PortableServer::ObjectId_var oid
-      = tmp->servant_to_id (svt
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var oid
+    = this->poa_->activate_object (p
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::Object_var objref
+    = this->poa_->id_to_reference (oid.in ()
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return objref._retn ();
+}
+
+CORBA::Object_ptr
+CIAO::Session_Container::install_component (PortableServer::Servant p,
+                                            PortableServer::ObjectId_out oid
+                                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var id
+    = this->poa_->activate_object (p
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::Object_var objref
+    = this->poa_->id_to_reference (id.in ()
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  oid = id._retn ();
+
+  return objref._retn ();
+}
+
+
+//@@ Apparently we need to be cautious when handling the exception
+//   thrown here. We should make sure that new DnC interfaces
+//   NodeApplication/NodeApplicationManager etc will cache the new
+//   exceptions--> rethrow of new exceptions is needed.
+//                                            --Tao
+Components::CCMHome_ptr
+CIAO::Session_Container::ciao_install_home (const char *exe_dll_name,
+                                            const char *exe_entrypt,
+                                            const char *sv_dll_name,
+                                            const char *sv_entrypt
+                                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::UnknownImplId,
+                   Deployment::ImplEntryPointNotFound,
+                   Deployment::InstallationFailure))
+{
+
+  HomeFactory hcreator = 0;
+  ServantFactory screator = 0;
+
+  if (this->static_config_flag_ == 0)
+    {
+      ACE_DLL executor_dll, servant_dll;
+
+      if (exe_dll_name == 0 || sv_dll_name == 0)
+        ACE_THROW_RETURN (Deployment::UnknownImplId (),
+			  Components::CCMHome::_nil ());
+
+      if (executor_dll.open (exe_dll_name,
+			     ACE_DEFAULT_SHLIB_MODE,
+			     0) != 0
+	  || servant_dll.open (sv_dll_name,
+			       ACE_DEFAULT_SHLIB_MODE,
+			       0) != 0)
+	{
+	  ACE_THROW_RETURN (Deployment::UnknownImplId (),
+			    Components::CCMHome::_nil ());
+	}
+
+      if (exe_entrypt == 0 || sv_entrypt == 0)
+        ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (),
+			  Components::CCMHome::_nil ());
+
+      // @@ (OO) Please use a static_cast<> here instead of a C-style
+      //         cast.  ANSI C++ casts are the preferred (and modern)
+      //         way of casting in ACE/TAO/CIAO.
+      hcreator = (HomeFactory) executor_dll.symbol (exe_entrypt);
+      screator = (ServantFactory) servant_dll.symbol (sv_entrypt);
+    }
+  else
+    {
+      if (static_entrypts_maps_ == 0 ||
+          static_entrypts_maps_->home_creator_funcptr_map_ == 0 ||
+          static_entrypts_maps_->home_servant_creator_funcptr_map_ == 0)
+        ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (),
+			  Components::CCMHome::_nil ());
+
+      ACE_CString exe_entrypt_str (exe_entrypt);
+      static_entrypts_maps_->home_creator_funcptr_map_->
+        find (exe_entrypt_str, hcreator);
+
+      ACE_CString sv_entrypt_str (sv_entrypt);
+      static_entrypts_maps_->home_servant_creator_funcptr_map_->
+        find (sv_entrypt_str, screator);
+    }
+
+  if (hcreator == 0 || screator == 0)
+    ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (),
+		      Components::CCMHome::_nil ());
+
+  Components::HomeExecutorBase_var home_executor = hcreator ();
+  if (CORBA::is_nil (home_executor.in ()))
+    ACE_THROW_RETURN (Deployment::InstallationFailure (),
+		      Components::CCMHome::_nil ());
+
+  PortableServer::Servant home_servant = screator (home_executor.in (),
+                                                   this
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (Components::CCMHome::_nil ());
+
+  if (home_servant == 0)
+    ACE_THROW_RETURN (Deployment::InstallationFailure (),
+		      Components::CCMHome::_nil ());
+
+  PortableServer::ServantBase_var safe (home_servant);
+
+  CORBA::Object_var objref = this->install_servant (home_servant
+                                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (Components::CCMHome::_nil ());
+
+  Components::CCMHome_var homeref =
+    Components::CCMHome::_narrow (objref.in ()
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return homeref._retn ();
+
+}
+
+void
+CIAO::Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref
+                                              ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->uninstall (homeref
+                   ACE_ENV_ARG_PARAMETER);
+}
+
+void
+CIAO::Session_Container::uninstall (CORBA::Object_ptr objref
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var oid
+    = this->poa_->reference_to_id (objref
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->poa_->deactivate_object (oid.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+}
+
+void
+CIAO::Session_Container::uninstall (PortableServer::Servant svt
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var oid
+    = this->poa_->servant_to_id (svt
                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
 
-    tmp->deactivate_object (oid.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  }
+  this->poa_->deactivate_object (oid.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+}
 
-  void
-  Session_Container::uninstall_component (Components::CCMObject_ptr objref,
-                                          PortableServer::ObjectId_out oid
-                                          ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-
-    PortableServer::ObjectId_var id =
-      this->component_poa_->reference_to_id (objref
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->component_poa_->deactivate_object (id.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    oid = id._retn ();
-  }
-
-  CORBA::Object_ptr
-  Session_Container::generate_reference (const char *obj_id,
-                                         const char *repo_id,
-                                         Container::OA_Type t
-                                         ACE_ENV_ARG_DECL)
-  {
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      tmp = this->component_poa_.in ();
-    else
-      tmp = this->facet_cons_poa_.in ();
-
-    PortableServer::ObjectId_var oid =
-      PortableServer::string_to_ObjectId (obj_id);
-
-    CORBA::Object_var objref =
-      tmp->create_reference_with_id (oid.in (),
-                                     repo_id
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-    return objref._retn ();
-  }
+void
+CIAO::Session_Container::uninstall_component (Components::CCMObject_ptr objref,
+                                              PortableServer::ObjectId_out oid
+                                              ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var id
+    = this->poa_->reference_to_id (objref
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->poa_->deactivate_object (id.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
+  oid = id._retn ();
 }
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h
index b76cf9da544..2a618114c7d 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h
@@ -20,9 +20,9 @@
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
-#include "ciao/CCM_ContainerC.h"
-#include "ciao/Deployment_CoreC.h"
-#include "ciao/CIAO_Server_Export.h"
+#include "CCM_ContainerC.h"
+#include "Deployment_CoreC.h"
+#include "CIAO_Server_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,8 +30,6 @@
 
 namespace CIAO
 {
-  class Servant_Activator;
-
   /**
    * @class Container
    *
@@ -43,25 +41,16 @@ namespace CIAO
   class CIAO_SERVER_Export Container
   {
   public:
-    enum OA_Type
-      {
-        Component,
-        Facet_Consumer
-      };
-
     Container (CORBA::ORB_ptr o);
 
     virtual ~Container (void) = 0;
 
-    /// Get component's POA.
-    /**
-     * This operation does *NOT* increase the reference count of the
-     * POA. Look at the const qualifier in the method.
-     */
-    PortableServer::POA_ptr the_POA (void) const;
+    /// Get the containing POA.  This operation does *NOT*
+    /// increase the reference count of the POA.
+    virtual PortableServer::POA_ptr _ciao_the_POA (void);
 
     /// Get a reference to the underlying ORB.
-    CORBA::ORB_ptr the_ORB (void) const;
+    virtual CORBA::ORB_ptr _ciao_the_ORB (void);
 
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
@@ -88,25 +77,14 @@ namespace CIAO
 
     // Uninstall a servant for component.
     virtual void uninstall_component (::Components::CCMObject_ptr objref,
-                                      PortableServer::ObjectId_out oid
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                              PortableServer::ObjectId_out oid
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
-
   protected:
     CORBA::ORB_var orb_;
 
-    /// POA within which all the components in this container will be
-    /// activated.
-    PortableServer::POA_var component_poa_;
-
-    /// POA within which all the facets and receptacles will be
-    /// activated.
-    /**
-     * Having two POA's allows us to associate different policies that
-     * are distinct from the component.
-     */
-    PortableServer::POA_var facet_cons_poa_;
+    PortableServer::POA_var poa_;
   };
 
   class Session_Container;
@@ -115,10 +93,7 @@ namespace CIAO
   typedef ::PortableServer::Servant (*ServantFactory)
     (::Components::HomeExecutorBase_ptr p,
      ::CIAO::Session_Container *c
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
-    );
+     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
                                   HomeFactory,
@@ -149,8 +124,9 @@ namespace CIAO
     //         It appears to be a boolean value.  Please use bool
     //         instead.
     Session_Container (CORBA::ORB_ptr o,
-                       bool static_config_flag = false,
-                       const Static_Config_EntryPoints_Maps* static_entrypts_maps =0);
+                       int static_config_flag =0,
+                       const Static_Config_EntryPoints_Maps* static_entrypts_maps =0
+                       );
 
     virtual ~Session_Container (void);
 
@@ -158,7 +134,6 @@ namespace CIAO
     virtual int init (const char *name = 0,
                       const CORBA::PolicyList *more_policies = 0
                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -190,13 +165,12 @@ namespace CIAO
 
     // Uninstall a servant for component.
     virtual void uninstall_component (::Components::CCMObject_ptr objref,
-                                      PortableServer::ObjectId_out oid
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                              PortableServer::ObjectId_out oid
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Install a servant for component or home.
-    CORBA::Object_ptr install_servant (PortableServer::Servant p,
-                                       Container::OA_Type t
+    CORBA::Object_ptr install_servant (PortableServer::Servant p
                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -212,44 +186,15 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Uninstall a servant for component or home.
-    void uninstall (CORBA::Object_ptr objref,
-                    Container::OA_Type t
+    void uninstall (CORBA::Object_ptr objref
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Uninstall a servant for component or home.
-    void uninstall (PortableServer::Servant svt,
-                    Container::OA_Type t
+    void uninstall (PortableServer::Servant svt
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Analog of the POA method that creates an object reference from
-    // an object id string.
-    CORBA::Object_ptr generate_reference (const char *obj_id,
-                                          const char *repo_id,
-                                          Container::OA_Type t
-                                          ACE_ENV_ARG_DECL);
-
-    /// Return the servant activator factory that activates the
-    /// servants for facets and consumers.
-    Servant_Activator *ports_servant_activator (void) const;
-
-  private:
-
-    /// Create POA  for the component.
-    /**
-     * This is the POA that is returned to the component applications
-     * if they need one.
-     */
-    void create_component_POA (const char *name,
-                               const CORBA::PolicyList *p,
-                               PortableServer::POA_ptr root
-                               ACE_ENV_ARG_DECL);
-
-    /// Create POA for the facets and consumers alone.
-    void create_facet_consumer_POA (PortableServer::POA_ptr root
-                                    ACE_ENV_ARG_DECL);
-
   protected:
     long number_;
 
@@ -259,12 +204,8 @@ namespace CIAO
     //         boolean value.  Please use bool instead.
     //
     //         It looks like it can also be declared const, as well.
-    bool static_config_flag_;
+    int static_config_flag_;
     const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
-
-    /// The servant activator factory used to activate facets and
-    /// consumer servants.
-    Servant_Activator *sa_;
   };
 }
 
@@ -277,7 +218,7 @@ namespace CIAO
   {  \
     CORBA::ValueFactory factory = new FACTORY; \
     CORBA::ORB_ptr orb = \
-      this->context_->_ciao_the_Container ()->the_ORB (); \
+      this->context_->_ciao_the_Container ()->_ciao_the_ORB (); \
     CORBA::ValueFactory prev_factory = \
       orb->register_value_factory ( \
                VALUETYPE::_tao_obv_static_repository_id (), \
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.inl b/TAO/CIAO/DAnCE/ciao/Container_Base.inl
index 0d6aeef9bcc..5435a481075 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.inl
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.inl
@@ -5,12 +5,6 @@ CIAO::Session_Container::get_objref (PortableServer::Servant p
                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->the_POA ()->servant_to_reference (p
-                                                 ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CIAO::Servant_Activator *
-CIAO::Session_Container::ports_servant_activator (void) const
-{
-  return this->sa_;
+  return this->_ciao_the_POA ()->servant_to_reference (p
+						       ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
index fccbf855572..16bfc99c407 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
 #include "Servant_Impl_Base.h"
-#include "StandardConfigurator_Impl.h"
-#include "Container_Base.h"
 
 namespace CIAO
 {
@@ -15,347 +13,6 @@ namespace CIAO
   {
   }
 
-  // Operations for CCMObject interface.
-
-  ::Components::PrimaryKeyBase *
-  Servant_Impl_Base::get_primary_key (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::Components::NoKeyAvailable))
-  {
-    ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
-
-    return 0;
-  }
-
-  CORBA::IRObject_ptr
-  Servant_Impl_Base::get_component_def (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
-  }
-
-  void
-  Servant_Impl_Base::configuration_complete (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidConfiguration))
-  {
-    // CIAO to-do
-  }
-
-  void
-  Servant_Impl_Base::remove (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::RemoveFailure))
-  {
-    // CIAO to-do
-  }
-
-  ::Components::ConnectionDescriptions *
-  Servant_Impl_Base::get_connections (
-      const char * /* name */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::ComponentPortDescription *
-  Servant_Impl_Base::get_all_ports (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    OBV_Components::ComponentPortDescription *cps = 0;
-    ACE_NEW_RETURN (cps,
-                    OBV_Components::ComponentPortDescription,
-                    0);
-    ::Components::ComponentPortDescription_var retv = cps;
-
-    ::Components::FacetDescriptions_var facets_desc =
-      this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ReceptacleDescriptions_var receptacle_desc =
-      this->get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ConsumerDescriptions_var consumer_desc =
-      this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::EmitterDescriptions_var emitter_desc =
-      this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::PublisherDescriptions_var publisher_desc =
-      this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    retv->facets (facets_desc.in ());
-    retv->receptacles (receptacle_desc.in ());
-    retv->consumers (consumer_desc.in ());
-    retv->emitters (emitter_desc.in ());
-    retv->publishers (publisher_desc.in ());
-
-    return retv._retn ();
-  }
-
-  CORBA::Object_ptr
-  Servant_Impl_Base::provide_facet (
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    if (name == 0)
-      {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          CORBA::Object::_nil ());
-      }
-
-    CORBA::Object_ptr retval = this->lookup_facet (name);
-
-    if (CORBA::is_nil (retval))
-      {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          CORBA::Object::_nil ());
-      }
-      
-    return retval;
-  }
-
-  Components::FacetDescriptions *
-  Servant_Impl_Base::get_named_facets (
-      const ::Components::NameList & names
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    Components::FacetDescriptions *retval = 0;
-    ACE_NEW_RETURN (retval,
-                    ::Components::FacetDescriptions,
-                    0);
-    Components::FacetDescriptions_var safe_retval = retval;
-    CORBA::ULong len = names.length ();
-    safe_retval->length (len);
-    ::Components::FacetDescription *tmp = 0;
-    
-    for (CORBA::ULong i = 0; i < len; ++i)
-      {
-        tmp = this->lookup_facet_description (names[i].in ());
-        
-        if (tmp == 0)
-          {
-            ACE_THROW_RETURN (Components::InvalidName (),
-                              0);
-          }
-          
-        safe_retval[i] = tmp;
-      }
-    
-    return safe_retval._retn ();
-  }
-
-  ::Components::FacetDescriptions *
-  Servant_Impl_Base::get_all_facets (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::FacetDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::FacetDescriptions,
-                    0);
-
-    ::Components::FacetDescriptions_var retval = tmp;
-
-    retval->length (this->facet_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (FacetTable::iterator iter = this->facet_table_.begin ();
-         iter != this->facet_table_.end ();
-         ++iter, ++i)
-      {
-        FacetTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
-
-  ::Components::ConsumerDescriptions *
-  Servant_Impl_Base::get_all_consumers (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::ConsumerDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::ConsumerDescriptions,
-                    0);
-
-    ::Components::ConsumerDescriptions_var retval = tmp;
-
-    retval->length (this->consumer_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
-         iter != this->consumer_table_.end ();
-         ++iter, ++i)
-      {
-        ConsumerTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
-  
-  ::Components::EventConsumerBase_ptr
-  Servant_Impl_Base::get_consumer (
-      const char *sink_name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    if (sink_name == 0)
-      {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          Components::EventConsumerBase::_nil ());
-      }
-
-    Components::EventConsumerBase_ptr retval =
-      this->lookup_consumer (sink_name);
-
-    if (CORBA::is_nil (retval))
-      {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          Components::EventConsumerBase::_nil ());
-      }
-      
-    return retval;
-  }
-
-  ::Components::EventConsumerBase_ptr
-  Servant_Impl_Base::disconnect_consumer (
-      const char * /* source_name */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName,
-                     Components::NoConnection))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::ConsumerDescriptions *
-  Servant_Impl_Base::get_named_consumers (
-      const ::Components::NameList & names
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    Components::ConsumerDescriptions *retval = 0;
-    ACE_NEW_RETURN (retval,
-                    ::Components::ConsumerDescriptions,
-                    0);
-    Components::ConsumerDescriptions_var safe_retval = retval;
-    CORBA::ULong len = names.length ();
-    safe_retval->length (len);
-    ::Components::ConsumerDescription *tmp = 0;
-    
-    for (CORBA::ULong i = 0; i < len; ++i)
-      {
-        tmp = this->lookup_consumer_description (names[i].in ());
-        
-        if (tmp == 0)
-          {
-            ACE_THROW_RETURN (Components::InvalidName (),
-                              0);
-          }
-          
-        safe_retval[i] = tmp;
-      }
-    
-    return safe_retval._retn ();
-  }
-
-  ::Components::EmitterDescriptions *
-  Servant_Impl_Base::get_all_emitters (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::EmitterDescriptions *
-  Servant_Impl_Base::get_named_emitters (
-      const ::Components::NameList & /* names */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::ReceptacleDescriptions *
-  Servant_Impl_Base::get_all_receptacles (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::ReceptacleDescriptions *
-  Servant_Impl_Base::get_named_receptacles (
-      const ::Components::NameList & /* names */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::PublisherDescriptions *
-  Servant_Impl_Base::get_all_publishers (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::PublisherDescriptions *
-  Servant_Impl_Base::get_named_publishers (
-      const ::Components::NameList & /* names */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  /// Protected operations.
-
   void
   Servant_Impl_Base::add_facet (const char *port_name,
                                 CORBA::Object_ptr port_ref)
@@ -374,32 +31,6 @@ namespace CIAO
         safe._retn ();
       }
   }
-  
-  CORBA::Object_ptr
-  Servant_Impl_Base::lookup_facet (const char *port_name)
-  {
-    ::Components::FacetDescription_var fd;
-    
-    if (this->facet_table_.find (port_name, fd) != 0)
-      {
-        return CORBA::Object::_nil ();
-      }
-      
-    return CORBA::Object::_duplicate (fd.in ()->facet_ref ());
-  }
-  
-  ::Components::FacetDescription *
-  Servant_Impl_Base::lookup_facet_description (const char *port_name)
-  {
-    ::Components::FacetDescription_var fd;
-    
-    if (this->facet_table_.find (port_name, fd) != 0)
-      {
-        return 0;
-      }
-      
-    return fd._retn ();
-  }
 
   void
   Servant_Impl_Base::add_consumer (
@@ -421,60 +52,4 @@ namespace CIAO
         safe._retn ();
       }
   }
-
-  ::Components::EventConsumerBase_ptr
-  Servant_Impl_Base::lookup_consumer (const char *port_name)
-  {
-    ::Components::ConsumerDescription_var cd;
-    
-    if (this->consumer_table_.find (port_name, cd) != 0)
-      {
-        return ::Components::EventConsumerBase::_nil ();
-      }
-      
-    return
-      ::Components::EventConsumerBase::_duplicate (cd.in ()->consumer ());
-  }
-
-  ::Components::ConsumerDescription *
-  Servant_Impl_Base::lookup_consumer_description (
-      const char *port_name
-    )
-  {
-    ::Components::ConsumerDescription_var cd;
-    
-    if (this->consumer_table_.find (port_name, cd) != 0)
-      {
-        return 0;
-      }
-      
-    return cd._retn ();
-  }
-
-  Components::StandardConfigurator*
-  Servant_Impl_Base::get_standard_configurator (
-    ACE_ENV_SINGLE_ARG_DECL)
-  {
-    // Create the configurator servant.
-    StandardConfigurator_Impl *config_impl = 0;
-
-    ACE_NEW_THROW_EX (config_impl,
-                      StandardConfigurator_Impl (this),
-                      CORBA::NO_MEMORY ());
-
-
-    Components::StandardConfigurator_var configurator =
-      config_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::StandardConfigurator::_nil ());
-
-    return configurator._retn ();
-  }
-
-  PortableServer::POA_ptr
-  Servant_Impl_Base::_default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  {
-    return
-      PortableServer::POA::_duplicate (container_->the_POA ());
-  }
 }
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
index 272fa8f3d5a..ea854dbde26 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
@@ -27,7 +27,6 @@
 
 #include "CCM_EventC.h"
 #include "CIAO_Server_Export.h"
-#include "CCM_ComponentS.h"
 
 namespace CIAO
 {
@@ -42,150 +41,19 @@ namespace CIAO
    * Servant_Impl.
    */
   class CIAO_SERVER_Export Servant_Impl_Base
-    : public virtual POA_Components::CCMObject
   {
   public:
     Servant_Impl_Base (Session_Container * c);
 
     virtual ~Servant_Impl_Base (void);
 
-    /// Operations for CCMObject interface.
-
-    virtual ::Components::PrimaryKeyBase *
-    get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::NoKeyAvailable));
-
-    virtual CORBA::IRObject_ptr
-    get_component_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void
-    configuration_complete (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidConfiguration));
-
-    virtual void
-    remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
-
-    virtual ::Components::ConnectionDescriptions *
-    get_connections (const char *name
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::ComponentPortDescription *
-    get_all_ports (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Object_ptr
-    provide_facet (const char *name
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-                       
-    virtual ::Components::FacetDescriptions *
-    get_named_facets (const ::Components::NameList & names
-                        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::FacetDescriptions *
-    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual ::Components::ConsumerDescriptions *
-    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-      
-    virtual ::Components::EventConsumerBase_ptr
-    get_consumer (const char *sink_name
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::EventConsumerBase_ptr
-    disconnect_consumer (const char *source_name
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName,
-                       Components::NoConnection));
-
-    virtual ::Components::ConsumerDescriptions *
-    get_named_consumers (const ::Components::NameList & names
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::EmitterDescriptions *
-    get_all_emitters (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::EmitterDescriptions *
-    get_named_emitters (const ::Components::NameList & /* names */
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::ReceptacleDescriptions *
-    get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::ReceptacleDescriptions *
-    get_named_receptacles (const ::Components::NameList & /* names */
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::PublisherDescriptions *
-    get_all_publishers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::PublisherDescriptions *
-    get_named_publishers (const ::Components::NameList & names
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    /// Operation to set attributes on the component.
-    virtual void set_attributes (const Components::ConfigValues &descr
-                                 ACE_ENV_ARG_DECL) = 0;
-
-    // Creates and returns the StandardConfigurator for the component.
-    virtual Components::StandardConfigurator *get_standard_configurator (
-        ACE_ENV_SINGLE_ARG_DECL
-      );
-
-    /// Override that returns the (passed-in) default POA of our member
-    /// component's container, to ensure that we get registered
-    /// to that POA when _this() is called.
-    virtual PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL
-      );
-
   protected:
     void add_facet (const char *port_name,
                     CORBA::Object_ptr port_ref);
 
-    CORBA::Object_ptr lookup_facet (const char *port_name);
-    
-    ::Components::FacetDescription *lookup_facet_description (
-        const char *port_name
-      );
-
     void add_consumer (const char *port_name,
                        ::Components::EventConsumerBase_ptr port_ref);
-                       
-    ::Components::EventConsumerBase_ptr lookup_consumer (
-        const char *port_name
-      );
-      
-    ::Components::ConsumerDescription *lookup_consumer_description (
-        const char *port_name
-      );
-                       
+
   protected:
     typedef ACE_Hash_Map_Manager_Ex<const char *,
                                     ::Components::FacetDescription_var,
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
index 4e39010461f..443aab29064 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
@@ -26,200 +26,68 @@ namespace CIAO
             typename CONTEXT>
   Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::~Servant_Impl (void)
   {
-    ACE_TRY_NEW_ENV
-    {
-      ::Components::SessionComponent_var scom =
-        ::Components::SessionComponent::_narrow (
-            this->executor_.in ()
-            ACE_ENV_ARG_PARAMETER
-          );
-      ACE_TRY_CHECK;
-
-      if (! ::CORBA::is_nil (scom.in ()))
-        {
-          scom->ccm_remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-        }
-    }
-    ACE_CATCHANY
-    {
-    }
-    ACE_ENDTRY;
-
-    this->context_->_remove_ref ();
-  }
-
-  // Operations for CCMObject interface.
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  CORBA::Boolean
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::same_component (
-      CORBA::Object_ptr object_ref
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    if (::CORBA::is_nil (object_ref))
-      {
-        ACE_THROW_RETURN (::CORBA::BAD_PARAM (), 0);
-      }
-
-    ::CORBA::Object_var the_other =
-      object_ref->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::CORBA::Object_var me =
-      this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    return me->_is_equivalent (the_other.in ()
-                               ACE_ENV_ARG_PARAMETER);
   }
 
   template <typename BASE_SKEL,
             typename EXEC,
             typename EXEC_VAR,
             typename CONTEXT>
-  ::Components::CCMHome_ptr
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_ccm_home (
-      ACE_ENV_SINGLE_ARG_DECL
+  ::Components::FacetDescriptions *
+  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_facets (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return this->context_->get_CCM_home (ACE_ENV_SINGLE_ARG_PARAMETER);
-  }
+    ::Components::FacetDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::FacetDescriptions,
+                    0);
 
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  CORBA::Object_ptr
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::_get_component (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::SessionContext_var sc =
-      ::Components::SessionContext::_narrow (
-          this->context_
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK_RETURN (::CORBA::Object::_nil ());
+    ::Components::FacetDescriptions_var retval = tmp;
 
-    if (! ::CORBA::is_nil (sc.in ()))
-      {
-        return sc->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
+    retval->length (this->facet_table_.current_size ());
+    CORBA::ULong i = 0;
 
-    ::Components::EntityContext_var ec =
-      ::Components::EntityContext::_narrow (
-          this->context_
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK_RETURN (::CORBA::Object::_nil ());
-
-    if (! ::CORBA::is_nil (ec.in ()))
+    for (FacetTable::iterator iter = this->facet_table_.begin ();
+         iter != this->facet_table_.end ();
+         ++iter, ++i)
       {
-        return ec->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+        FacetTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
       }
 
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      ::CORBA::Object::_nil ());
+    return retval._retn ();
   }
 
-  // CIAO-specific operations.
-
   template <typename BASE_SKEL,
             typename EXEC,
             typename EXEC_VAR,
             typename CONTEXT>
-  void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL
+  ::Components::ConsumerDescriptions *
+  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_consumers (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (
-          this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK;
+    ::Components::ConsumerDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::ConsumerDescriptions,
+                    0);
 
-    if (! ::CORBA::is_nil (temp.in ()))
-      {
-        temp->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
-  }
+    ::Components::ConsumerDescriptions_var retval = tmp;
 
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_activate (
-  ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (
-          this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK;
+    retval->length (this->consumer_table_.current_size ());
+    CORBA::ULong i = 0;
 
-    if (! ::CORBA::is_nil (temp.in ()))
+    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
+         iter != this->consumer_table_.end ();
+         ++iter, ++i)
       {
-        temp->ccm_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ConsumerTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
       }
-  }
 
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (
-          this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK;
-
-    if (! ::CORBA::is_nil (temp.in ()))
-      {
-        temp->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::_ciao_passivate (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (
-          this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK;
-
-    if (! ::CORBA::is_nil (temp.in ()))
-      {
-        temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
+    return retval._retn ();
   }
 }
 
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h
index 45f223f57b5..af8f19a0eb2 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h
@@ -43,48 +43,21 @@ namespace CIAO
             typename EXEC_VAR, 
             typename CONTEXT>
   class Servant_Impl : public virtual BASE_SKEL,
-                       public virtual Servant_Impl_Base
+                       public Servant_Impl_Base
   {
   public:
-    Servant_Impl (EXEC * exe,
+    Servant_Impl (EXEC * exe, 
                   Session_Container * c);
-                  
     virtual ~Servant_Impl (void);
    
-    // Operations for CCMObject interface.
-
-    virtual CORBA::Boolean
-    same_component (CORBA::Object_ptr object_ref
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::CCMHome_ptr
-    get_ccm_home (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Object_ptr
-    _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-   // CIAO-specific operations.
-
-    void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void
-    ciao_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual ::Components::FacetDescriptions *
+    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  
+    virtual ::Components::ConsumerDescriptions *
+    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// @@NOTE: The busted operation.
-    void
-    _ciao_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
+      
   protected: 
     EXEC_VAR executor_;    
     
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
index 6b117839019..a00a939f113 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
@@ -1,204 +1,17 @@
 // $Id$
-#ifndef HANDLER_TEST_CPP
-#define HANDLER_TEST_CPP
 
 #include "Handler_Test.h"
 
-#include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "ace/Auto_Ptr.h"
-#include "tao/Exception.h"
-#include "Config_Handlers/XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include "Config_Handlers/Config_Handler_export.h"
-#include "Config_Handlers/DnC_Dump.h"
-#include "Config_Handlers/Config_Error_Handler.h"
+#ifdef ACE_HAS_BROKEN_NESTED_TEMPLATES
 
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMAttr;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMNodeList;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-void
-usage (const ACE_TCHAR* program)
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("Usage: %s -u <URI>\n")
-              ACE_TEXT (" <URI>: URI identifying the resource\n"),
-              program));
-}
-
-template <typename HANDLER, typename DATA>
-int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&))
-{
-  ACE_TCHAR* url = 0;
-
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("u:"));
-  int c;
-
-  while ((c = get_opt ()) != EOF)
-    {
-      switch (c)
-        {
-          case 'u':
-            url = get_opt.opt_arg();
-            break;
-          default:
-            usage(argv[0]);
-            return -1;
-        }
-    }
-
-  if (url == 0) {
-    usage (argv[0]);
-    return -1;
-  }
-
-  // Initialize the ORB so that CORBA::Any will work
-  //
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
-
-  // Initialize the Xerces run-time
-  try
-    {
-      xercesc::XMLPlatformUtils::Initialize();
-    }
-
-  catch (const XMLException& e)
-    {
-      char* message = XMLString::transcode (e.getMessage());
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-      ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
-      return 1;
-    }
-
-  try
-    {
-
-      // Instantiate the DOM parser.
-      static const XMLCh gLS[] = { xercesc::chLatin_L,
-                                   xercesc::chLatin_S,
-                                   xercesc::chNull };
-
-      // Get an implementation of the Load-Store (LS) interface
-      DOMImplementation* impl
-        = DOMImplementationRegistry::getDOMImplementation(gLS);
-
-      auto_ptr<DOMImplementation> cleanup_impl (impl);
-
-      // Create a DOMBuilder
-      DOMBuilder* parser =
-        ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
-
-      auto_ptr<DOMBuilder> cleanup_builder (parser);
-
-      // Discard comment nodes in the document
-      parser->setFeature (XMLUni::fgDOMComments, false);
-
-      // Disable datatype normalization. The XML 1.0 attribute value
-      // normalization always occurs though.
-      parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
-
-      // Do not create EntityReference nodes in the DOM tree. No
-      // EntityReference nodes will be created, only the nodes
-      // corresponding to their fully expanded sustitution text will be
-      // created.
-      parser->setFeature (XMLUni::fgDOMEntities, false);
-
-      // Perform Namespace processing.
-      parser->setFeature (XMLUni::fgDOMNamespaces, true);
-
-      // Perform Validation
-      parser->setFeature (XMLUni::fgDOMValidation, true);
-
-      // Do not include ignorable whitespace in the DOM tree.
-      parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
-
-      // Enable the parser schema support.
-      parser->setFeature (XMLUni::fgXercesSchema, true);
-
-      // Enable full schema constraint checking, including checking which
-      // may be time-consuming or memory intensive. Currently, particle
-      // unique attribution constraint checking and particle derivation
-      // restriction checking are controlled by this option.
-      parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
-
-      // The parser will treat validation error as fatal and will exit.
-      parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
-
-      CIAO::Config_Handler::Config_Error_Handler handler;
-      parser->setErrorHandler(&handler);
-
-      DOMDocument* doc = parser->parseURI(url);
-      auto_ptr<DOMDocument> cleanup_doc (doc);
-
-      if (handler.getErrors())
-        {
-          return 1;
-        }
-      HANDLER obj (doc, DOMNodeFilter::SHOW_ELEMENT |
-                        DOMNodeFilter::SHOW_TEXT);
-
-      DATA data;
-      (obj.*func)(data);
-      Deployment::DnC_Dump::dump (data);
-      //domain_handler.dump(domain);
-
-      // parser->release ();
-    }
-  catch (const DOMException& e)
-    {
-      const unsigned int maxChars = 2047;
-      XMLCh errText[maxChars + 1];
-
-      ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \n", url));
-      ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code));
-      if (DOMImplementation::loadDOMExceptionMsg(e.code, errText, maxChars))
-        {
-          char* message = XMLString::transcode (errText);
-          ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-          ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
-        }
-      return 1;
-    }
-  catch (const XMLException& e)
-    {
-      char* message = XMLString::transcode (e.getMessage());
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-      ACE_ERROR ((LM_ERROR, "\nException occured: %s\n ", message));
-      return 1;
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
-      return 1;
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
-      return 1;
-    }
-
-  xercesc::XMLPlatformUtils::Terminate();
-  return 0;
+              ACE_TEXT ("DaNCe internal testing doesn't work with compilers ")
+              ACE_TEXT ("not supporting nested templates (like VC6).\n")));
+  return -1;
 }
 
+#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
 
-#endif /*HANDLER_TEST_CPP*/
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
index b51a6e4c00b..a5598e8a55c 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
@@ -6,6 +6,8 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
 
+#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
+
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 #include "tao/Exception.h"
@@ -40,13 +42,9 @@ using xercesc::DOMNodeFilter;
 template <typename HANDLER, typename DATA>
 int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&));
 
+#include "Handler_Test.i"
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Handler_Test.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Handler_Test.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
 
 #endif // HANDLER_TEST_H
+
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i
index cfa1da318d3..eb6041b83d0 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i
@@ -1 +1,197 @@
 // $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_main.h"
+#include "ace/Auto_Ptr.h"
+#include "tao/Exception.h"
+#include "Config_Handlers/XercesString.h"
+#include <xercesc/util/XMLUniDefs.hpp>
+#include "Config_Handlers/Config_Handler_export.h"
+#include "Config_Handlers/DnC_Dump.h"
+#include "Config_Handlers/Config_Error_Handler.h"
+
+using Config_Handler::XStr;
+using xercesc::XMLUni;
+using xercesc::XMLString;
+using xercesc::XMLException;
+using xercesc::DOMException;
+using xercesc::DOMBuilder;
+using xercesc::DOMImplementationRegistry;
+using xercesc::DOMImplementationLS;
+using xercesc::DOMImplementation;
+using xercesc::DOMAttr;
+using xercesc::DOMNamedNodeMap;
+using xercesc::DOMLocator;
+using xercesc::DOMError;
+using xercesc::DOMNodeList;
+using xercesc::DOMDocument;
+using xercesc::DOMDocumentTraversal;
+using xercesc::DOMNodeIterator;
+using xercesc::DOMNode;
+using xercesc::DOMNodeFilter;
+
+inline void
+usage (const ACE_TCHAR* program)
+{
+  ACE_ERROR ((LM_ERROR,
+              ACE_TEXT ("Usage: %s -u <URI>\n")
+              ACE_TEXT (" <URI>: URI identifying the resource\n"),
+              program));
+}
+
+template <typename HANDLER, typename DATA>
+int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&))
+{
+  ACE_TCHAR* url = 0;
+
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("u:"));
+  int c;
+
+  while ((c = get_opt ()) != EOF)
+    {
+      switch (c)
+        {
+          case 'u':
+            url = get_opt.opt_arg();
+            break;
+          default:
+            usage(argv[0]);
+            return -1;
+        }
+    }
+
+  if (url == 0) {
+    usage(argv[0]);
+    return -1;
+  }
+
+  // Initialize the ORB so that CORBA::Any will work
+  //
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+
+  // Initialize the Xerces run-time
+  try
+    {
+      xercesc::XMLPlatformUtils::Initialize();
+    }
+
+  catch (const XMLException& e)
+    {
+      char* message = XMLString::transcode (e.getMessage());
+      ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+      ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
+      return 1;
+    }
+
+  try
+    {
+
+      // Instantiate the DOM parser.
+      static const XMLCh gLS[] = { xercesc::chLatin_L,
+                                   xercesc::chLatin_S,
+                                   xercesc::chNull };
+
+      // Get an implementation of the Load-Store (LS) interface
+      DOMImplementation* impl
+        = DOMImplementationRegistry::getDOMImplementation(gLS);
+
+      auto_ptr<DOMImplementation> cleanup_impl (impl);
+
+      // Create a DOMBuilder
+      DOMBuilder* parser =
+        ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+
+      auto_ptr<DOMBuilder> cleanup_builder (parser);
+
+      // Discard comment nodes in the document
+      parser->setFeature (XMLUni::fgDOMComments, false);
+
+      // Disable datatype normalization. The XML 1.0 attribute value
+      // normalization always occurs though.
+      parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
+
+      // Do not create EntityReference nodes in the DOM tree. No
+      // EntityReference nodes will be created, only the nodes
+      // corresponding to their fully expanded sustitution text will be
+      // created.
+      parser->setFeature (XMLUni::fgDOMEntities, false);
+
+      // Perform Namespace processing.
+      parser->setFeature (XMLUni::fgDOMNamespaces, true);
+
+      // Perform Validation
+      parser->setFeature (XMLUni::fgDOMValidation, true);
+
+      // Do not include ignorable whitespace in the DOM tree.
+      parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
+
+      // Enable the parser schema support.
+      parser->setFeature (XMLUni::fgXercesSchema, true);
+
+      // Enable full schema constraint checking, including checking which
+      // may be time-consuming or memory intensive. Currently, particle
+      // unique attribution constraint checking and particle derivation
+      // restriction checking are controlled by this option.
+      parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
+
+      // The parser will treat validation error as fatal and will exit.
+      parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
+
+      CIAO::Config_Handler::Config_Error_Handler handler;
+      parser->setErrorHandler(&handler);
+
+      DOMDocument* doc = parser->parseURI(url);
+      auto_ptr<DOMDocument> cleanup_doc (doc);
+
+      if (handler.getErrors())
+        {
+          return 1;
+        }
+      HANDLER obj (doc, DOMNodeFilter::SHOW_ELEMENT |
+                        DOMNodeFilter::SHOW_TEXT);
+
+      DATA data;
+      (obj.*func)(data);
+      Deployment::DnC_Dump::dump (data);
+      //domain_handler.dump(domain);
+
+      // parser->release ();
+    }
+  catch (const DOMException& e)
+    {
+      const unsigned int maxChars = 2047;
+      XMLCh errText[maxChars + 1];
+
+      ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \n", url));
+      ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code));
+      if (DOMImplementation::loadDOMExceptionMsg(e.code, errText, maxChars))
+        {
+          char* message = XMLString::transcode (errText);
+          ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+          ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
+        }
+      return 1;
+    }
+  catch (const XMLException& e)
+    {
+      char* message = XMLString::transcode (e.getMessage());
+      ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+      ACE_ERROR ((LM_ERROR, "\nException occured: %s\n ", message));
+      return 1;
+    }
+  catch (CORBA::Exception& ex)
+    {
+      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+      return 1;
+    }
+  catch (...)
+    {
+      ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
+      return 1;
+    }
+
+  xercesc::XMLPlatformUtils::Terminate();
+  return 0;
+}
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
index 07bec27c7a4..fae3de02b21 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
@@ -1,16 +1,15 @@
 //$Id$
 
-project : taoexe, ciao_server_dnc, ciao_deployment_stub  { 
+project : taoexe, ciao_client_dnc, ciao_deployment_stub  {   // , portableserver, typecodefactory {
   dynamicflags   = CONFIG_HANDLER_BUILD_DLL
   macros   += XML_USE_PTHREADS
   requires += exceptions
-  includes += $(XERCESCROOT)/include $(ACE_ROOT)/TAO/CIAO/DAnCE
-  libpaths += $(XERCESCROOT)/lib  
+  includes += $(XERCESCROOT)/include /usr/include $(ACE_ROOT)/TAO/CIAO/DAnCE
+  libpaths += $(XERCESCROOT)/lib /usr/lib // $(ACE_ROOT)/lib 
   libs     += xerces-c Config_Handlers // Deployment_stub Deployment_svnt
-//   libs     += CIAO_DnC_Server CIAO_DnC_Container 
   after    += Config_Handlers
 
-  Template_Files {
+  Source_Files {
     Handler_Test.cpp
   }
 }
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
index d9048326040..23507cdc58c 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
@@ -17,7 +17,6 @@ project(NodeAppTest_RoundTrip_stub): ciao_client_dnc {
 
 project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc {
   after += NodeAppTest_RoundTrip_stub
-  requires += cidl
   sharedname  = NodeAppTest_RoundTrip_svnt
 
   libs    += NodeAppTest_RoundTrip_stub
@@ -55,10 +54,10 @@ project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc {
   }
 }
 
-project (NodeAppTest_client_simple) : ciao_server_dnc, ciao_deployment_svnt {
+project (NodeAppTest_client_simple) : ciao_server_dnc, ciao_deployment_stub {
  after += NodeAppTest_RoundTrip_exec
 
- libs += NodeAppTest_RoundTrip_stub 
+ libs += NodeAppTest_RoundTrip_stub
  exename += client_simple
 
  IDL_Files {
@@ -69,7 +68,7 @@ project (NodeAppTest_client_simple) : ciao_server_dnc, ciao_deployment_svnt {
  }
 }
 
-project (NodeAppTest_client) : ciao_server_dnc, ciao_deployment_svnt {
+project (NodeAppTest_client) : ciao_server_dnc, ciao_deployment_stub {
  after += NodeAppTest_RoundTrip_exec
  libs += NodeAppTest_RoundTrip_stub
  exename += client
@@ -83,9 +82,9 @@ project (NodeAppTest_client) : ciao_server_dnc, ciao_deployment_svnt {
  }
 }
 
-project (NodeAppTest_client_ex) : ciao_server_dnc, ciao_deployment_svnt {
+project (NodeAppTest_client_ex) : ciao_server_dnc, ciao_deployment_stub {
  after += NodeAppTest_RoundTrip_exec
- libs += NodeAppTest_RoundTrip_stub 
+ libs += NodeAppTest_RoundTrip_stub
  exename += client_ex
 
  IDL_Files {
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp
index 4563835a2a0..48c585202d9 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp
@@ -119,8 +119,7 @@ RoundTrip_Impl::RoundTripHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Implementation for the probided inferface.
 CORBA::Long
-RoundTrip_Impl::LatencyTest_Impl::cube_long (CORBA::Long data
-		                             ACE_ENV_ARG_DECL_NOT_USED)
+RoundTrip_Impl::LatencyTest_Impl::cube_long (CORBA::Long data)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return data*data*data;
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
index ce25a707580..132d52a2e30 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
@@ -109,8 +109,7 @@ namespace RoundTrip_Impl
     {
     }
 
-    virtual CORBA::Long cube_long (CORBA::Long data 
-		    	           ACE_ENV_ARG_DECL)
+    virtual CORBA::Long cube_long (CORBA::Long data)
         ACE_THROW_SPEC ((CORBA::SystemException));
   };
 
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl
index dc8afc09a22..66bd2b1120f 100755
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl
@@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) {
 unlink $iorfile;
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication",
+$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication",
                             "-n -o $iorfile");
 
 $CL = new PerlACE::Process ("client",
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl
index ccb27eab392..1840175abde 100755
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl
@@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) {
 unlink $iorfile;
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication",
+$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication",
                             "-n -o $iorfile");
 
 $CL = new PerlACE::Process ("client_ex",
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl
index 0d0253e2b5d..26b7edf2c14 100755
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl
@@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) {
 unlink $iorfile;
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication",
+$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication",
                             "-n -o $iorfile");
 
 $CL = new PerlACE::Process ("client_simple",
diff --git a/TAO/CIAO/NEWS b/TAO/CIAO/NEWS
index f9bb415d491..3350ed8090f 100644
--- a/TAO/CIAO/NEWS
+++ b/TAO/CIAO/NEWS
@@ -4,9 +4,6 @@ PLANNED MAJOR CHANGES TARGETED FOR TAO-1.4.3
 - (DOC-ISIS) Changes to DAnCE
 
 - (Jeff/Boris) CIDL compiler generates dummy implementation code
-  . This item added 08/05/04. See CIAO ChangeLog:
-  
-    Thu Aug  5 17:42:56 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 
 USER VISIBLE CHANGES BETWEEN CIAO-0.4.1 and CIAO-0.4.2
diff --git a/TAO/CIAO/PROBLEM-REPORT-FORM b/TAO/CIAO/PROBLEM-REPORT-FORM
index 5cda35bc57e..4933c6e92ce 100644
--- a/TAO/CIAO/PROBLEM-REPORT-FORM
+++ b/TAO/CIAO/PROBLEM-REPORT-FORM
@@ -1,9 +1,7 @@
-[Please use the PRF form below to submit bug reports, problem
+[Please use the form below to submit bug reports, problem
  reports, etc., to the CIAO developers and interested users.
- Send to ciao-users@cs.wustl.edu.  If you are using OCI or PrismTech's
- versions of CIAO do not send bugs to this mailing list, but
- instead contact those companies for support.  Please also send your
- PRF as plain ASCII text, _not_ uuencoded or as an attachment.
+ Send to ciao-users@cs.wustl.edu.  Please send it as plain
+ ASCII text, _not_ uuencoded or as an attachment.
 
  We prefer that all bug reports be submitted through our bug tracking
  system.  See $ACE_ROOT/docs/usage-bugzilla.html for more information
@@ -15,14 +13,11 @@
  browse bugzilla and the ChangeLog files to find out if your problem
  has been solved in a more recent version of CIAO.
 
- To ensure that you see responses, please do one of the following:
+ To ensure that you see responses, please try to subscribe to the
+ ciao-users mail list, by sending email with contents "subscribe
+ ciao-users" to majordomo@cs.wustl.edu. 
 
-    1) Subscribe to the ciao-users mail list, by sending email with
-       contents "subscribe ciao-users" to majordomo@cs.wustl.edu.
-
-    2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
-
- Replace/remove all the explanatory text in brackets before mailing.
+  Replace/remove all the explanatory text in brackets before mailing.
 
  Please send this form as ASCII text only.  Do _not_ send it as an
  attachment, or as tar'ed, compressed and/or uuencoded text.  And
@@ -32,12 +27,6 @@
  Subjects like "CIAO bug" or "bug report" are not helpful!
  Also, do _not_ include the word "help" in the Subject!]
 
- When including your config.h and platform_macros.GNU files as requested
- below, only include the contents if you use the recommended method of
- including the platform-specific file in your file. If you use a link
- to the platform-specific file, simply state which one - DO NOT include
- an entire platform-specific configuration file in the form.
-
 8<----------8<----------8<----------8<----------8<----------8<----------8<----
 
 To: ciao-users@cs.wustl.edu
@@ -54,15 +43,6 @@ Subject: [area]: [synopsis]
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
     COMPILER NAME AND VERSION (AND PATCHLEVEL):
 
-    CONTENTS OF $ACE_ROOT/ace/config.h [if you use a link to a platform-
-    specific file, simply state which one]:
-
-    CONTENTS OF $ACE_ROOT/include/makeinclude/platform_macros.GNU (unless
-    this isn't used in this case, e.g., with Microsoft Visual C++):
-
-    CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-    (used by MPC when you generate your own makefiles):
-
     AREA/CLASS/EXAMPLE AFFECTED:
 [What example failed?  What module failed to compile?]
 
diff --git a/TAO/CIAO/ciao/CCM_Container.idl b/TAO/CIAO/ciao/CCM_Container.idl
index 220a09ea261..0b7d23562fc 100644
--- a/TAO/CIAO/ciao/CCM_Container.idl
+++ b/TAO/CIAO/ciao/CCM_Container.idl
@@ -17,7 +17,7 @@
 #define CCM_CONTAINER_IDL
 
 #include "CCM_Component.idl"
-#include "orbsvcs/SecurityLevel2.idl"
+#include "orbsvcs/orbsvcs/SecurityLevel2.idl"
 #include "CCM_Transaction.idl"
 
 // *************** Basic Container interfaces ***************
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index afb0a3458dc..c3bd8d917af 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -30,12 +30,11 @@ project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 }
 
-project (CIAO_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client {
+project (CIAO_Container) : orbsvcslib, portableserver, security, iorinterceptor, objreftemplate, valuetype, ifr_client {
   after += CIAO_Client
   sharedname  = CIAO_Container
   libs       += CIAO_Client
-  idlflags   += -Sc -Wb,export_include=CIAO_Container_Export.h 
-  idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
+  idlflags  += -Sc -Wb,export_include=CIAO_Container_Export.h -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
   IDL_Files {
@@ -60,9 +59,8 @@ project (CIAO_Container) : orbsvcslib, portableserver, security, valuetype, ifr_
   }
 }
 
-project (CIAO_Server) : orbsvcslib, portableserver, valuetype, ifr_client, security, utils {
+project (CIAO_Server) : orbsvcslib, portableserver, iorinterceptor, objreftemplate, valuetype, ifr_client, security {
   after += CIAO_Container
-  includes += $(CIAO_ROOT)
   sharedname  = CIAO_Server
   libs       +=  CIAO_Client CIAO_Container
   idlflags  += -Sc -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
@@ -72,6 +70,7 @@ project (CIAO_Server) : orbsvcslib, portableserver, valuetype, ifr_client, secur
   IDL_Files {
     CCM_Deployment.idl
     CIAO_Servers.idl
+//    HomeRegistrar.idl
   }
 
   Source_Files {
@@ -79,18 +78,16 @@ project (CIAO_Server) : orbsvcslib, portableserver, valuetype, ifr_client, secur
     CCM_DeploymentS.cpp
     CIAO_ServersC.cpp
     CIAO_ServersS.cpp
+//    HomeRegistrarC.cpp
+//    HomeRegistrarS.cpp
     ComponentInstallation_Impl.cpp
     ComponentServer_Impl.cpp
     Container_Base.cpp
     Container_Impl.cpp
-    Context_Impl_Base.cpp
-    Home_Servant_Impl_Base.cpp
+//    HomeRegistrar_i.cpp
     Servant_Impl_Base.cpp
-    Servant_Activator.cpp
-    Port_Activator.cpp
     Server_init.cpp
     ServerActivator_Impl.cpp
-    StandardConfigurator_Impl.cpp
   }
 
   Header_Files {
@@ -99,10 +96,7 @@ project (CIAO_Server) : orbsvcslib, portableserver, valuetype, ifr_client, secur
   }
   
   Template_Files {
-    Context_Impl_T.cpp
-    Home_Servant_Impl_T.cpp
     Object_Set_T.cpp
     Servant_Impl_T.cpp
-    Servant_Activator_T.cpp
   }
 }
diff --git a/TAO/CIAO/ciao/ComponentsC.h b/TAO/CIAO/ciao/ComponentsC.h
index 4ef065c4e8d..32e5a755e83 100644
--- a/TAO/CIAO/ciao/ComponentsC.h
+++ b/TAO/CIAO/ciao/ComponentsC.h
@@ -72,7 +72,7 @@
 // Traits specializations.
 namespace TAO
 {
-}
+};
 
 // TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp
index 8a0d48b8810..0d575b25f0a 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -2,429 +2,284 @@
 
 #include "Container_Base.h"
 #include "ace/DLL.h"
-#include "tao/Utils/PolicyList_Destroyer.h"
 #include "ace/OS_NS_stdio.h"
-#include "Servant_Activator.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Container_Base.inl"
 #endif /* __ACE_INLINE__ */
 
-namespace CIAO
+////////////////////////////////////////////////////////////////
+
+CIAO::Container::Container (CORBA::ORB_ptr o)
+  : orb_ (CORBA::ORB::_duplicate (o))
 {
+}
 
-////////////////////////////////////////////////////////////////
-  Container::Container (CORBA::ORB_ptr o)
-    : orb_ (CORBA::ORB::_duplicate (o))
-  {
-  }
-
-  Container::~Container ()
-  {
-  }
-
-  PortableServer::POA_ptr
-  Container::the_POA (void) const
-  {
-    return this->component_poa_.in ();
-  }
-
-  CORBA::ORB_ptr
-  Container::the_ORB (void) const
-  {
-    return this->orb_.in ();
-  }
-
-  ///////////////////////////////////////////////////////////////
-
-  ACE_Atomic_Op <ACE_SYNCH_MUTEX, long>
-  Session_Container::serial_number_ (0);
-
-  Session_Container::Session_Container (CORBA::ORB_ptr o,
-                                        bool static_config_flag,
-                                        const Static_Config_EntryPoints_Maps* maps)
+CIAO::Container::~Container ()
+{
+}
+
+PortableServer::POA_ptr
+CIAO::Container::_ciao_the_POA (void)
+{
+  return this->poa_.in ();
+}
+
+CORBA::ORB_ptr
+CIAO::Container::_ciao_the_ORB ()
+{
+  return this->orb_.in ();
+}
+
+///////////////////////////////////////////////////////////////
+
+ACE_Atomic_Op <ACE_SYNCH_MUTEX, long>
+CIAO::Session_Container::serial_number_ (0);
+
+CIAO::Session_Container::Session_Container (CORBA::ORB_ptr o,
+                                            int static_config_flag,
+                                            const Static_Config_EntryPoints_Maps* maps
+                                            )
   : Container (o),
     number_ (0),
     static_config_flag_ (static_config_flag),
-    static_entrypts_maps_ (maps),
-    sa_ (0)
-  {
-  }
-
-  Session_Container::~Session_Container ()
-  {
-  }
-
-  int
-  Session_Container::init (const char *name,
-                           const CORBA::PolicyList *more_policies
-                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    char buffer[MAXPATHLEN];
-
-    if (name == 0)
-      {
-        this->number_ = ++Session_Container::serial_number_;
-        ACE_OS::sprintf (buffer, "CIAO::Session_Container-%ld",
-                         this->number_);
-        name = buffer;
-      }
-
-    CORBA::Object_var poa_object =
-      this->orb_->resolve_initial_references("RootPOA"
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    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_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    this->create_component_POA (name,
-                                more_policies,
-                                root_poa.in ()
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    this->create_facet_consumer_POA (root_poa.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    return 0;
-  }
-
-  void
-  Session_Container::create_component_POA (const char *name,
-                                           const CORBA::PolicyList *p,
-                                           PortableServer::POA_ptr root
-                                           ACE_ENV_ARG_DECL)
-  {
-    // Set up proper poa policies here.  Default policies seems to be
-    // fine for session container.  If you add some other default
-    // policies here, then you need to "add" more_policies below
-    // instead of simply assigning more_policies to the init policy
-    // list.
-    CORBA::PolicyList policies (0);
-
-    if (p != 0)
-      policies = *p;
-
-    PortableServer::POAManager_var poa_manager =
-      root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->component_poa_ =
-      root->create_POA (name,
-                        poa_manager.in (),
-                        policies
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  void
-  Session_Container::create_facet_consumer_POA (
-      PortableServer::POA_ptr root
-      ACE_ENV_ARG_DECL)
-  {
-    PortableServer::POAManager_var poa_manager =
-      root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    TAO::Utils::PolicyList_Destroyer policies (3);
-    policies.length (3);
-
-    policies[0] =
-      root->create_id_assignment_policy (PortableServer::USER_ID
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    policies[1] =
-      root->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    // Servant Retention Policy
-    policies[2] =
-      root->create_servant_retention_policy (PortableServer::RETAIN
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->facet_cons_poa_ =
-      root->create_POA ("facet_consumer_poa",
-                        poa_manager.in (),
-                        policies
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    ACE_NEW_THROW_EX (this->sa_,
-                      Servant_Activator (this->orb_.in ()),
-                      CORBA::NO_MEMORY ());
-
-    this->facet_cons_poa_->set_servant_manager (
-        this->sa_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  CORBA::Object_ptr
-  Session_Container::install_servant (PortableServer::Servant p,
-                                      Container::OA_Type t
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      tmp = this->component_poa_.in ();
-    else
-      tmp = this->facet_cons_poa_.in ();
-
-    PortableServer::ObjectId_var oid
-      = tmp->activate_object (p
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    CORBA::Object_var objref
-      = tmp->id_to_reference (oid.in ()
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    return objref._retn ();
-  }
-
-  CORBA::Object_ptr
-  Session_Container::install_component (PortableServer::Servant p,
-                                        PortableServer::ObjectId_out oid
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    PortableServer::ObjectId_var id =
-      this->component_poa_->activate_object (p
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    CORBA::Object_var objref
-      = this->component_poa_->id_to_reference (id.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    oid = id._retn ();
-
-    return objref._retn ();
-  }
-
-
-  //@@ Apparently we need to be cautious when handling the exception
-  //   thrown here. We should make sure that new DnC interfaces
-  //   NodeApplication/NodeApplicationManager etc will cache the new
-  //   exceptions--> rethrow of new exceptions is needed.
-  //                                            --Tao
-  Components::CCMHome_ptr
-  Session_Container::ciao_install_home (const char *exe_dll_name,
-                                        const char *exe_entrypt,
-                                        const char *sv_dll_name,
-                                        const char *sv_entrypt
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::Deployment::UnknownImplId,
-                     Components::Deployment::ImplEntryPointNotFound,
-                     Components::Deployment::InstallationFailure))
-  {
-
-    HomeFactory hcreator = 0;
-    ServantFactory screator = 0;
-
-    if (this->static_config_flag_ == 0)
-      {
-        ACE_DLL executor_dll, servant_dll;
-
-        if (exe_dll_name == 0 || sv_dll_name == 0)
-          ACE_THROW_RETURN (Components::Deployment::UnknownImplId (),
-                            Components::CCMHome::_nil ());
-
-        if (executor_dll.open (exe_dll_name,
-                               ACE_DEFAULT_SHLIB_MODE,
-                               0) != 0
-            || servant_dll.open (sv_dll_name,
-                                 ACE_DEFAULT_SHLIB_MODE,
-                                 0) != 0)
-          {
-            ACE_THROW_RETURN (Components::Deployment::UnknownImplId (),
-                              Components::CCMHome::_nil ());
-          }
-
-        if (exe_entrypt == 0 || sv_entrypt == 0)
-          ACE_THROW_RETURN (Components::Deployment::ImplEntryPointNotFound (),
-                            Components::CCMHome::_nil ());
-
-        // @@ (OO) Please use a static_cast<> here instead of a C-style
-        //         cast.  ANSI C++ casts are the preferred (and modern)
-        //         way of casting in ACE/TAO/CIAO.
-        hcreator = (HomeFactory) executor_dll.symbol (exe_entrypt);
-        screator = (ServantFactory) servant_dll.symbol (sv_entrypt);
-    }
-    else
-      {
-        if (static_entrypts_maps_ == 0 ||
-            static_entrypts_maps_->home_creator_funcptr_map_ == 0 ||
-            static_entrypts_maps_->home_servant_creator_funcptr_map_ == 0)
-          ACE_THROW_RETURN (Components::Deployment::ImplEntryPointNotFound (),
-                            Components::CCMHome::_nil ());
-
-        ACE_CString exe_entrypt_str (exe_entrypt);
-        static_entrypts_maps_->home_creator_funcptr_map_->
-          find (exe_entrypt_str, hcreator);
-
-        ACE_CString sv_entrypt_str (sv_entrypt);
-        static_entrypts_maps_->home_servant_creator_funcptr_map_->
-          find (sv_entrypt_str, screator);
-      }
-
-    if (hcreator == 0 || screator == 0)
-      ACE_THROW_RETURN (Components::Deployment::ImplEntryPointNotFound (),
-                        Components::CCMHome::_nil ());
-
-    Components::HomeExecutorBase_var home_executor = hcreator ();
-    if (CORBA::is_nil (home_executor.in ()))
-      ACE_THROW_RETURN (Components::Deployment::InstallationFailure (),
-                        Components::CCMHome::_nil ());
-
-    PortableServer::Servant home_servant = screator (home_executor.in (),
-                                                     this
-                                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::CCMHome::_nil ());
-
-    if (home_servant == 0)
-      ACE_THROW_RETURN (Components::Deployment::InstallationFailure (),
-                        Components::CCMHome::_nil ());
-
-    PortableServer::ServantBase_var safe (home_servant);
-
-    CORBA::Object_var objref =
-      this->install_servant (home_servant,
-                             Container::Component
-                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::CCMHome::_nil ());
-
-    Components::CCMHome_var homeref =
-      Components::CCMHome::_narrow (objref.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    return homeref._retn ();
-
-  }
-
-  void
-  Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref
+    static_entrypts_maps_ (maps)
+{
+}
+
+CIAO::Session_Container::~Session_Container ()
+{
+}
+
+int
+CIAO::Session_Container::init (const char *name,
+                               const CORBA::PolicyList *more_policies
+                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  char buffer[MAXPATHLEN];
+
+   if (name == 0)
+     {
+       this->number_ = ++CIAO::Session_Container::serial_number_;
+       ACE_OS::sprintf (buffer, "CIAO::Session_Container-%ld",
+                        this->number_);
+       name = buffer;
+     }
+
+   CORBA::Object_var poa_object =
+     this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   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_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   // Set up proper poa policies here.  Default policies seems to be
+   // fine for session container.  If you add some other default
+   // policies here, then you need to "add" more_policies below
+   // instead of simply assigning more_policies to the init policy
+   // list.
+   CORBA::PolicyList policies (0);
+
+   if (more_policies != 0)
+     policies = *more_policies;
+
+   this->poa_ = root_poa->create_POA (name,
+                                      PortableServer::POAManager::_nil (),
+                                      policies
+                                      ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   PortableServer::POAManager_var poa_manager =
+     this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+   ACE_CHECK_RETURN (-1);
+
+   return 0;
+}
+
+CORBA::Object_ptr
+CIAO::Session_Container::install_servant (PortableServer::Servant p
                                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    this->uninstall (homeref,
-                     Container::Component
-                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  void
-  Session_Container::uninstall (CORBA::Object_ptr objref,
-                                Container::OA_Type t
-                                ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      tmp = this->component_poa_.in ();
-    else
-      tmp = this->facet_cons_poa_.in ();
-
-    PortableServer::ObjectId_var oid =
-      tmp->reference_to_id (objref
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    tmp->deactivate_object (oid.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  }
-
-  void
-  Session_Container::uninstall (PortableServer::Servant svt,
-                                Container::OA_Type t
-                                ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      tmp = this->component_poa_.in ();
-    else
-      tmp = this->facet_cons_poa_.in ();
-
-    PortableServer::ObjectId_var oid
-      = tmp->servant_to_id (svt
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var oid
+    = this->poa_->activate_object (p
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::Object_var objref
+    = this->poa_->id_to_reference (oid.in ()
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return objref._retn ();
+}
+
+CORBA::Object_ptr
+CIAO::Session_Container::install_component (PortableServer::Servant p,
+                                            PortableServer::ObjectId_out oid
+                                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var id
+    = this->poa_->activate_object (p
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::Object_var objref
+    = this->poa_->id_to_reference (id.in ()
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  oid = id._retn ();
+
+  return objref._retn ();
+}
+
+Components::CCMHome_ptr
+CIAO::Session_Container::ciao_install_home (const char *exe_dll_name,
+                                            const char *exe_entrypt,
+                                            const char *sv_dll_name,
+                                            const char *sv_entrypt
+                                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::Deployment::UnknownImplId,
+                   Components::Deployment::ImplEntryPointNotFound,
+                   Components::Deployment::InstallationFailure))
+{
+  ACE_DLL executor_dll, servant_dll;
+  HomeFactory hcreator=0;
+  ServantFactory screator=0;
+
+  if (this->static_config_flag_ == 0)
+    {
+      if (exe_dll_name == 0 || sv_dll_name == 0)
+        ACE_THROW_RETURN (Components::Deployment::UnknownImplId (), 0);
+      
+      if (executor_dll.open (exe_dll_name,
+                             ACE_DEFAULT_SHLIB_MODE,
+                             0) != 0)
+        ACE_THROW_RETURN (Components::Deployment::UnknownImplId (), 0);
+      
+      if (servant_dll.open (sv_dll_name,
+                            ACE_DEFAULT_SHLIB_MODE,
+                            0) != 0)
+        {
+          executor_dll.close ();
+          ACE_THROW_RETURN (Components::Deployment::UnknownImplId (), 0);
+        }
+
+      if (exe_entrypt == 0 || sv_entrypt == 0)
+        ACE_THROW_RETURN (Components::Deployment::ImplEntryPointNotFound (), 0);
+      
+      hcreator = (HomeFactory) executor_dll.symbol (exe_entrypt);
+      screator = (ServantFactory) servant_dll.symbol (sv_entrypt);
+    }
+  else
+    {
+      if ( static_entrypts_maps_ == 0 ||
+           static_entrypts_maps_->home_creator_funcptr_map_ == 0 ||
+           static_entrypts_maps_->home_servant_creator_funcptr_map_ == 0)
+        ACE_THROW_RETURN (Components::Deployment::ImplEntryPointNotFound (), 0);
+
+      ACE_CString exe_entrypt_str (exe_entrypt);
+      static_entrypts_maps_->home_creator_funcptr_map_->
+        find (exe_entrypt_str, hcreator);
+
+      ACE_CString sv_entrypt_str (sv_entrypt);
+      static_entrypts_maps_->home_servant_creator_funcptr_map_->
+        find (sv_entrypt_str, screator);
+    }
+
+  if (hcreator == 0 || screator == 0)
+    ACE_THROW_RETURN (Components::Deployment::ImplEntryPointNotFound (), 0);
+
+  Components::HomeExecutorBase_var home_executor = hcreator ();
+  if (CORBA::is_nil (home_executor.in ()))
+    ACE_THROW_RETURN (Components::Deployment::InstallationFailure (), 0);
+
+  PortableServer::Servant home_servant = screator (home_executor.in (),
+                                                   this
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  if (home_servant == 0)
+    ACE_THROW_RETURN (Components::Deployment::InstallationFailure (), 0);
+
+  PortableServer::ServantBase_var safe (home_servant);
+
+  CORBA::Object_var objref = this->install_servant (home_servant
+                                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  Components::CCMHome_var homeref = Components::CCMHome::_narrow (objref.in ()
+                                                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return homeref._retn ();
+
+}
+
+void
+CIAO::Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref
+                                              ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->uninstall (homeref
+                   ACE_ENV_ARG_PARAMETER);
+}
+
+void
+CIAO::Session_Container::uninstall (CORBA::Object_ptr objref
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var oid
+    = this->poa_->reference_to_id (objref
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->poa_->deactivate_object (oid.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+}
+
+void
+CIAO::Session_Container::uninstall (PortableServer::Servant svt
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var oid
+    = this->poa_->servant_to_id (svt
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->poa_->deactivate_object (oid.in ()
                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+}
 
-    tmp->deactivate_object (oid.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  }
+void
+CIAO::Session_Container::uninstall_component (CORBA::Object_ptr objref,
+                                              PortableServer::ObjectId_out oid
+                                              ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ObjectId_var id
+    = this->poa_->reference_to_id (objref
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-  void
-  Session_Container::uninstall_component (Components::CCMObject_ptr objref,
-                                          PortableServer::ObjectId_out oid
-                                          ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-
-    PortableServer::ObjectId_var id =
-      this->component_poa_->reference_to_id (objref
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->component_poa_->deactivate_object (id.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    oid = id._retn ();
-  }
-
-  CORBA::Object_ptr
-  Session_Container::generate_reference (const char *obj_id,
-                                         const char *repo_id,
-                                         Container::OA_Type t
-                                         ACE_ENV_ARG_DECL)
-  {
-    PortableServer::POA_ptr tmp = 0;
-
-    if (t == Container::Component)
-      tmp = this->component_poa_.in ();
-    else
-      tmp = this->facet_cons_poa_.in ();
-
-    PortableServer::ObjectId_var oid =
-      PortableServer::string_to_ObjectId (obj_id);
-
-    CORBA::Object_var objref =
-      tmp->create_reference_with_id (oid.in (),
-                                     repo_id
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-    return objref._retn ();
-  }
+  this->poa_->deactivate_object (id.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
+  oid = id._retn ();
 }
diff --git a/TAO/CIAO/ciao/Container_Base.h b/TAO/CIAO/ciao/Container_Base.h
index 325143f1dad..89f57e360b4 100644
--- a/TAO/CIAO/ciao/Container_Base.h
+++ b/TAO/CIAO/ciao/Container_Base.h
@@ -29,8 +29,6 @@
 
 namespace CIAO
 {
-  class Servant_Activator;
-
   /**
    * @class Container
    *
@@ -42,25 +40,16 @@ namespace CIAO
   class CIAO_SERVER_Export Container
   {
   public:
-    enum OA_Type
-      {
-        Component,
-        Facet_Consumer
-      };
-
     Container (CORBA::ORB_ptr o);
 
     virtual ~Container (void) = 0;
 
-    /// Get component's POA.
-    /**
-     * This operation does *NOT* increase the reference count of the
-     * POA. Look at the const qualifier in the method.
-     */
-    PortableServer::POA_ptr the_POA (void) const;
+    /// Get the containing POA.  This operation does *NOT*
+    /// increase the reference count of the POA.
+    virtual PortableServer::POA_ptr _ciao_the_POA (void);
 
     /// Get a reference to the underlying ORB.
-    CORBA::ORB_ptr the_ORB (void) const;
+    virtual CORBA::ORB_ptr _ciao_the_ORB (void);
 
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
@@ -85,27 +74,10 @@ namespace CIAO
                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
-    // Uninstall a servant for component.
-    virtual void uninstall_component (::Components::CCMObject_ptr objref,
-                                      PortableServer::ObjectId_out oid
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-
   protected:
     CORBA::ORB_var orb_;
 
-    /// POA within which all the components in this container will be
-    /// activated.
-    PortableServer::POA_var component_poa_;
-
-    /// POA within which all the facets and receptacles will be
-    /// activated.
-    /**
-     * Having two POA's allows us to associate different policies that
-     * are distinct from the component.
-     */
-    PortableServer::POA_var facet_cons_poa_;
+    PortableServer::POA_var poa_;
   };
 
   class Session_Container;
@@ -114,10 +86,7 @@ namespace CIAO
   typedef ::PortableServer::Servant (*ServantFactory)
     (::Components::HomeExecutorBase_ptr p,
      ::CIAO::Session_Container *c
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
-    );
+     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
                                   HomeFactory,
@@ -143,13 +112,10 @@ namespace CIAO
   class CIAO_SERVER_Export Session_Container : public Container
   {
   public:
-
-    // @@ (OO) Does the static_config_flag really need to be an int?
-    //         It appears to be a boolean value.  Please use bool
-    //         instead.
     Session_Container (CORBA::ORB_ptr o,
-                       bool static_config_flag = false,
-                       const Static_Config_EntryPoints_Maps* static_entrypts_maps =0);
+                       int static_config_flag =0,
+                       const Static_Config_EntryPoints_Maps* static_entrypts_maps =0
+                       );
 
     virtual ~Session_Container (void);
 
@@ -157,7 +123,6 @@ namespace CIAO
     virtual int init (const char *name = 0,
                       const CORBA::PolicyList *more_policies = 0
                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -187,15 +152,8 @@ namespace CIAO
                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Uninstall a servant for component.
-    virtual void uninstall_component (::Components::CCMObject_ptr objref,
-                                      PortableServer::ObjectId_out oid
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
     // Install a servant for component or home.
-    CORBA::Object_ptr install_servant (PortableServer::Servant p,
-                                       Container::OA_Type t
+    CORBA::Object_ptr install_servant (PortableServer::Servant p
                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -203,6 +161,7 @@ namespace CIAO
     CORBA::Object_ptr install_component (PortableServer::Servant p,
                                          PortableServer::ObjectId_out oid
                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Get an object reference to a component or home from the servant.
@@ -211,64 +170,33 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Uninstall a servant for component or home.
-    void uninstall (CORBA::Object_ptr objref,
-                    Container::OA_Type t
+    void uninstall (CORBA::Object_ptr objref
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Uninstall a servant for component or home.
-    void uninstall (PortableServer::Servant svt,
-                    Container::OA_Type t
+    void uninstall (PortableServer::Servant svt
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Analog of the POA method that creates an object reference from
-    // an object id string.
-    CORBA::Object_ptr generate_reference (const char *obj_id,
-                                          const char *repo_id,
-                                          Container::OA_Type t
-                                          ACE_ENV_ARG_DECL);
-
-    /// Return the servant activator factory that activates the
-    /// servants for facets and consumers.
-    Servant_Activator *ports_servant_activator (void) const;
-
-  private:
-
-    /// Create POA  for the component.
-    /**
-     * This is the POA that is returned to the component applications
-     * if they need one.
-     */
-    void create_component_POA (const char *name,
-                               const CORBA::PolicyList *p,
-                               PortableServer::POA_ptr root
-                               ACE_ENV_ARG_DECL);
-
-    /// Create POA for the facets and consumers alone.
-    void create_facet_consumer_POA (PortableServer::POA_ptr root
-                                    ACE_ENV_ARG_DECL);
+    // Uninstall a servant for component or home.
+    void uninstall_component (CORBA::Object_ptr objref,
+                              PortableServer::ObjectId_out oid
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
     long number_;
 
     static ACE_Atomic_Op <ACE_SYNCH_MUTEX, long> serial_number_;
 
-    // @@ (OO) Does this really need to be an int?  It appears to be a
-    //         boolean value.  Please use bool instead.
-    //
-    //         It looks like it can also be declared const, as well.
-    bool static_config_flag_;
+    int static_config_flag_;
     const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
-
-    /// The servant activator factory used to activate facets and
-    /// consumer servants.
-    Servant_Activator *sa_;
   };
 }
 
 // Macro for registration of an OBV factory in the generated
-// servant class. Similar to the macro for TAO in
+// servant class. Similar to the macro for TAO in 
 // tao/ValueType/ValueFactory.h but here we take advantage of
 // the fact that we have access to the current ORB indirectly
 // through the context and container.
@@ -276,7 +204,7 @@ namespace CIAO
   {  \
     CORBA::ValueFactory factory = new FACTORY; \
     CORBA::ORB_ptr orb = \
-      this->context_->_ciao_the_Container ()->the_ORB (); \
+      this->context_->_ciao_the_Container ()->_ciao_the_ORB (); \
     CORBA::ValueFactory prev_factory = \
       orb->register_value_factory ( \
                VALUETYPE::_tao_obv_static_repository_id (), \
diff --git a/TAO/CIAO/ciao/Container_Base.inl b/TAO/CIAO/ciao/Container_Base.inl
index 0d6aeef9bcc..ee17c741fae 100644
--- a/TAO/CIAO/ciao/Container_Base.inl
+++ b/TAO/CIAO/ciao/Container_Base.inl
@@ -5,12 +5,6 @@ CIAO::Session_Container::get_objref (PortableServer::Servant p
                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->the_POA ()->servant_to_reference (p
+  return this->_ciao_the_POA ()->servant_to_reference (p
                                                  ACE_ENV_ARG_PARAMETER);
 }
-
-ACE_INLINE CIAO::Servant_Activator *
-CIAO::Session_Container::ports_servant_activator (void) const
-{
-  return this->sa_;
-}
diff --git a/TAO/CIAO/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
index fccbf855572..5f3db1e9050 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
 #include "Servant_Impl_Base.h"
-#include "StandardConfigurator_Impl.h"
-#include "Container_Base.h"
 
 namespace CIAO
 {
@@ -10,352 +8,11 @@ namespace CIAO
     : container_ (c)
   {
   }
-
-  Servant_Impl_Base::~Servant_Impl_Base (void)
-  {
-  }
-
-  // Operations for CCMObject interface.
-
-  ::Components::PrimaryKeyBase *
-  Servant_Impl_Base::get_primary_key (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::Components::NoKeyAvailable))
-  {
-    ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
-
-    return 0;
-  }
-
-  CORBA::IRObject_ptr
-  Servant_Impl_Base::get_component_def (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
-  }
-
-  void
-  Servant_Impl_Base::configuration_complete (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidConfiguration))
-  {
-    // CIAO to-do
-  }
-
-  void
-  Servant_Impl_Base::remove (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::RemoveFailure))
-  {
-    // CIAO to-do
-  }
-
-  ::Components::ConnectionDescriptions *
-  Servant_Impl_Base::get_connections (
-      const char * /* name */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::ComponentPortDescription *
-  Servant_Impl_Base::get_all_ports (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    OBV_Components::ComponentPortDescription *cps = 0;
-    ACE_NEW_RETURN (cps,
-                    OBV_Components::ComponentPortDescription,
-                    0);
-    ::Components::ComponentPortDescription_var retv = cps;
-
-    ::Components::FacetDescriptions_var facets_desc =
-      this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ReceptacleDescriptions_var receptacle_desc =
-      this->get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ConsumerDescriptions_var consumer_desc =
-      this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::EmitterDescriptions_var emitter_desc =
-      this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::PublisherDescriptions_var publisher_desc =
-      this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    retv->facets (facets_desc.in ());
-    retv->receptacles (receptacle_desc.in ());
-    retv->consumers (consumer_desc.in ());
-    retv->emitters (emitter_desc.in ());
-    retv->publishers (publisher_desc.in ());
-
-    return retv._retn ();
-  }
-
-  CORBA::Object_ptr
-  Servant_Impl_Base::provide_facet (
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    if (name == 0)
-      {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          CORBA::Object::_nil ());
-      }
-
-    CORBA::Object_ptr retval = this->lookup_facet (name);
-
-    if (CORBA::is_nil (retval))
-      {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          CORBA::Object::_nil ());
-      }
-      
-    return retval;
-  }
-
-  Components::FacetDescriptions *
-  Servant_Impl_Base::get_named_facets (
-      const ::Components::NameList & names
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    Components::FacetDescriptions *retval = 0;
-    ACE_NEW_RETURN (retval,
-                    ::Components::FacetDescriptions,
-                    0);
-    Components::FacetDescriptions_var safe_retval = retval;
-    CORBA::ULong len = names.length ();
-    safe_retval->length (len);
-    ::Components::FacetDescription *tmp = 0;
-    
-    for (CORBA::ULong i = 0; i < len; ++i)
-      {
-        tmp = this->lookup_facet_description (names[i].in ());
-        
-        if (tmp == 0)
-          {
-            ACE_THROW_RETURN (Components::InvalidName (),
-                              0);
-          }
-          
-        safe_retval[i] = tmp;
-      }
-    
-    return safe_retval._retn ();
-  }
-
-  ::Components::FacetDescriptions *
-  Servant_Impl_Base::get_all_facets (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::FacetDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::FacetDescriptions,
-                    0);
-
-    ::Components::FacetDescriptions_var retval = tmp;
-
-    retval->length (this->facet_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (FacetTable::iterator iter = this->facet_table_.begin ();
-         iter != this->facet_table_.end ();
-         ++iter, ++i)
-      {
-        FacetTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
-
-  ::Components::ConsumerDescriptions *
-  Servant_Impl_Base::get_all_consumers (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::ConsumerDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::ConsumerDescriptions,
-                    0);
-
-    ::Components::ConsumerDescriptions_var retval = tmp;
-
-    retval->length (this->consumer_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
-         iter != this->consumer_table_.end ();
-         ++iter, ++i)
-      {
-        ConsumerTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
   
-  ::Components::EventConsumerBase_ptr
-  Servant_Impl_Base::get_consumer (
-      const char *sink_name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    if (sink_name == 0)
-      {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          Components::EventConsumerBase::_nil ());
-      }
-
-    Components::EventConsumerBase_ptr retval =
-      this->lookup_consumer (sink_name);
-
-    if (CORBA::is_nil (retval))
-      {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          Components::EventConsumerBase::_nil ());
-      }
-      
-    return retval;
-  }
-
-  ::Components::EventConsumerBase_ptr
-  Servant_Impl_Base::disconnect_consumer (
-      const char * /* source_name */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName,
-                     Components::NoConnection))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::ConsumerDescriptions *
-  Servant_Impl_Base::get_named_consumers (
-      const ::Components::NameList & names
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    Components::ConsumerDescriptions *retval = 0;
-    ACE_NEW_RETURN (retval,
-                    ::Components::ConsumerDescriptions,
-                    0);
-    Components::ConsumerDescriptions_var safe_retval = retval;
-    CORBA::ULong len = names.length ();
-    safe_retval->length (len);
-    ::Components::ConsumerDescription *tmp = 0;
-    
-    for (CORBA::ULong i = 0; i < len; ++i)
-      {
-        tmp = this->lookup_consumer_description (names[i].in ());
-        
-        if (tmp == 0)
-          {
-            ACE_THROW_RETURN (Components::InvalidName (),
-                              0);
-          }
-          
-        safe_retval[i] = tmp;
-      }
-    
-    return safe_retval._retn ();
-  }
-
-  ::Components::EmitterDescriptions *
-  Servant_Impl_Base::get_all_emitters (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::EmitterDescriptions *
-  Servant_Impl_Base::get_named_emitters (
-      const ::Components::NameList & /* names */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::ReceptacleDescriptions *
-  Servant_Impl_Base::get_all_receptacles (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::ReceptacleDescriptions *
-  Servant_Impl_Base::get_named_receptacles (
-      const ::Components::NameList & /* names */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::PublisherDescriptions *
-  Servant_Impl_Base::get_all_publishers (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::PublisherDescriptions *
-  Servant_Impl_Base::get_named_publishers (
-      const ::Components::NameList & /* names */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
+  Servant_Impl_Base::~Servant_Impl_Base (void)
   {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
   }
 
-  /// Protected operations.
-
   void
   Servant_Impl_Base::add_facet (const char *port_name,
                                 CORBA::Object_ptr port_ref)
@@ -364,43 +21,17 @@ namespace CIAO
     ACE_NEW (fd,
              OBV_Components::FacetDescription);
     ::Components::FacetDescription_var safe = fd;
-
+             
     fd->name (port_name);
     fd->type_id (port_ref->_interface_repository_id ());
     fd->facet_ref (port_ref);
-
+    
     if (this->facet_table_.bind (port_name, fd) == 0)
       {
         safe._retn ();
       }
   }
-  
-  CORBA::Object_ptr
-  Servant_Impl_Base::lookup_facet (const char *port_name)
-  {
-    ::Components::FacetDescription_var fd;
-    
-    if (this->facet_table_.find (port_name, fd) != 0)
-      {
-        return CORBA::Object::_nil ();
-      }
-      
-    return CORBA::Object::_duplicate (fd.in ()->facet_ref ());
-  }
-  
-  ::Components::FacetDescription *
-  Servant_Impl_Base::lookup_facet_description (const char *port_name)
-  {
-    ::Components::FacetDescription_var fd;
-    
-    if (this->facet_table_.find (port_name, fd) != 0)
-      {
-        return 0;
-      }
-      
-    return fd._retn ();
-  }
-
+                  
   void
   Servant_Impl_Base::add_consumer (
       const char *port_name,
@@ -411,70 +42,15 @@ namespace CIAO
     ACE_NEW (cd,
              OBV_Components::ConsumerDescription);
     ::Components::ConsumerDescription_var safe = cd;
-
+             
     cd->name (port_name);
     cd->type_id (port_ref->_interface_repository_id ());
     cd->consumer (port_ref);
-
+    
     if (this->consumer_table_.bind (port_name, cd) == 0)
       {
         safe._retn ();
       }
   }
-
-  ::Components::EventConsumerBase_ptr
-  Servant_Impl_Base::lookup_consumer (const char *port_name)
-  {
-    ::Components::ConsumerDescription_var cd;
-    
-    if (this->consumer_table_.find (port_name, cd) != 0)
-      {
-        return ::Components::EventConsumerBase::_nil ();
-      }
-      
-    return
-      ::Components::EventConsumerBase::_duplicate (cd.in ()->consumer ());
-  }
-
-  ::Components::ConsumerDescription *
-  Servant_Impl_Base::lookup_consumer_description (
-      const char *port_name
-    )
-  {
-    ::Components::ConsumerDescription_var cd;
-    
-    if (this->consumer_table_.find (port_name, cd) != 0)
-      {
-        return 0;
-      }
-      
-    return cd._retn ();
-  }
-
-  Components::StandardConfigurator*
-  Servant_Impl_Base::get_standard_configurator (
-    ACE_ENV_SINGLE_ARG_DECL)
-  {
-    // Create the configurator servant.
-    StandardConfigurator_Impl *config_impl = 0;
-
-    ACE_NEW_THROW_EX (config_impl,
-                      StandardConfigurator_Impl (this),
-                      CORBA::NO_MEMORY ());
-
-
-    Components::StandardConfigurator_var configurator =
-      config_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::StandardConfigurator::_nil ());
-
-    return configurator._retn ();
-  }
-
-  PortableServer::POA_ptr
-  Servant_Impl_Base::_default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  {
-    return
-      PortableServer::POA::_duplicate (container_->the_POA ());
-  }
 }
+
diff --git a/TAO/CIAO/ciao/Servant_Impl_Base.h b/TAO/CIAO/ciao/Servant_Impl_Base.h
index 272fa8f3d5a..c7225c3fefa 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.h
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.h
@@ -27,12 +27,11 @@
 
 #include "CCM_EventC.h"
 #include "CIAO_Server_Export.h"
-#include "CCM_ComponentS.h"
 
 namespace CIAO
 {
   class Session_Container;
-
+  
   /**
    * @class Servant_Impl_Base
    *
@@ -42,150 +41,19 @@ namespace CIAO
    * Servant_Impl.
    */
   class CIAO_SERVER_Export Servant_Impl_Base
-    : public virtual POA_Components::CCMObject
   {
   public:
     Servant_Impl_Base (Session_Container * c);
-
+    
     virtual ~Servant_Impl_Base (void);
 
-    /// Operations for CCMObject interface.
-
-    virtual ::Components::PrimaryKeyBase *
-    get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::NoKeyAvailable));
-
-    virtual CORBA::IRObject_ptr
-    get_component_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void
-    configuration_complete (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidConfiguration));
-
-    virtual void
-    remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
-
-    virtual ::Components::ConnectionDescriptions *
-    get_connections (const char *name
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::ComponentPortDescription *
-    get_all_ports (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Object_ptr
-    provide_facet (const char *name
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-                       
-    virtual ::Components::FacetDescriptions *
-    get_named_facets (const ::Components::NameList & names
-                        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::FacetDescriptions *
-    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual ::Components::ConsumerDescriptions *
-    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-      
-    virtual ::Components::EventConsumerBase_ptr
-    get_consumer (const char *sink_name
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::EventConsumerBase_ptr
-    disconnect_consumer (const char *source_name
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName,
-                       Components::NoConnection));
-
-    virtual ::Components::ConsumerDescriptions *
-    get_named_consumers (const ::Components::NameList & names
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::EmitterDescriptions *
-    get_all_emitters (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::EmitterDescriptions *
-    get_named_emitters (const ::Components::NameList & /* names */
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::ReceptacleDescriptions *
-    get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::ReceptacleDescriptions *
-    get_named_receptacles (const ::Components::NameList & /* names */
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    virtual ::Components::PublisherDescriptions *
-    get_all_publishers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::PublisherDescriptions *
-    get_named_publishers (const ::Components::NameList & names
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
-
-    /// Operation to set attributes on the component.
-    virtual void set_attributes (const Components::ConfigValues &descr
-                                 ACE_ENV_ARG_DECL) = 0;
-
-    // Creates and returns the StandardConfigurator for the component.
-    virtual Components::StandardConfigurator *get_standard_configurator (
-        ACE_ENV_SINGLE_ARG_DECL
-      );
-
-    /// Override that returns the (passed-in) default POA of our member
-    /// component's container, to ensure that we get registered
-    /// to that POA when _this() is called.
-    virtual PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL
-      );
-
   protected:
     void add_facet (const char *port_name,
                     CORBA::Object_ptr port_ref);
-
-    CORBA::Object_ptr lookup_facet (const char *port_name);
-    
-    ::Components::FacetDescription *lookup_facet_description (
-        const char *port_name
-      );
-
+                    
     void add_consumer (const char *port_name,
                        ::Components::EventConsumerBase_ptr port_ref);
-                       
-    ::Components::EventConsumerBase_ptr lookup_consumer (
-        const char *port_name
-      );
-      
-    ::Components::ConsumerDescription *lookup_consumer_description (
-        const char *port_name
-      );
-                       
+
   protected:
     typedef ACE_Hash_Map_Manager_Ex<const char *,
                                     ::Components::FacetDescription_var,
@@ -200,9 +68,9 @@ namespace CIAO
                                     ACE_Equal_To<const char *>,
                                     ACE_Null_Mutex>
        ConsumerTable;
-
-    FacetTable facet_table_;
-    ConsumerTable consumer_table_;
+       
+    FacetTable facet_table_;    
+    ConsumerTable consumer_table_;      
     Session_Container * container_;
   };
 }
@@ -210,3 +78,4 @@ namespace CIAO
 #include /**/ "ace/post.h"
 
 #endif /* CIAO_SERVANT_IMPL_T_H */
+
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.cpp b/TAO/CIAO/ciao/Servant_Impl_T.cpp
index 4e39010461f..443aab29064 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_T.cpp
@@ -26,200 +26,68 @@ namespace CIAO
             typename CONTEXT>
   Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::~Servant_Impl (void)
   {
-    ACE_TRY_NEW_ENV
-    {
-      ::Components::SessionComponent_var scom =
-        ::Components::SessionComponent::_narrow (
-            this->executor_.in ()
-            ACE_ENV_ARG_PARAMETER
-          );
-      ACE_TRY_CHECK;
-
-      if (! ::CORBA::is_nil (scom.in ()))
-        {
-          scom->ccm_remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-        }
-    }
-    ACE_CATCHANY
-    {
-    }
-    ACE_ENDTRY;
-
-    this->context_->_remove_ref ();
-  }
-
-  // Operations for CCMObject interface.
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  CORBA::Boolean
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::same_component (
-      CORBA::Object_ptr object_ref
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    if (::CORBA::is_nil (object_ref))
-      {
-        ACE_THROW_RETURN (::CORBA::BAD_PARAM (), 0);
-      }
-
-    ::CORBA::Object_var the_other =
-      object_ref->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::CORBA::Object_var me =
-      this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    return me->_is_equivalent (the_other.in ()
-                               ACE_ENV_ARG_PARAMETER);
   }
 
   template <typename BASE_SKEL,
             typename EXEC,
             typename EXEC_VAR,
             typename CONTEXT>
-  ::Components::CCMHome_ptr
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_ccm_home (
-      ACE_ENV_SINGLE_ARG_DECL
+  ::Components::FacetDescriptions *
+  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_facets (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return this->context_->get_CCM_home (ACE_ENV_SINGLE_ARG_PARAMETER);
-  }
+    ::Components::FacetDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::FacetDescriptions,
+                    0);
 
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  CORBA::Object_ptr
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::_get_component (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::SessionContext_var sc =
-      ::Components::SessionContext::_narrow (
-          this->context_
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK_RETURN (::CORBA::Object::_nil ());
+    ::Components::FacetDescriptions_var retval = tmp;
 
-    if (! ::CORBA::is_nil (sc.in ()))
-      {
-        return sc->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
+    retval->length (this->facet_table_.current_size ());
+    CORBA::ULong i = 0;
 
-    ::Components::EntityContext_var ec =
-      ::Components::EntityContext::_narrow (
-          this->context_
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK_RETURN (::CORBA::Object::_nil ());
-
-    if (! ::CORBA::is_nil (ec.in ()))
+    for (FacetTable::iterator iter = this->facet_table_.begin ();
+         iter != this->facet_table_.end ();
+         ++iter, ++i)
       {
-        return ec->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+        FacetTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
       }
 
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      ::CORBA::Object::_nil ());
+    return retval._retn ();
   }
 
-  // CIAO-specific operations.
-
   template <typename BASE_SKEL,
             typename EXEC,
             typename EXEC_VAR,
             typename CONTEXT>
-  void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL
+  ::Components::ConsumerDescriptions *
+  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_consumers (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (
-          this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK;
+    ::Components::ConsumerDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::ConsumerDescriptions,
+                    0);
 
-    if (! ::CORBA::is_nil (temp.in ()))
-      {
-        temp->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
-  }
+    ::Components::ConsumerDescriptions_var retval = tmp;
 
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_activate (
-  ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (
-          this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK;
+    retval->length (this->consumer_table_.current_size ());
+    CORBA::ULong i = 0;
 
-    if (! ::CORBA::is_nil (temp.in ()))
+    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
+         iter != this->consumer_table_.end ();
+         ++iter, ++i)
       {
-        temp->ccm_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ConsumerTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
       }
-  }
 
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (
-          this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK;
-
-    if (! ::CORBA::is_nil (temp.in ()))
-      {
-        temp->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  void
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::_ciao_passivate (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (
-          this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK;
-
-    if (! ::CORBA::is_nil (temp.in ()))
-      {
-        temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
+    return retval._retn ();
   }
 }
 
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.h b/TAO/CIAO/ciao/Servant_Impl_T.h
index 4bface2a5b8..af8f19a0eb2 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.h
+++ b/TAO/CIAO/ciao/Servant_Impl_T.h
@@ -43,49 +43,21 @@ namespace CIAO
             typename EXEC_VAR, 
             typename CONTEXT>
   class Servant_Impl : public virtual BASE_SKEL,
-                       public virtual Servant_Impl_Base,
-                       public virtual PortableServer::RefCountServantBase
+                       public Servant_Impl_Base
   {
   public:
-    Servant_Impl (EXEC * exe,
+    Servant_Impl (EXEC * exe, 
                   Session_Container * c);
-                  
     virtual ~Servant_Impl (void);
    
-    // Operations for CCMObject interface.
-
-    virtual CORBA::Boolean
-    same_component (CORBA::Object_ptr object_ref
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::CCMHome_ptr
-    get_ccm_home (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Object_ptr
-    _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-   // CIAO-specific operations.
-
-    void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void
-    ciao_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual ::Components::FacetDescriptions *
+    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  
+    virtual ::Components::ConsumerDescriptions *
+    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// @@NOTE: The busted operation.
-    void
-    _ciao_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
+      
   protected: 
     EXEC_VAR executor_;    
     
diff --git a/TAO/CIAO/docs/schema/Modified_Deployment.xsd b/TAO/CIAO/docs/schema/Modified_Deployment.xsd
index af2f1885837..2531cc323eb 100644
--- a/TAO/CIAO/docs/schema/Modified_Deployment.xsd
+++ b/TAO/CIAO/docs/schema/Modified_Deployment.xsd
@@ -381,22 +381,23 @@
 
 
   <xsd:complexType name="DeploymentPlan">
-   <xsd:sequence>
-	<xsd:element name="label" type="xsd:string" minOccurs="0"/>
-    <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
-	<xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" />     
-    <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" />
-    <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
-    <!-- potentially recursive, not used
+    <xsd:sequence>
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="UUID" type="xsd:string"/>     
+      <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
+      <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded"/>
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" maxOccurs="unbounded"/>
+      <xsd:element name="connection" type="Deployment:PlanConnectionDescription" maxOccurs="unbounded"/>
+
+<!-- potentially recursive, not used
       <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
-    -->
-    <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-  	<xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
+-->
 
+      <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" maxOccurs="unbounded"/>
+      <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
 
 
 
diff --git a/TAO/CIAO/docs/schema/cdp.xsd b/TAO/CIAO/docs/schema/cdp.xsd
index b907f4df0af..6a667d8d4d9 100644
--- a/TAO/CIAO/docs/schema/cdp.xsd
+++ b/TAO/CIAO/docs/schema/cdp.xsd
@@ -6,22 +6,23 @@
 
 <xsd:include schemaLocation="ccd.xsd" />
 
-  <xsd:complexType name="DeploymentPlan">
+<xsd:complexType name="DeploymentPlan">
    <xsd:sequence>
-	<xsd:element name="label" type="xsd:string" minOccurs="0"/>
-    <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
-	<xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" />     
-    <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" />
-    <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
-    <!-- potentially recursive, not used
+     <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="UUID" type="xsd:string"/>     
+      <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
+      <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded"/>
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" maxOccurs="unbounded"/>
+      <xsd:element name="connection" type="Deployment:PlanConnectionDescription" maxOccurs="unbounded"/>
+
+<!-- potentially recursive, not used
       <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
-    -->
-    <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-  	<xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
+-->
 
+      <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" maxOccurs="unbounded"/>
+      <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
+    </xsd:sequence>
+</xsd:complexType>
 
 </xsd:schema>
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
index 9f22f2642b9..6fad594114b 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
@@ -144,7 +144,6 @@ Sender_Impl::SenderHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "%P|%t) creating SenderHome \n")); 
   return new Sender_Impl::Sender_exec_i;
 }
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
index a84ca1595c4..cd9f23e7f7c 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -28,9 +28,9 @@ project(Benchmark_svnt) : ciao_server {
   }
 }
 
-project (*server) : taoserver, strategies,ciao_server {
+project (*server) : taoserver, strategies {
   after += Benchmark_svnt
-  libs += Benchmark_svnt Benchmark_stub 
+  libs += Benchmark_svnt Benchmark_stub
 
   Source_Files {
     server.cpp
diff --git a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index b24ccfcf9e8..da1db00336f 100644
--- a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -20,7 +20,7 @@ project(Protocols_Receiver_stub): ciao_client {
 project(Protocols_Receiver_svnt) : ciao_servant {
   after += Protocols_svnt Protocols_Receiver_stub
   sharedname  = Protocols_Receiver_svnt
-  libs    += Protocols_Receiver_stub Protocols_stub Protocols_svnt
+  libs    += Receiver_stub Protocols_stub Protocols_svnt
   
   idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
@@ -45,7 +45,7 @@ project(Protocols_Receiver_exec) : ciao_component {
   after   += Protocols_Receiver_svnt
   sharedname = Protocols_Receiver_exec
   requires += dummy
-  libs      += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_svnt
+  libs      += Receiver_stub Receiver_svnt Protocols_stub Protocols_svnt
   
   idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index b517cc2d754..8b792984de2 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -21,7 +21,7 @@ project(Protocols_Sender_stub): ciao_client {
 project(Protocols_Sender_svnt) : ciao_servant {
   after += Protocols_svnt Protocols_Sender_stub
   sharedname  = Protocols_Sender_svnt
-  libs    += Protocols_Sender_stub Protocols_stub Protocols_svnt
+  libs    += Sender_stub Protocols_stub Protocols_svnt
   
   idlflags  +=  -Wb,export_macro=SENDER_SVNT_Export -Wb,export_include=Sender_svnt_export.h
   dynamicflags = SENDER_SVNT_BUILD_DLL
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index b84b270cb58..12453328707 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -1,8 +1,8 @@
 // $Id$
 
-project(CIDL_Basic_stub): ciao_client {
+project(Basic_stub): ciao_client {
 
-  sharedname = CIDL_Basic_stub
+  sharedname = Basic_stub
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
   dynamicflags   = BASIC_STUB_BUILD_DLL
 
@@ -20,10 +20,10 @@ project(CIDL_Basic_stub): ciao_client {
   }
 }
 
-project(CIDL_Basic_svnt) : ciao_servant {
-  after +=  CIDL_Basic_stub
-  sharedname = CIDL_Basic_svnt
-  libs    += CIDL_Basic_stub
+project(Basic_svnt) : ciao_server {
+  after +=  Basic_stub
+  sharedname = Basic_svnt
+  libs    += Basic_stub
 
   idlflags  += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
   dynamicflags = BASIC_SVNT_BUILD_DLL
@@ -43,7 +43,7 @@ project(CIDL_Basic_svnt) : ciao_servant {
 }
 
 project(CodeGen_stub): ciao_client {
-  after += CIDL_Basic_stub
+  after += Basic_stub
   sharedname = CodeGen_stub
   idlflags += -Wb,stub_export_macro=CODEGEN_STUB_Export -Wb,stub_export_include=CodeGen_stub_export.h -Wb,skel_export_macro=CODEGEN_SVNT_Export -Wb,skel_export_include=CodeGen_svnt_export.h
   dynamicflags   = CODEGEN_STUB_BUILD_DLL
@@ -63,11 +63,10 @@ project(CodeGen_stub): ciao_client {
 }
 
 project(CodeGen_svnt) : ciao_servant {
-  after += CIDL_Basic_svnt CodeGen_stub
-  requires += cidl
+  after += Basic_svnt CodeGen_stub
   sharedname  = CodeGen_svnt
-  libs    += CodeGen_stub CIDL_Basic_stub CIDL_Basic_svnt
-  idlflags  +=  -Wb,export_macro=CODEGEN_SVNT_Export -Wb,export_include=CodeGen_svnt_export.h
+  libs    += CodeGen_stub Basic_stub Basic_svnt
+  idlflags  +=  -Wb,export_macro=CODEGEN_SVNT_Export -Wb,export_include=CODEGEN_svnt_export.h
   dynamicflags = CODEGEN_SVNT_BUILD_DLL
   cidlflags -= --
   cidlflags += --gen-exec-impl --exec-export-include CodeGen_exec_export.h --
@@ -98,7 +97,7 @@ project(CodeGen_svnt) : ciao_servant {
 project(CodeGen_exec) : ciao_component {
   after   += CodeGen_svnt
   sharedname = CodeGen_exec
-  libs      += CodeGen_stub CodeGen_svnt CIDL_Basic_stub CIDL_Basic_svnt
+  libs      += CodeGen_stub CodeGen_svnt Basic_stub Basic_svnt
   dynamicflags   = CODEGEN_EXEC_BUILD_DLL
   
   IDL_Files {
diff --git a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl
index 15eb50971b3..cbd81d4d8b6 100644
--- a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl
+++ b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl
@@ -27,7 +27,7 @@ module AbstractEvents
     };
 
   // test event multiple inheretance
-  
+  /*
   eventtype concrete_foo
   {
   };
@@ -35,4 +35,6 @@ module AbstractEvents
   eventtype concrete_foobar : concrete_foo, foo_event
   {
   };
+  */
+  
 };
diff --git a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
index 282bcf5ba40..10f6bb1a984 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
@@ -1,9 +1,9 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Basic"
 
-project(IDL3_Basic_stub): ciao_client {
+project(Basic_stub): ciao_client {
   
-  sharedname = Homes_Basic_stub
+  sharedname = Basic_stub
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
   dynamicflags   = BASIC_STUB_BUILD_DLL
 
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl
index 7af66e50e8c..52600efbda6 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl
@@ -18,11 +18,9 @@ module EquivReceptacles
       uses multiple foo_interface foo_recep;
     };
   
-  /**
   interface bar
     {
       Foo::foo_recepConnections get_seq ();
       Foo::foo_recepConnection get_struct ();
     };
-   */
 };
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc
index 6397c59a41e..a86285e2534 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc
@@ -19,8 +19,8 @@ project(DiffServ_Receiver_stub): ciao_client {
 
 project(DiffServ_Receiver_svnt) : ciao_servant {
   after += DiffServ_svnt DiffServ_Receiver_stub
-  sharedname  = DiffServ_Receiver_svnt
-  libs    += DiffServ_Receiver_stub DiffServ_stub DiffServ_svnt
+  sharedname  = DoffServ_Receiver_svnt
+  libs    += Receiver_stub DiffServ_stub DiffServ_svnt
   
   idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
@@ -43,8 +43,8 @@ project(DiffServ_Receiver_svnt) : ciao_servant {
 
 project(DiffServ_Receiver_exec) : ciao_component {
   after   += DiffServ_Receiver_svnt
-  sharedname = DiffServ_Receiver_exec
-  libs      += DiffServ_Receiver_stub DiffServ_Receiver_svnt DiffServ_stub DiffServ_svnt
+  sharedname = DoffServ_Receiver_exec
+  libs      += Receiver_stub Receiver_svnt DiffServ_stub DiffServ_svnt
   
   idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
index c63a0d32d2d..b34e2f696b0 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
@@ -14,100 +14,74 @@ SenderImpl::SenderExec_i::SenderExec_i (void)
   int argc = 0;
   char **argv = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      this->orb_ =
-        CORBA::ORB_init (argc,
-                         argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-
-      ACE_TRY_CHECK;
-
-      RTCORBA::TCPProtocolProperties_var normal_tcp_protocol_properties =
-        rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                1,
-                                                0,
-                                                1,
-                                                0);
-
-      RTCORBA::TCPProtocolProperties_var diffserv_tcp_protocol_properties =
-        rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                                                1,
-                                                0,
-                                                1,
-                                                1);
-
-      RTCORBA::ProtocolList protocols;
-      protocols.length (1);
-      protocols[0].protocol_type = 0;
-      protocols[0].transport_protocol_properties =
-        RTCORBA::ProtocolProperties::_duplicate (normal_tcp_protocol_properties.in ());
-      protocols[0].orb_protocol_properties =
-        RTCORBA::ProtocolProperties::_nil ();
-
-      this->normal_policy_list_.length (1);
-      this->normal_policy_list_[0] =
-        rt_orb->create_client_protocol_policy (protocols);
-
-      protocols[0].transport_protocol_properties =
-        RTCORBA::ProtocolProperties::_duplicate (diffserv_tcp_protocol_properties.in ());
-
-      this->diffserv_policy_list_.length (1);
-      this->diffserv_policy_list_[0] =
-        rt_orb->create_client_protocol_policy (protocols);
-
-      object =
-        this->orb_->resolve_initial_references ("ORBPolicyManager"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->policy_manager_ =
-        CORBA::PolicyManager::_narrow (object.in ());
-
-      object =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (object.in ());
-
-      object =
-        this->orb_->resolve_initial_references ("NetworkPriorityMappingManager"
-                                                ACE_ENV_ARG_PARAMETER);
-
-      ACE_TRY_CHECK;
-
-      RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
-        RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ());
-
-      this->custom_network_priority_mapping_ =
-        new Custom_Network_Priority_Mapping;
-
-      mapping_manager->mapping (this->custom_network_priority_mapping_);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Caught exception in SenderExec_i \n");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  this->orb_ =
+    CORBA::ORB_init (argc,
+                     argv,
+                     "");
+
+  CORBA::Object_var object =
+    this->orb_->resolve_initial_references ("RTORB");
+
+  RTCORBA::RTORB_var rt_orb =
+    RTCORBA::RTORB::_narrow (object.in ());
+
+  RTCORBA::TCPProtocolProperties_var normal_tcp_protocol_properties =
+    rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
+                                            ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
+                                            1,
+                                            0,
+                                            1,
+                                            0);
+
+  RTCORBA::TCPProtocolProperties_var diffserv_tcp_protocol_properties =
+    rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
+                                            ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
+                                            1,
+                                            0,
+                                            1,
+                                            1);
+
+  RTCORBA::ProtocolList protocols;
+  protocols.length (1);
+  protocols[0].protocol_type = 0;
+  protocols[0].transport_protocol_properties =
+    RTCORBA::ProtocolProperties::_duplicate (normal_tcp_protocol_properties.in ());
+  protocols[0].orb_protocol_properties =
+    RTCORBA::ProtocolProperties::_nil ();
+
+  this->normal_policy_list_.length (1);
+  this->normal_policy_list_[0] =
+    rt_orb->create_client_protocol_policy (protocols);
+
+  protocols[0].transport_protocol_properties =
+    RTCORBA::ProtocolProperties::_duplicate (diffserv_tcp_protocol_properties.in ());
+
+  this->diffserv_policy_list_.length (1);
+  this->diffserv_policy_list_[0] =
+    rt_orb->create_client_protocol_policy (protocols);
+
+  object =
+    this->orb_->resolve_initial_references ("ORBPolicyManager");
+
+  this->policy_manager_ =
+    CORBA::PolicyManager::_narrow (object.in ());
+
+  object =
+    this->orb_->resolve_initial_references ("PolicyCurrent");
+
+  this->policy_current_ =
+    CORBA::PolicyCurrent::_narrow (object.in ());
+
+  object =
+    this->orb_->resolve_initial_references ("NetworkPriorityMappingManager");
+
+  RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
+    RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ());
+
+  this->custom_network_priority_mapping_ =
+    new Custom_Network_Priority_Mapping;
+
+  mapping_manager->mapping (this->custom_network_priority_mapping_);
 }
 
 void
diff --git a/TAO/CIAO/tools/Daemon/README b/TAO/CIAO/tools/Daemon/README
index 2c7404e6a2e..2d2a435d779 100644
--- a/TAO/CIAO/tools/Daemon/README
+++ b/TAO/CIAO/tools/Daemon/README
@@ -5,10 +5,10 @@ CIAO_Daemon:
 
 This directory contains CIAO's per-host daemon process implementation
 - CIAO_Daemon.  It includes implementations for two major CCM
-interfaces, namely, ComponentInstallation and ServerActivation.
+interfaces, namely, ComponentImplementation and ServerActivation.
 ComponentInstallation interfaces must be available per-host so all
 ComponentServer running on the same host can query it to acquire
-component implementations they need.  Likewise, ServerActivator
+component impolementations they need.  Likewise, ServerActivator
 interacts with CCM's Assembly framework and is responsible to start up
 new ComponentServer processes on this host.
 
diff --git a/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.h b/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.h
index 25dd7736706..6bb7b0f1428 100644
--- a/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.h
+++ b/TAO/CIAO/tools/XML_Helpers/Cascadable_DocHandler.h
@@ -15,7 +15,6 @@
 #include /**/ "ace/pre.h"
 #include "ACEXML/common/DefaultHandler.h"
 #include "ACEXML/common/XMLReader.h"
-#include "XML_Helpers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -66,7 +65,7 @@ namespace CIAO
      * @sa ACEXML_DefaultHandler
      * @sa DocHandler_Context
      */
-    class  CIAO_XML_HELPERS_Export Cascadable_DocHandler : public ACEXML_DefaultHandler
+    class Cascadable_DocHandler : public ACEXML_DefaultHandler
     {
     public:
       /**
@@ -203,7 +202,7 @@ namespace CIAO
      *
      * @brief This DocHandler ignore and skip over a specific tag.
      */
-    class CIAO_XML_HELPERS_Export Skip_DocHandler : public Cascadable_DocHandler
+    class Skip_DocHandler : public Cascadable_DocHandler
     {
     public:
       /// Constructor.
diff --git a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
index edfc0116fe2..2fbba07841b 100644
--- a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
+++ b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
@@ -7,8 +7,6 @@ project(XML_Helpers): taolib_with_idl, rtcorba, portableserver, acexml, ciao_cli
                   -Wb,export_macro=CIAO_XML_HELPERS_Export
   dynamicflags += CIAO_XML_HELPERS_BUILD_DLL
 
-  libs += TAO_Security
-
   IDL_Files {
    RTConfiguration.idl
   }
@@ -24,8 +22,8 @@ project(XML_Helpers): taolib_with_idl, rtcorba, portableserver, acexml, ciao_cli
   }
 }
 
-project(Helper_Test): rtcorba, portableserver, acexml, ciao_client , taoserver{
-  libs += CIAO_XML_Helpers 
+project(Helper_Test): rtcorba, taoserver, acexml{
+  libs += CIAO_XML_Helpers CIAO_Client  TAO_IFR_Client
   after += XML_Helpers
 
   IDL_Files {
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e06a5eeaa06..4c671a2cea3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,5188 +1,9 @@
-Thu Sep 16 11:49:32 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_argument/paramlist.cpp:
-        
-          Removed code that has been long commented out.
-          
-        * TAO_IDL/be/be_visitor_traits.cpp (visit_array):
-        
-          Removed unused code to generate an #ifdef guard based on the
-          unaliased type name of the array element and all the dimensions.
-          
-        * TAO_IDL/be/be_visitor_arg_traits.cpp (visit_array):
-        
-          Added generation of #ifdef guard removed from the above visitor.
-          This change eliminates a compile error when two arrays with
-          identical element types are both used as operation parameters.
-          Thanks to Jean-Christophe Cota 
-          <jean-christophe.cota@eurocontrol.int> for sending in the 
-          example IDL file that uncovered the bug.
-          
-        * tests/IDL_Test/array.idl:
-        
-          Added interface with an operation containing parameters of
-          arrays with identical element types which already existed in
-          the IDL file.
-
-Thu Sep 16 11:03:47 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* orbsvcs/tests/Miop/McastHello/README:
-
-	  Upadted it again. 
-	
-	* orbsvcs/tests/Miop/McastHello/client.conf:
-	* orbsvcs/tests/Miop/McastHello/server.conf:	
-
-	  Removed them from the repo. We don't need two. 
-	
-	* orbsvcs/tests/Miop/McastHello/client.cpp:
-
-	  Added MIOP.h
-	
-	* orbsvcs/tests/Miop/McastHello/run_test.pl:
-
-	  Removed references to the two conf files. 
-
-	* orbsvcs/tests/Miop/McastHello/svc.conf:
-
-	  Checked in a single svc.conf file. 
-
-Thu Sep 16 10:09:20 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/util/utl_scope.cpp (lookup_by_name_local):
-        
-          Reverted inadvertent checkin that changed the scope iterator
-          instantiation parameters, and added a comment about why it
-          needs to be the way it is (for lookup of sequence parameter
-          in the deprecated declaration of a recursive type using an
-          anonymous sequence). Thanks to Johnny Willemsen 
-          <jwillemsen@rememdy.nl> for reporting the problem in union.idl
-          of IDL_Test, which contains such a recursive union.
-
-Thu Sep 16 09:28:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* orbsvcs/orbsvcs/PortableGroup/MIOP.cpp:
-	* orbsvcs/orbsvcs/PortableGroup/MIOP.h:
-
-	  New file that has a magic static constructor, which when added
-	  to the application source will load UIPMC protocl factory for
-	  static builds. 
-	
-	* orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp:
-
-	  Cosmetic fixes. 
-	
-	* orbsvcs/tests/Miop/McastHello/server.conf:
-
-	  Commented out the dynamic parts of the service
-	  configurator. Just retain the static directives. 
-	
-	* orbsvcs/tests/Miop/McastHello/server.cpp:
-
-	  #included MIOP.h
-
-	* orbsvcs/tests/Miop/McastHello/README:
-
-	  Updated the file with info on static and dynamic library
-	  configuration of MIOP.
-
-	  Thanks to  Rob Boyer <RBOYER at euphonix dot com> for motivating
-	  this change. 
-
-Thu Sep 16 10:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTCORBA/RTCORBA.pidl:
-          Zapped include of orb.idl, not needed and reduces number of manual
-          patching
-
-        * tao/RTCORBA/RTCORBAC.{h,cpp,i,inl}:
-          Regenerated and manually patched
-
-        * tao/RTCORBA/diffs/RTCORBA.diff:
-          Updated
-
-Wed Sep 15 21:25:28 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_root.cpp:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Fixed cleanup of root scope between IDL files when
-          multiple IDL files are passed on the command line.
-          The cleanup needs to remove all declarations and
-          references except those for the predefined types,
-          and there was an off-by-one error.
-
-Tue Sep 14 17:12:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* orbsvcs/orbsvcs/Makefile.am:
-
-	  Updated.
-
-	* orbsvcs/orbsvcs/CosConcurrency.mpc:
-	* orbsvcs/orbsvcs/CosEvent.mpc:
-	* orbsvcs/orbsvcs/CosLifeCycle.mpc:
-	* orbsvcs/orbsvcs/CosLoadBalancing.mpc:
-	* orbsvcs/orbsvcs/CosNaming.mpc:
-	* orbsvcs/orbsvcs/CosNotification.mpc:
-	* orbsvcs/orbsvcs/CosProperty.mpc:
-	* orbsvcs/orbsvcs/CosTime.mpc:
-	* orbsvcs/orbsvcs/CosTrading.mpc:
-	* orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-	* orbsvcs/orbsvcs/DsLogAdmin.mpc:
-	* orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-	* orbsvcs/orbsvcs/ETCL.mpc:
-	* orbsvcs/orbsvcs/FTORB.mpc:
-	* orbsvcs/orbsvcs/FaultTolerance.mpc:
-	* orbsvcs/orbsvcs/FtRtEvent.mpc:
-	* orbsvcs/orbsvcs/IFRService.mpc:
-	* orbsvcs/orbsvcs/PortableGroup.mpc:
-	* orbsvcs/orbsvcs/RTCORBAEvent.mpc:
-	* orbsvcs/orbsvcs/RTEvent.mpc:
-	* orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-	* orbsvcs/orbsvcs/RTKokyuEvent.mpc:
-	* orbsvcs/orbsvcs/RTOLDEvent.mpc:
-	* orbsvcs/orbsvcs/RTSched.mpc:
-	* orbsvcs/orbsvcs/RTSchedEvent.mpc:
-	* orbsvcs/orbsvcs/RT_Notification.mpc:
-	* orbsvcs/orbsvcs/SSLIOP.mpc:
-	* orbsvcs/orbsvcs/Security.mpc:
-	* orbsvcs/orbsvcs/Svc_Utils.mpc:
-
-	  Added empty Inline_Files and Template_Files sections so that
-	  doesn't decide to add unrelated files.
-
-Tue Sep 14 13:03:54 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl:
-        * orbsvcs/orbsvcs/CosNotifyComm.idl:
-          Disable (via #ifdef) unimplemented "Pull" interfaces
-          to reduce footprint and compilation time.
-
-Tue Sep 14 06:27:15 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * docs/compiler.html:
-
-          Fix typos.  Change *.i to *.inl.
-
-Tue Sep 14 08:49:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * tao/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input:
-        * tao/orbsvcs/tests/AVStreams/Bidirectional_Flows/input:
-        * tao/orbsvcs/tests/AVStreams/Component_Switching/input:
-        * tao/orbsvcs/tests/AVStreams/Modify_QoS/input:
-        * tao/orbsvcs/tests/AVStreams/Multiple_Flows/input:
-        * tao/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/input:
-        * tao/orbsvcs/tests/AVStreams/Simple_Three_Stage/input:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage/input:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input:
-
-          Removed achived test inputfiles because these are now generated (and
-          removed) at runtime.
-
-Tue Sep 14 08:41:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/PerlACE/Run_test.pm:
-
-          Added a new PerlACE::generate_test_file(<basename>, <size>) subroutine
-          to be used with tests needing (large) testdata as input (like AVStreams
-          tests).
-
-        * tao/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multicast/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Pluggable/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl:
-
-          Changed to use the new PerlACE::generate_test_file() subroutine.
-
-Mon Sep 13 15:56:53 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Trading/Trading.mpc:
-
-          Changed import_test and export_test projects to inherit from
-          trading_serv.  Needed by Borland CBuilderX.
-
-Mon Sep 13 12:18:49 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-
-          Updated.
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
-
-          Changed to inherit from core.mpb so services will be installed.
-
-Mon Sep 13 12:06:20 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h:
-
-          Remove #include of Naming_Server.h and unused method
-          name_server() to avoid introducing a dependency on the naming
-          service implementation on some windows systems.
-
-Mon Sep 13 11:47:13 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Updated.
-
-Mon Sep 13 06:40:36 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-
-          Changed to inherit from dslogadmin_serv.
-
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-
-          Changed to inherit from svc_utils.
-
-Mon Sep 13 12:29:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * tao/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multicast/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Pluggable/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl:
-
-          Added generation of input datafiles to testscripts.
-          All these scripts now generate an input file of ~100Kb when started,
-          deleting the file when the test has finished.
-
-Mon Sep 13 09:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/UShortSeqC.h:
-          Explictly export the base template, to fix duplicate link errors
-          when linking DsAdmin. This is a workaround for a bug in the vc7
-          compiler.
-
-Sun Sep 12 17:08:17 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
-        * orbsvcs/examples/Log/Event/Log_Event.mpc:
-        * orbsvcs/examples/Log/Notify/Log_Notify.mpc:
-
-          Update *.mpc files to reflect new libraries.
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/BasicLog_i.h:
-        * orbsvcs/orbsvcs/Log/EventLogConsumer.h:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/EventLogNotification.h:
-        * orbsvcs/orbsvcs/Log/EventLog_i.h:
-        * orbsvcs/orbsvcs/Log/Iterator_i.h:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.h:
-        * orbsvcs/orbsvcs/Log/LogNotification.h:
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
-        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.h:
-        * orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h:
-        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Log/Log_i.h:
-        * orbsvcs/orbsvcs/Log/NotifyLogConsumer.h:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/NotifyLogNotification.h:
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
-        * orbsvcs/orbsvcs/Log/PersistStore.h:
-
-          Changed #include "*_export.h" to "*_serv_export.h"; Renamed
-          TAO_*_Export to TAO_*_Serv_Export.
-
-        * orbsvcs/orbsvcs/Log/eventlog_serv_export.h:
-        * orbsvcs/orbsvcs/Log/eventlog_skel_export.h:
-        * orbsvcs/orbsvcs/Log/log_serv_export.h:
-        * orbsvcs/orbsvcs/Log/log_skel_export.h:
-        * orbsvcs/orbsvcs/Log/notifylog_serv_export.h:
-        * orbsvcs/orbsvcs/Log/notifylog_skel_export.h:
-        * orbsvcs/orbsvcs/DsEventLogAdmin.rc:
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.rc:
-
-          New files.
-
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-
-          Split Event Logging Service into three libraries:
-          DsEventLogAdmin, DsEventLogAdmin_Skel, and
-          DsEventLogAdmin_Serv for client stubs, servant skeletons, and
-          service implementation respectively.
-
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-
-          Split Logging Service into three libraries:
-          DsLogAdmin, DsLogAdmin_Skel, and DsLogAdmin_Serv for client
-          stubs, servant skeletons, and service implementation
-          respectively.
-
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-
-          Split Notify Logging Service into three libraries:
-          DsNotifyLogAdmin, DsNotifyLogAdmin_Skel, and
-          DsNotifyLogAdmin_Serv for client stubs, servant skeletons, and
-          service implementation respectively.
-
-Sun Sep 12 14:38:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Leader_Followers/client.cpp:
-          Changed type of the sleep_ member from u_long to long, to fix
-          warnings in our HPUX 64bit build.
-
-Sat Sep 11 19:43:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/tests/CosEvent/Basic/Makefile.am:
-        * orbsvcs/tests/FT_App/Makefile.am:
-        * tao/Makefile.am:
-
-          Updated.
-
-Sat Sep 11 12:41:22 2004  Steve Totten  <totten_s@ociweb.com>
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
-        * orbsvcs/tests/ImplRepo/locked/run_test.pl:
-        * utils/nslist/run_test.pl:
-          Removed some trailing blanks and tab characters from these
-          files.
-
-Sat Sep 11 12:25:07 2004  Steve Totten  <totten_s@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
-        * utils/NamingViewer/NamingViewer.mpc:
-        * utils/nslist/nslist.mpc:
-          Modified MPC files for the following TAO utilities to make
-          sure the executables are installed in $ACE_ROOT/bin:
-          - tao_imr
-          - nslist
-          - nsdel
-          - nsadd
-          - NamingViewer
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
-        * orbsvcs/tests/ImplRepo/locked/run_test.pl:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:
-        * utils/nslist/run_test.pl:
-          Also modified various test scripts that invoke these
-          utilities to get them from $ACE_ROOT/bin.
-
-Sat Sep 11 08:47:58 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Notify/Properties.h:
-
-          Changed to use TAO_NOTIFY_SERV_SINGLETON_DECLARE.
-
-        * orbsvcs/orbsvcs/Log/NotifyLogNotification.h:
-
-          Removed #include of CosNamingC.h.  It isn't used, but requires
-          linking with naming client library with some windows compilers.
-
-Sat Sep 11 00:44:34 2004  Olli Savia  <ops@iki.fi>
-
-        * TAO_IDL/ast/ast_module.cpp:
-          Changed NULL to 0 to silence compile time warning.
-
-Fri Sep 10 12:28:52 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Trading/Trading.mpc:
-
-          Changed colocated_test project to inherit from trading_serv.
-
-          Changed import_test and export_test projects to inherit from
-          portableserver.
-
-        * orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc:
-
-          Changed project to inherit from notification_skel.
-
-        * orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc:
-
-          Changed project to inherit from naming.
-
-Fri Sep 10 09:06:42 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/ec_typed_events_serv.mpb:
-        * orbsvcs/orbsvcs/ec_typed_events_skel.mpb:
-
-          Moved dependency on dynamicinterface and ifr_client from _skel
-          to _serv.
-
-Thu Sep  9 19:26:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc:
-
-          Changed project to inherit from event_skel.
-
-Thu Sep  9 19:21:21 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Notify/lib/Notify_lib.mpc:
-
-          Changed project to inherit from svc_utils.
-
-Thu Sep  9 19:18:11 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/RT_Notification.mpc:
-
-          Changed project to inherit from notify_serv.  Removed
-          unused dependency on dynamicany and svc_utils.
-
-Thu Sep  9 19:13:30 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/examples/Log/Event/Log_Event.mpc:
-
-          Changed projects to inherit from naming.
-
-Thu Sep  9 19:09:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc:
-
-          Changed projects to inherit from event_skel and naming.
-
-Thu Sep  9 18:46:20 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc:
-
-          Changed project to inherit from event_skel.
-
-Thu Sep  9 18:30:56 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/Simple/time-date/Simple_time_date.mpc:
-
-          Changed client project to inherit from portableserver.  It
-          doesn't really use it, but Simple_util.h #includes
-          "PortableServer/PortableServer.h", which forces it
-          to be resolved.
-
-        * orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc:
-
-          Added exename definitions so that programs, not libraries, are
-          built.
-
-          Added main.cpp to FactoryServer project's Source_Files.
-
-          Changed FactoryServer project to inherit from event_serv.
-
-Thu Sep  9 17:24:29 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Notify/Notify_Extensions.h:
-
-          Revert change:
-          Wed Sep  8 12:15:18 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-          for this file only.  This is actually part of the notication
-          client stub library.
-
-Thu Sep  9 16:16:48 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/ORB.cpp:
-        * tao/TAO_Singleton_Manager.h:
-        * tao/TAO_Singleton_Manager.cpp:
-
-          Reintroduced TAO's unexpected exception handler.  It will be
-          removed once again once the skeleton refactoring work is
-          committed.
-
-Thu Sep  9 15:57:30 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/DLL_ORB.h:
-        * tao/DLL_ORB.inl:
-        * tao/DLL_ORB.cpp:
-
-          Removed these files.  They have been deprecated for a few
-          years.  See the `tests/DLL_ORB' test to get an idea of how to
-          use DLL ORB functionality without explicitly linking the TAO
-          library.  Thanks to Bala for the reminder.
-
-        * tao/Makefile.am (ORB_Core):
-        * tao/tao.mpc (Source_Files):
-
-          Removed `DLL_ORB.cpp' from the source file list.
-
-Thu Sep  9 11:53:40 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_decl.cpp (version):
-
-          Fixed logic of method that computes the version to handle
-          the case where the repository ID is set with 'typeid'
-          with no valid version at the end of the string.
-
-Thu Sep  9 07:16:02 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-
-          Updated inheritance.
-
-Thu Sep  9 07:05:20 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Notify/lib/Notify_lib.mpc:
-
-          Changed to inherit from notification_skel.
-
-Thu Sep  9 06:46:00 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-
-          Changed CosNotification_Skel project to inherit from event_skel.
-
-Thu Sep  9 06:15:38 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-
-          Updated library project to inherit from naming_skel.
-
-Thu Sep  9 05:49:49 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Concurrency_Service/Makefile.am:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Dump_Schedule/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/LoadBalancer/Makefile.am:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-        * orbsvcs/Scheduling_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Updated for orbsvcs library refactor.
-
-Thu Sep  9 05:08:57 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/PortableGroup.mpc:
-        * orbsvcs/orbsvcs/RTSched.mpc:
-
-          Updated.  Missing some dependencies now that naming.mpb is just
-          client stub library.
-
-Wed Sep  8 22:08:29 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
-          Added exename definition so that programs, not libraries, are built.
-
-Wed Sep  8 21:31:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/ec_typed_events.mpb:
-
-          Added idlflags setting for stub and skeleton export headers and
-          macros.  Fixed typos in the lists of source, header, and inline
-          files.
-
-Wed Sep  8 21:36:34 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/Typecode.cpp:
-        * tao/Typecode.h:
-        * tao/Typecode.i:
-
-          For long we got away with wrong typecode memory
-          manipulation. The fundamental problem was that somewhere
-          inbetween we started manipulating the lifetimes of stack based
-          typecodes that are generated in the stub and skeleton code. This
-          fix basically makes sure that we don't do that. The changes are
-          as follows.
-
-          - Made _incr_ref () and _decr_ref () protected since
-            clients should not be using this directly.
-
-          - The _duplicate () will check for stack based typecodes,
-            allocate a typecode off the heap if the incoming tyoecodes are
-            stack based. If the typecode is heap allocated we just increment
-            the refcount.
-
-          - The _release () decrements the ref count if it is off the heap
-            and is a no-op otherwise.
-
-          The Typecode had a boolean flag orb_owns_ which was supposed to
-          be used for the above, but we never used it for some reason.
-
-        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
-
-          Set the orb_owns_ flag while creating a new typecode off the
-          heap.
-
-          Thanks to JT Conklin for pointing out the problem.
-
-Wed Sep  8 12:51:53 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
-
-          Added #include "event_serv_export.h".
-
-Wed Sep  8 12:15:18 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h:
-        * orbsvcs/orbsvcs/Naming/Entries.h:
-        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Loader.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Loader.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Server.h:
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
-        * orbsvcs/orbsvcs/Naming/Persistent_Entries.h:
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h:
-        * orbsvcs/orbsvcs/Notify/Admin.h:
-        * orbsvcs/orbsvcs/Notify/AdminProperties.h:
-        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h:
-        * orbsvcs/orbsvcs/Notify/Builder.h:
-        * orbsvcs/orbsvcs/Notify/Consumer.h:
-        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Notify/Consumer_Map.h:
-        * orbsvcs/orbsvcs/Notify/Container_T.h:
-        * orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h:
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.h:
-        * orbsvcs/orbsvcs/Notify/Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Notify/Default_Factory.h:
-        * orbsvcs/orbsvcs/Notify/ETCL_Filter.h:
-        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp:
-        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h:
-        * orbsvcs/orbsvcs/Notify/Event.h:
-        * orbsvcs/orbsvcs/Notify/EventChannel.h:
-        * orbsvcs/orbsvcs/Notify/EventChannelFactory.h:
-        * orbsvcs/orbsvcs/Notify/EventType.h:
-        * orbsvcs/orbsvcs/Notify/EventTypeSeq.h:
-        * orbsvcs/orbsvcs/Notify/Event_Manager.h:
-        * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h:
-        * orbsvcs/orbsvcs/Notify/Event_Map_T.h:
-        * orbsvcs/orbsvcs/Notify/Factory.h:
-        * orbsvcs/orbsvcs/Notify/FilterAdmin.h:
-        * orbsvcs/orbsvcs/Notify/FilterFactory.h:
-        * orbsvcs/orbsvcs/Notify/Find_Worker_T.h:
-        * orbsvcs/orbsvcs/Notify/ID_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Event.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Extensions.h:
-        * orbsvcs/orbsvcs/Notify/Object.h:
-        * orbsvcs/orbsvcs/Notify/POA_Helper.h:
-        * orbsvcs/orbsvcs/Notify/Peer.h:
-        * orbsvcs/orbsvcs/Notify/Properties.h:
-        * orbsvcs/orbsvcs/Notify/Property.h:
-        * orbsvcs/orbsvcs/Notify/PropertySeq.h:
-        * orbsvcs/orbsvcs/Notify/Property_Boolean.h:
-        * orbsvcs/orbsvcs/Notify/Property_T.h:
-        * orbsvcs/orbsvcs/Notify/Proxy.h:
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h:
-        * orbsvcs/orbsvcs/Notify/ProxySupplier.h:
-        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.h:
-        * orbsvcs/orbsvcs/Notify/Proxy_T.h:
-        * orbsvcs/orbsvcs/Notify/QoSProperties.h:
-        * orbsvcs/orbsvcs/Notify/Reactive_Task.h:
-        * orbsvcs/orbsvcs/Notify/Refcountable.h:
-        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h:
-        * orbsvcs/orbsvcs/Notify/Seq_Worker_T.h:
-        * orbsvcs/orbsvcs/Notify/Service.h:
-        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h:
-        * orbsvcs/orbsvcs/Notify/Supplier.h:
-        * orbsvcs/orbsvcs/Notify/SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Notify/Supplier_Map.h:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
-        * orbsvcs/orbsvcs/Notify/Timer.h:
-        * orbsvcs/orbsvcs/Notify/Timer_Queue.h:
-        * orbsvcs/orbsvcs/Notify/Timer_Reactor.h:
-        * orbsvcs/orbsvcs/Notify/Worker_Task.h:
-        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h:
-        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Trader/Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h:
-        * orbsvcs/orbsvcs/Trader/Trader.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.h:
-        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp:
-        * orbsvcs/orbsvcs/Trader/Trading_Loader.h:
-
-          Changed #include "*_export.h" to "*_serv_export.h"; Renamed
-          TAO_*_Export to TAO_*_Serv_Export.
-
-        * orbsvcs/orbsvcs/CosEvent/event_serv_export.h:
-        * orbsvcs/orbsvcs/Naming/naming_serv_export.h:
-        * orbsvcs/orbsvcs/Notify/notify_serv_export.h:
-        * orbsvcs/orbsvcs/Trader/trading_serv_export.h:
-
-          New files.
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Changed to use different export macros service implementations.
-
-Wed Sep  8 11:03:47 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent/event_skel_export.h:
-        * orbsvcs/orbsvcs/Naming/naming_skel_export.h:
-        * orbsvcs/orbsvcs/Notify/notify_skel_export.h:
-        * orbsvcs/orbsvcs/Trader/trading_skel_export.h:
-
-          New files.
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Changed to use different export macros and export includes for
-          stub and skeleton libraries.
-
-Wed Sep  8 12:55:30 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-          Add explicit Resource_Files sections to associate
-          rc files with the correct project.
-
-Wed Sep  8 09:53:02 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
-
-          Added support for getting load average on NetBSD.
-
-Wed Sep  8 09:02:57 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Changed *_Skel project to inherit from portableserver.
-
-Wed Sep  8 08:58:21 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-
-          Fixed tipo -- the export macro was not changed when export
-          header was.
-
-Wed Sep  8 10:28:29 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-          Add explicit Resource_Files sections to associate
-          rc files with the correct project.
-
-Wed Sep  8 10:22:39 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-
-          Modified stream output to make sure a bare newline (with no
-          whitespace) is added at the end of the generated source
-          file containing Any operators and type codes (if the file
-          is generated) both when explicit template instantiations are
-          generated and when they are not. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for reporting the problem, for
-          compilers that must have an empty newline at the end of
-          each file.
-
-Wed Sep  8 04:54:23 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Define TAO_*_BUILD_DLL macro for stub and skeleton libraries
-          so that symbols will be exported for Windows builds.  I hope
-          this will be enough so that separate #defines aren't needed
-          for each library.  Thanks to Johnny Willemsen for help with
-          this problem.
-
-Tue Sep  7 21:48:40 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Utils/Server_Main.cpp:
-
-          Removed redundant include guards around ace/Time_Value.h include
-          directive.
-
-Tue Sep  7 16:31:25 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Notify/lib/EventChannel_Command.h:
-
-          Removed #include of "orbsvcs/Notify/CosNotify_Initializer.h", as
-          that requires the Notification Service implementation library to
-          be pulled in.
-
-        * orbsvcs/TAO_Service/svc.conf:
-        * orbsvcs/examples/Notify/ThreadPool/notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf:
-
-          Changed CosEvent, CosNaming, CosNotification, and CosTrading
-          Service file/path names.
-
-        * docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc:
-        * docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc:
-        * examples/Callback_Quoter/Callback_Quoter.mpc:
-        * examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc:
-        * examples/Event_Comm/Event_Comm.mpc:
-        * examples/Logging/Logging.mpc:
-        * examples/Simple/bank/bank.mpc:
-        * examples/Simple/echo/echo.mpc:
-        * examples/Simple/grid/grid.mpc:
-        * examples/Simple/time-date/Simple_time_date.mpc:
-        * examples/Simple/time/time.mpc:
-        * examples/ior_corbaloc/ior_corbaloc.mpc:
-        * examples/mfc/client.mpc:
-        * examples/mfc/server.mpc:
-        * orbsvcs/Concurrency_Service/Concurrency_Service.mpc:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.mpc:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-        * orbsvcs/Fault_Notifier/Fault_Notifier.mpc:
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
-        * orbsvcs/Naming_Service/Naming_Service.mpc:
-        * orbsvcs/Notify_Service/Notify_Service.mpc:
-        * orbsvcs/Time_Service/Time_Service.mpc:
-        * orbsvcs/Trading_Service/Trading_Service.mpc:
-        * orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc:
-        * orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc:
-        * orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc:
-        * orbsvcs/examples/Notify/Filter/Notify_Filter.mpc:
-        * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc:
-        * orbsvcs/orbsvcs/CosLifeCycle.mpc:
-        * orbsvcs/orbsvcs/CosTime.mpc:
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-        * orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb:
-        * orbsvcs/tests/FT_App/FT_App.mpc:
-        * orbsvcs/tests/IOR_MCast/IOR_MCast.mpc:
-        * orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc:
-        * orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc:
-        * orbsvcs/tests/Simple_Naming/Simple_Naming.mpc:
-        * orbsvcs/tests/Trading/Trading.mpc:
-        * orbsvcs/tests/ior_corbaname/ior_corbaname.mpc:
-        * performance-tests/POA/Demux/Demux.mpc:
-
-          Update *.mpc and *.mpb files to reflect new libraries.  In many
-          cases this required adding new base projects, as libraries were
-          being linked in because of naming -- which was once the service
-          implementation (and thus pulled in lots of other libraries) and
-          is now just the Naming client stubs.
-
-        * orbsvcs/orbsvcs/Event/Local_ESTypes.h:
-
-          Removed #include of "orbsvcs/CosNaming.h".  The Event Service
-          does not use/depend on the Naming Service.
-
-        * orbsvcs/orbsvcs/CosEvent_Serv.rc:
-        * orbsvcs/orbsvcs/CosEvent_Skel.rc:
-        * orbsvcs/orbsvcs/CosNaming_Serv.rc:
-        * orbsvcs/orbsvcs/CosNaming_Skel.rc:
-        * orbsvcs/orbsvcs/CosNotification_Serv.rc:
-        * orbsvcs/orbsvcs/CosNotification_Skel.rc:
-        * orbsvcs/orbsvcs/CosTrading_Serv.rc:
-        * orbsvcs/orbsvcs/CosTrading_Skel.rc:
-
-          New files, resource files for new libraries.
-
-        * orbsvcs/orbsvcs/ec_typed_events.mpb:
-
-          Update to contain the additional source files, etc. for Event
-          Service client stubs only.
-
-        * orbsvcs/orbsvcs/ec_typed_events_serv.mpb:
-        * orbsvcs/orbsvcs/ec_typed_events_skel.mpb:
-
-          New files, containing the additional source files, etc. for the
-          Event Service implementation and servant skeletons.
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-          Split Event Service into three libraries:
-          CosEvent, CosEvent_Skel, and CosEvent_Serv for client stubs,
-          servant skeletons, and service implementation respectively.
-
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-          Split Naming Service into three libraries:
-          CosNaming, CosNaming_Skel, and CosNaming_Serv for client stubs,
-          servant skeletons, and service implementation respectively.
-
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-          Split Notification Service into three libraries:
-          CosNotification, CosNotification_Skel, and CosNotification_Serv
-          for client stubs, servant skeletons, and service implementation
-          respectively.
-
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-          Split Trading Service into three libraries:
-          CosTrading, CosTrading_Skel, and CosTrading_Serv for client stubs,
-          servant skeletons, and service implementation respectively.
-
-Tue Sep  7 14:10:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * TAO/tao/Utils/Server_Main.cpp
-          ACE_Time_Value class is used without necessary first including its
-          definition in some build environments. Ensure that this class's
-          header is included if it hasn't been so before this use here.
-
-Mon Sep  6 22:59:11 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp (gen_stub_src_includes):
-
-          The UserException::_tao_{en,de}code() methods can throw a
-          CORBA::MARSHAL exception so make sure that system exception is
-          fully declared/defined by including
-          "tao/SystemException.h".  However, only include
-          "tao/SystemException.h" if a user exception was encountered and
-          if we're not already including it in the stub header.  Thanks to
-          Johnny Willemsen for reporting the problem.
-
-Mon Sep  6 19:45:32 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-        * TAO_IDL/ast/ast_decl.cpp:
-
-          Fixed a bug in the generation of repository ids for implied
-          IDL event consumer interfaces.
-
-Mon Sep  6 00:54:48 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/LoadBalancer/LoadBalancer.mpc:
-
-          For some reason this MPC file was configured to generate
-          "CosLoadManager" and "CosLoadMonitor" libraries rather
-          "LoadManager" and "LoadMonitor" executables, respectively; a
-          complete departure from the pre-MPC "hand-written" Makefiles and
-          project files.  Fixed this problem.  This should also fix the
-          Load Balancer test failures in our daily automated regression
-          tests.
-
-Mon Sep  6 00:42:49 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Utils/Server_Main.cpp:
-
-          Include "ace/Time_Value.h" to pull ACE_Time_Value class
-          declaration.
-
-          (Server_Main):
-
-          Fixed emulated exception macro usage for CORBA::ORB_init()
-          call within an ACE_TRY block, i.e. "ACE_TRY_CHECK", not
-          "ACE_CHECK_RETURN(...)".
-
-Sun Sep  5 22:46:13 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * TAO_IDL/be/be_attribute.cpp (be_attribute):
-
-          TAO_IDL generated attribute methods currently have an exception
-          specification containing CORBA::SystemException.  Make sure we
-          generate a "tao/SystemException.h" include directive.
-
-        * examples/RTScheduling/MIF_SchedulingC.h:
-
-          Removed some lingering "_tao" prefixes in TAO::Objref_Traits<>
-          traits templates.  Fixes compile-time errors.
-
-        * orbsvcs/tests/IOR_MCast/server.cpp:
-        * orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp:
-
-          Fixed compile-time errors due to missing #include directives now
-          made necessary by header reductions performed over the last few
-          days.
-
-Sun Sep  5 09:42:34 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Time_Utilities.i:
-
-          Include "ace/Time_Value.h" to pull in ACE_Time_Value class
-          declaration.
-
-Sun Sep  5 09:32:18 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/CDR/basic_types.cpp:
-        * tests/Connection_Failure/client.cpp:
-        * tests/DynAny_Test/data.h:
-        * tests/ORB_init/ORB_init.cpp:
-
-          Added missing #include directives now needed due to included
-          header reductions in tao/ORB.h.
-
-        * tests/ORT/ObjectReferenceFactory.h (make_object):
-        * tests/ORT/ObjectReferenceFactory.cpp (make_object):
-
-          Removed exception specification.  Valuetypes in TAO_IDL
-          generated stubs do not have one, nor does this test
-          ObjectReferenceFactory method need one.  Fixes a compile-time
-          error.
-
-Sun Sep  5 09:21:49 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
-        * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h:
-        * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h:
-
-          Added missing "tao/PolicyC.h" #include.
-
-Sun Sep  5 03:58:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
-
-          Added missing "tao/SystemException.h" #include.
-
-Sun Sep  5 01:42:18 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Stub.h (create_ior_info, get_profile_ior_info):
-
-          Removed exception specifications from these methods.  They
-          aren't needed and force an unecessary include of the heavy
-          weight tao/SystemException.h header.
-
-        * tao/Stub.cpp:
-
-          Likewise.
-
-        * tao/IOP_CodecC.h:
-        * tao/PollableC.h:
-        * tao/PortableInterceptorC.h:
-        * tao/IFR_Client/IFR_BaseC.h:
-        * tao/PortableServer/ImplRepoC.h:
-        * tao/PortableServer/ORT_Adapter.h:
-
-          Added missing header #includes now made necessary by header
-          dependency reductions in tao/ORB.h.
-
-Sun Sep  5 01:21:45 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * examples/RTScheduling/MIF_SchedulingC.h:
-        * examples/RTScheduling/MIF_SchedulingC.cpp:
-
-          Removed "tao_" prefix from methods in the TAO traits templates
-          used in these sources, as was done to the other traits templates
-          used throughout TAO.
-
-Sun Sep  5 01:13:12 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/ORB.h:
-
-          Removed exception specifications from CORBA::ORB methods.  The
-          C++ mapping no longer requires them.  This also allows for the
-          removal of the "tao/SystemException.h" include which will
-          improve TAO library compile times, in addition to compile times
-          for TAO_IDL generated stubs for IDL that contain no operations
-          (e.g. anything except for non-empty interfaces).
-
-          Include "Policy_ForwardC.h" instead of "PolicyC.h".  The former
-          is much lighter weight, and is all that is needed.
-
-          Forward declare some types in the CORBA namespace since they are
-          no longer pulled in by removed "PolicyC.h" #include.
-
-          Include "VarOut_T.h" to pull in some necessary TAO templates.
-
-          Corrected some Doxygen documentation.
-
-        * tao/ORB.cpp:
-
-          Removed exception specifications from CORBA::ORB methods in
-          accordance with changes made to ORB.h.
-
-          Removed code that initiated TAO unexpected exception handler
-          registration.  See TAO_Singleton_Manager.* change description
-          below for details.
-
-        * tao/TAO_Singleton_Manager.h:
-        * tao/TAO_Singleton_Manager.cpp:
-
-          Removed code that set the TAO unexpected exception handler.  It
-          is no longer needed since the C++ mapping no longer requires
-          unknown C++ exceptions to be converted to the CORBA::UNKNOWN
-          system exception.  It is anyway considered "bad form" to
-          potentially override an application defined unexpected exception
-          handler.
-
-        * tao/ClientRequestInfo.cpp:
-        * tao/FILE_Parser.cpp:
-        * tao/Object.cpp:
-        * tao/Object_Ref_Table.cpp:
-        * tao/PolicyFactory_Registry.cpp:
-        * tao/PortableInterceptorC.cpp:
-        * tao/PortableInterceptorC.h:
-        * tao/Stub.h:
-        * tao/DynamicInterface/Server_Request.cpp:
-        * tao/RTCORBA/RTCORBAC.h:
-        * tao/RTCORBA/RT_ORB_Loader.cpp:
-        * tao/RTCORBA/RT_Stub_Factory.cpp:
-        * tao/Utils/RIR_Narrow.cpp:
-
-          Added missing header #includes now made necessary by header
-          dependency reductions in tao/ORB.h.
-
-        * TAO_IDL/be/be_codegen.cpp (gen_stub_hdr_includes):
-
-          Enabled/uncommented code that conditionally generates a
-          "tao/SystemException.h" include for IDL that defines
-          operations.  Since tao/ORB.h no longer includes
-          "tao/SystemException.h", it must be included in TAO_IDL
-          generated stub headers; at least until exception specifications
-          are removed from IDL-based stub and skeleton operations (see Bug
-          1852).
-
-Sat Sep  4 23:30:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/IORTable/IORTableC.h:
-        * tao/PortableServer/ORT_Adapter_Factory.h:
-
-          Added missing "tao/SystemException.h" include.
-
-Fri Sep  3 13:55:53 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h:
-
-          Include "tao/SystemException.h" instead of "tao/Exception.h" to
-          pull CORBA::SystemException class declaration.
-
-        * tao/IORManipulation/IORC.h:
-        * tao/IORManipulation/IORC.cpp:
-        * tao/RTPortableServer/RTPortableServerC.h:
-        * tao/RTPortableServer/RTPortableServerC.cpp:
-        * tao/TypeCodeFactory/TypeCodeFactoryC.h:
-        * tao/TypeCodeFactory/TypeCodeFactoryC.cpp:
-
-          Removed "tao_" prefix from methods in the TAO traits templates
-          used in these sources, as was done to the other traits templates
-          used throughout TAO.
-
-Fri Sep  3 13:42:16 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Acceptor_Registry.h (open):
-        * tao/Acceptor_Registry.cpp (open):
-
-          Removed the exception specification from this method.  It really
-          isn't needed.  Removing it also allows us to avoid including
-          "tao/SystemException.h" to pull in the CORBA::SystemException
-          class declaration.  Fixes a compile-time error regarding
-          undefined CORBA::SystemException type in header.
-
-Fri Sep  3 14:18:35 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * interop-tests/wchar/interop_wchar_i.cpp:
-          gcc on Tru64 is still complaining about using a
-          wchar_t * where a CORBA::WChar * is expected.
-          ( I wonder if this is a 32 vs 64 bit problem?)
-          Try again to make it happy.
-
-Fri Sep  3 11:54:49 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * utils/catior/Makefile.am:
-        * utils/nslist/Makefile.am:
-
-          Updated.
-
-        * utils/catior/catior.mpc:
-        * utils/nslist/nslist.mpc:
-
-          Changed to inherit from core.mpb so utilities will be installed.
-
-Fri Sep  3 21:46:10 2004  Olli Savia  <ops@iki.fi>
-
-        * TAO_IDL/be/be_tmplinst.cpp:
-          Use ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-          to check if explicit template instantiation is needed.
-          Thanks to Johnny Willemsen for informing me about this
-          macro.
-
-Fri Sep  3 12:41:36 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/Object_KeyC.cpp:
-
-          Fixed hand-crafted code to compile when
-          TAO_NO_COPY_OCTET_SEQUENCES is defined as 0.
-
-Fri Sep  3 10:17:32 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Updated to account for Ossama's Exception refactor.
-
-Fri Sep  3 19:01:59 2004  Olli Savia  <ops@iki.fi>
-
-        * TAO_IDL/be/be_tmplinst.cpp:
-          LynxOS 3.x needs explicit template instantiation.
-
-        * TAO_IDL/include/idl_defines.h:
-          Added #include "ace/os_include/os_limits.h" to pick NFILES
-          on LynxOS 3.x
-
-Fri Sep  3 10:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Profile.cpp:
-          Fixed compile problem when TAO_NO_COPY_OCTET_SEQUENCES is defined
-          to 0
-
-Fri Sep  3 08:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Exception.h:
-          Mark TAO_DONT_CATCH with @internal
-
-        * tao/Sequence.cpp:
-          Include SystemException.h instead of Exception.h
-
-        * tao/SystemException.cpp:
-          Include OS_NS_stdio.h to get printf
-        * tao/UserException.cpp:
-          Include UserException.inl when not defined ACE_INLINE
-
-Thu Sep  2 22:21:35 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Exception.h:
-        * tao/Exception.i:
-        * tao/Exception.cpp:
-
-          Moved CORBA::SystemException and CORBA::UserException related
-          code to separate files to improve compile times.
-
-          (Exception):
-
-          Improved exception safety by making "id_" and "name_" attributes
-          CORBA::String_vars instead of "char *"s.
-
-        * tao/SystemException.h:
-        * tao/SystemException.inl:
-        * tao/SystemException.cpp:
-
-          Moved CORBA::SystemException class and related code to this set
-          of files to improve compile-times of sources that don't need the
-          declarations and definitions now in these files.
-
-          (SystemException):
-
-          Fixed problem where SystemException attributes were not
-          initialized in the default constructor, as required by the C++
-          mapping.
-
-        * tao/UserException.h:
-        * tao/UserException.inl:
-        * tao/UserException.cpp:
-
-          Moved CORBA::SystemException class and related code to this set
-          of files.  This was done mostly for the sake of consistency
-          since this is not an expensive set of sources in terms of
-          compile times and footprint.
-
-        * tao/Acceptor_Registry.cpp:
-        * tao/Adapter.cpp:
-        * tao/Adapter.h:
-        * tao/Any_Basic_Impl.cpp:
-        * tao/Any_Dual_Impl_T.cpp:
-        * tao/Any_Impl.cpp:
-        * tao/Any_Impl_T.cpp:
-        * tao/Any_SystemException.cpp:
-        * tao/Any_Unknown_IDL_Type.cpp:
-        * tao/BiDir_Adapter.h:
-        * tao/BoundsC.cpp:
-        * tao/Buffering_Constraint_Policy.cpp:
-        * tao/CDR.cpp:
-        * tao/CDR_Encaps_Codec.cpp:
-        * tao/CORBALOC_Parser.cpp:
-        * tao/CORBANAME_Parser.cpp:
-        * tao/ClientRequestInfo.inl:
-        * tao/ClientRequestInfo_i.inl:
-        * tao/CodecFactory.cpp:
-        * tao/CodecFactory_ORBInitializer.cpp:
-        * tao/Codeset_Manager.cpp:
-        * tao/Connector_Registry.cpp:
-        * tao/DLL_Parser.cpp:
-        * tao/Default_Stub_Factory.cpp:
-        * tao/Environment.cpp:
-        * tao/GIOP_Message_Base.cpp:
-        * tao/GIOP_Message_Generator_Parser.h:
-        * tao/GIOP_Message_Generator_Parser_10.cpp:
-        * tao/GIOP_Message_Lite.cpp:
-        * tao/GIOP_Message_Lite.h:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_Profile.cpp:
-        * tao/IORInterceptor_Adapter.h:
-        * tao/IORInterceptor_Adapter_Factory.h:
-        * tao/IOR_Parser.h:
-        * tao/Interceptor_List.cpp:
-        * tao/Invocation_Base.cpp:
-        * tao/Invocation_Endpoint_Selectors.cpp:
-        * tao/LocalObject.cpp:
-        * tao/MProfile.cpp:
-        * tao/NVList.cpp:
-        * tao/ORB.cpp:
-        * tao/ORB.h:
-        * tao/ORBInitializer_Registry.cpp:
-        * tao/Object_Loader.h:
-        * tao/Object_Ref_Table.cpp:
-        * tao/Object_T.cpp:
-        * tao/PICurrent.cpp:
-        * tao/PICurrent_ORBInitializer.cpp:
-        * tao/PolicyFactory_Registry.cpp:
-        * tao/Policy_ForwardA.cpp:
-        * tao/Policy_Set.cpp:
-        * tao/PollableC.cpp:
-        * tao/Profile.cpp:
-        * tao/Profile_Transport_Resolver.cpp:
-        * tao/Profile_Transport_Resolver.h:
-        * tao/Remote_Object_Proxy_Broker.cpp:
-        * tao/RequestInfo_Util.cpp:
-        * tao/Request_Dispatcher.h:
-        * tao/Service_Callbacks.cpp:
-        * tao/Services_Activate.h:
-        * tao/Stub.cpp:
-        * tao/Synch_Invocation.cpp:
-        * tao/Synch_Invocation.h:
-        * tao/TAO_Server_Request.cpp:
-        * tao/Thread_Lane_Resources.cpp:
-        * tao/Transport_Connector.cpp:
-        * tao/TypeCodeFactory_Adapter.h:
-        * tao/Typecode_Constants.cpp:
-        * tao/WrongTransactionA.cpp:
-        * tao/WrongTransactionC.cpp:
-        * tao/append.cpp:
-        * tao/corba.h:
-        * tao/operation_details.cpp:
-        * tao/operation_details.h:
-        * tao/skip.cpp:
-        * tao/Messaging/AMH_Response_Handler.cpp:
-        * tao/PortableServer/Object_Adapter.i:
-        * tao/PortableServer/POAManager.i:
-        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
-
-          Include "tao/SystemException.h" and/or "tao/UserException.h" to
-          pull in CORBA::{System,User}Exception class declaration.
-
-        * tao/Array_VarOut_T.h:
-        * tao/Array_VarOut_T.inl:
-        * tao/Array_VarOut_T.cpp:
-        * tao/CurrentC.cpp:
-        * tao/CurrentC.h:
-        * tao/DomainC.cpp:
-        * tao/DomainC.h:
-        * tao/Fixed_Array_Argument_T.cpp:
-        * tao/IOP_CodecC.cpp:
-        * tao/IOP_CodecC.h:
-        * tao/ORBInitInfo.cpp:
-        * tao/ORBInitInfo.h:
-        * tao/Object.cpp:
-        * tao/Object.h:
-        * tao/Object_Argument_T.cpp:
-        * tao/Objref_VarOut_T.cpp:
-        * tao/Objref_VarOut_T.h:
-        * tao/PolicyC.cpp:
-        * tao/PolicyC.h:
-        * tao/Policy_ForwardC.cpp:
-        * tao/Policy_ForwardC.h:
-        * tao/PortableInterceptorC.cpp:
-        * tao/PortableInterceptorC.h:
-        * tao/Sequence_T.cpp:
-        * tao/Sequence_T.i:
-        * tao/TAOC.cpp:
-        * tao/TAOC.h:
-        * tao/Typecode.cpp:
-        * tao/Typecode.h:
-        * tao/Var_Array_Argument_T.cpp:
-        * tao/BiDir_GIOP/BiDirPolicyC.cpp:
-        * tao/BiDir_GIOP/BiDirPolicyC.h:
-        * tao/DynamicAny/DynamicAnyC.cpp:
-        * tao/DynamicAny/DynamicAnyC.h:
-        * tao/DynamicInterface/Context.cpp:
-        * tao/DynamicInterface/ExceptionList.cpp:
-        * tao/DynamicInterface/Unknown_User_Exception.cpp:
-        * tao/DynamicInterface/Unknown_User_Exception.h:
-        * tao/IFR_Client/IFR_BaseC.cpp:
-        * tao/IFR_Client/IFR_BaseC.h:
-        * tao/IFR_Client/IFR_BasicC.cpp:
-        * tao/IFR_Client/IFR_BasicC.h:
-        * tao/IFR_Client/IFR_ComponentsC.cpp:
-        * tao/IFR_Client/IFR_ComponentsC.h:
-        * tao/IFR_Client/IFR_ExtendedC.cpp:
-        * tao/IFR_Client/IFR_ExtendedC.h:
-        * tao/IORInterceptor/IORInfoC.cpp:
-        * tao/IORInterceptor/IORInfoC.h:
-        * tao/IORInterceptor/IORInterceptorC.cpp:
-        * tao/IORInterceptor/IORInterceptorC.h:
-        * tao/IORTable/IORTableC.cpp:
-        * tao/IORTable/IORTableC.h:
-        * tao/Messaging/AMH_Response_Handler.cpp:
-        * tao/Messaging/MessagingC.cpp:
-        * tao/Messaging/MessagingC.h:
-        * tao/Messaging/Messaging_No_ImplC.cpp:
-        * tao/Messaging/Messaging_No_ImplC.h:
-        * tao/Messaging/Messaging_RT_PolicyC.cpp:
-        * tao/Messaging/Messaging_RT_PolicyC.h:
-        * tao/Messaging/Messaging_SyncScope_PolicyC.cpp:
-        * tao/Messaging/Messaging_SyncScope_PolicyC.h:
-        * tao/Messaging/TAO_ExtC.cpp:
-        * tao/Messaging/TAO_ExtC.h:
-        * tao/ObjRefTemplate/Default_ORTC.cpp:
-        * tao/ObjRefTemplate/Default_ORTC.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
-        * tao/PortableServer/ImR_LocatorC.cpp:
-        * tao/PortableServer/ImR_LocatorC.h:
-        * tao/PortableServer/ImplRepoC.cpp:
-        * tao/PortableServer/ImplRepoC.h:
-        * tao/PortableServer/PortableServerC.cpp:
-        * tao/PortableServer/PortableServerC.h:
-        * tao/RTCORBA/RTCORBAC.cpp:
-        * tao/RTCORBA/RTCORBAC.h:
-        * tao/RTScheduling/RTSchedulerC.cpp:
-        * tao/RTScheduling/RTSchedulerC.h:
-        * tao/Valuetype/Sequence_T.cpp:
-        * tao/Valuetype/Sequence_T.inl:
-        * tao/Valuetype/ValueBase.cpp:
-        * tao/Valuetype/ValueBase.h:
-        * tao/Valuetype/ValueFactory.cpp:
-        * tao/Valuetype/ValueFactory.h:
-        * tao/Valuetype/Value_VarOut_T.cpp:
-        * tao/Valuetype/Value_VarOut_T.h:
-
-          Removed "tao_" prefix from methods in the TAO traits templates
-          used in these sources.  It is redundant since the traits
-          templates are TAO-specific, and in the TAO namespace.
-
-        * tao/ORB_Core.cpp (check_shutdown):
-        * tao/ORB_Core.i (check_shutdown):
-
-          Uninlined this method so that we can avoid including
-          "tao/SystemException.h" in the inline source file.
-
-        * tao/tao.mpc:
-
-          Added new SystemException.cpp and UserException.cpp files to the
-          ORB_Core source list.
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Updated conditional Exception.h header include directive to
-          generate include directives for tao/SystemException.h and
-          tao/UserException.h instead.  This code is still commented out,
-          as it was previously, and will be enabled once we reduce
-          included headers in tao/ORB.h.
-
-        * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-
-          Removed "tao_" prefix from methods in the TAO traits templates
-          and their uses generated by TAO_IDL.  It is redundant since the
-          traits templates are TAO-specific, and in the TAO namespace.
-
-Thu Sep  2 14:41:42 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tao/Connection_Handler.cpp (handle_input_eh): Updated to be
-          consistent with the OCI 1.3a version.  Somehow during the merge
-          an older version from the OCI repo got in here.  Thanks to
-          Johnny Willemsen for spotting this.
-
-        * tao/default_client.cpp (parse_args): Changed ACE_LIB_TEXT usage
-          to ACE_TEXT.  The merge of MT_NOUPCALL brought in uses of the
-          ACE_LIB_TEXT macro.
-
-Thu Sep  2 09:41:28 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * interop-tests/wchar/interop_wchar_i.cpp:
-          Add a cast to keep the Tru64 compiler from complaining
-          that a wchar_t * cannot be used for a
-          const CORBA::WChar_T * argument.
-
-Thu Sep  2 08:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ServerRequestInfo.cpp:
-          Replaced ACE cast macros with normal C++ casts
-
-Thu Sep  2 07:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Servant_Base.cpp:
-          Replaced ACE cast macros with normal C++ casts
-
-Wed Sep  1 12:55:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * docs/libraries.html:
-
-          Removed duplicate DynamicInterface entry.
-
-        * docs/orbsvcs.html:
-
-          Fixed Sched service directory
-
-Wed Sep  1 10:42:38 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * docs/cec_options.html:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp:
-
-          Added a configurator option to determine the number of retries
-          before removing an unresponsive consumer or supplier from the
-          CosEvent Service.  This option is fully documented in
-          docs/cec_options.html.
-
-Wed Sep  1 11:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Policy_Set.h:
-          Replaced html style with doxygen style
-
-Wed Sep  1 06:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport.cpp (dump_iov):
-          Reverted my change of yesterday, this is an ACE_OS::sprintf and
-          no ACE_DEBUG, so %P and %t don't work.
-
-Tue Aug 31 17:53:30 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Update after Portable Server refactor changes.
-
-Tue Aug 31 19:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
-          When the input file cannot be opened, log an error and return -1
-          instead of going on further without an input file, which results
-          in strange crashes.
-
-Tue Aug 31 10:00:48 2004  Chad Elliott  <elliott_c@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-
-          When an array is not nested inside a class we need to specify the
-          storage type as the TAO_EXPORT_MACRO to get the functions
-          required for copying, freeing, duplicating and allocating exported
-          into the dll for Windows.
-
-Tue Aug 31 14:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/GIOP_Message_Base.cpp:
-          Updated some debug messages so that the formatting matches other
-          messages in TAO and when the log is read, it is clear where this
-          message is coming from.
-
-Tue Aug 31 09:06:40 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * interop-tests/wchar/interop_wchar_i.cpp:
-          Another exception emulation problem.
-
-Tue Aug 31 13:43:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport.cpp (dump_iov):
-          Updated formatting of debug messages so that it matches other debug
-          lines
-
-Tue Aug 31 13:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/ORT/run_test.pl:
-          New perl script that is usefull to automatically run this example,
-          the example itself it still broken, working on it but the script
-          saves a lot of test time
-
-Tue Aug 31 11:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Big_Oneways/server.cpp:
-          Added some more debug statements so that we can better track the
-          steps of the server
-
-Tue Aug 31 09:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Options.html:
-          Removed trailing " which was incorrect
-
-Mon Aug 30 23:03:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Update after Portable Server refactor changes.
-
-Mon Aug 30 18:14:49 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_expression.cpp:
-        * TAO_IDL/include/ast_expression.h:
-        * TAO_IDL/include/utl_err.h:
-        * TAO_IDL/util/utl_err.cpp:
-
-          Fixed handling of boolean IDL constants so that 'true' or
-          'false' is generated on the rhs, instead of '0' or '1'
-          as formerly. Also added a check for the use of infix
-          operators in an expression with types other than integer or
-          floating point, (illegal as per CORBA 3.0.3 section 3.10.2), and a
-          new error to report if a violation is found. This last
-          fix closes [BUGID:1682].
-
-Mon Aug 30 12:27:38 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/examples/Security/Send_File/README:
-
-          Added note that "-SSLNoProtection" flag must be set when running
-          IIOP client to SSLIOP server test.  Thanks to Jules Colding
-          <jules at tdcadsl dot dk> for pointing out the inconsistency.
-
-        * orbsvcs/examples/Security/Send_File/server.conf:
-
-          Enabled "-SSLNoProtection" flag to server configuration to allow
-          IIOP client to SSLIOP server test to work as documented.
-
-Mon Aug 30 14:24:20 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * interop-tests/wchar/interop_wchar_i.cpp:
-          Build correctly with exception emulation.
-
-Mon Aug 30 12:19:04 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc:
-
-          Reordered base projects, putting amh last, to resolve generation
-          problems on RH80_Static_Core.
-
-Mon Aug 30 15:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Makefile.am:
-          Updated this file for the moving of AMH_Response_Handler, forgot this
-          file this morning
-
-Mon Aug 30 15:29:07 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/ORB.h (CORBA):
-
-          Added documentation for run () with a timeout parameter. Thanks
-          to Jules Colding <jules at tdcadsl dot dk> for motivating this.
-
-Mon Aug 30 08:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Big_Oneways/Session.cpp:
-          When catching an exception in the svc method print out the number
-          of messages sent. This test fails in some builds, maybe it is
-          just taking a long time, this should give us some more info.
-
-Mon Aug 30 08:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Big_Twoways/Session.cpp:
-          When catching an exception in the svc method print out the number
-          of messages sent. This test fails in some builds, maybe it is
-          just taking a long time, this should give us some more info.
-
-Mon Aug 30 07:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/AMH_Response_Handler.{h,cpp}:
-        * tao/Messaging/AMH_Response_Handler.{h,cpp}:
-          Moved the AMH Response Handler class from PortableServer to Messaging,
-          when using AMH we need Messaging because of the ExceptionHolder.
-          Moving this class doesn't change anything then when you use AMH, but
-          when not using AMH, the portableserver library will be smaller.
-
-        * TAO_IDL/be/be_codegen.cpp:
-          Updated include path of AMH_Response_Handler.h
-
-Fri Aug 27 23:08:33 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * TAO_IDL/fe/idl.ll:
-
-          Fix for BUG 1683. Jeff prepared this lex file. I just generated
-          the code, and applied the patches.
-
-        * TAO_IDL/fe/lex.yy.cpp:
-
-          Regenerated code for the new lex file.
-
-        * TAO_IDL/fe/lex.yy.cpp.diff:
-
-          Another useless diff that we maintain which we cannot use! The
-          above change took only 4-5 hours! Anyway, we have tested on
-          Linux and things seem to be working. Let us see how other
-          platforms behave.
-
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Fixed unused variable warnings.
-
-Fri Aug 27 13:34:58 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * utils/NamingViewer/NamingViewerDlg.cpp:
-
-          Changed #include "Naming/Naming_Server.h" to #include
-          "Naming/Naming_Client.h".
-
-Fri Aug 27 18:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
-          Added iorinterceptor as base project
-
-Fri Aug 27 16:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
-          Added .in() to silence gcc warning about better conversion
-
-Fri Aug 27 10:07:17 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/IFRService/Contained_i.cpp:
-        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
-        * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
-        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
-        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp:
-        * orbsvcs/orbsvcs/IFRService/Repository_i.cpp:
-        * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp:
-
-          Added logical ORs of CORBA::OMGVMCID to the minor codes
-          in raised exceptions. Thanks to Ossama Othman
-          <ossama@dre.vanderbilt.edu> for pointing out this
-          oversight.
-
-Fri Aug 27 14:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/ORT/ORT.mpc:
-          Added iorinterceptor as base of the server project
-
-        * orbsvcs/examples/ORT/Object_Factory_i.cpp:
-          Commented out some code that uses a non portable way of getting
-          the ORT Factory, this now doesn't work anymore. I am working on
-          changing this example so that it works again, but for a day or so
-          comment out the incorrect code so that we get green build results
-          again
-
-Fri Aug 27 10:19:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Security.mpc:
-          SecurityLevel3.idl uses valuetype, so add valuetype as base
-          project.
-
-Fri Aug 27 09:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Concurrency/CC_command.cpp:
-          Added #include "ace/Log_Msg.h"
-
-Fri Aug 27 01:12:59 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/ORB_Table.h:
-
-          No need to include "tao/corbafwd.h".
-
-        * tao/TC_Constants_Forward.h:
-
-          Added missing "tao/TAO_Export.h" include.
-
-Fri Aug 27 08:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Integrated ORTrefactor_2 branch into main. Previously the
-        PortableServer library was dependent on IORInterceptor,
-        ObjRefTemplate and Valuetype, this dependency has been
-        removed. PortableServer doesn't use these libs anymore, but
-        IORInterceptor, ObjRefTemplate and Valuetype are now dependent on
-        PortableServer. This will reduce the size of corba servers which
-        don't use IORInterceptor, ObjRefTemplate and Valuetype.
-
-        * tao/Makefile.am:
-          Updated for changes below.
-
-        Fri Aug 27 06:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp (ORT_adapter_i):
-          Readded the check whether ort_adapter_ is not null, we call this
-          method from _i methods and we need this check for that invocation
-          path
-
-        Thu Aug 26 17:07:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp:
-        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h:
-        * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp:
-        * tao/PortableServer/POA.cpp:
-        * tao/PortableServer/POA.i:
-        * tao/PortableServer/PortableServer.pidl:
-
-          Cosmtic changes after a review.
-
-        Thu Aug 26 13:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.cpp:
-          Fix for emulated exceptions builds
-
-        Thu Aug 26 13:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.{h,cpp,i}:
-        * tao/IORInterceptor/IORInfo.cpp:
-        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp:
-        * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp:
-          Fixes for emulated exceptions builds
-
-        Thu Aug 26 09:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp:
-          Changed invoke_key_to_helper to invoke_key_to_helper_i, this is
-          always called from _i methods, and also use then
-          ORT_adapter_i instead of ORT_adapter
-
-        Thu Aug 26 08:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.{h,cpp,i}:
-          Shorted some method names, also added a get_adapter_template_i()
-          with which I can try to get an ORT Adapter without that it tries to
-          grep the POA lock, we also have the lock in destroy_i() and we can't
-          grep it another time because it is non recursive.
-
-        Wed Aug 25 13:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp (object_reference_template_adapter):
-          When we don't have a adapter, first see if we have a factory before
-          locking the POA, in case we then get called from POA::destroy_i()
-          and we don't have an adapter and not factory we don't grep the lock
-          and don't get a deadlock, have to solve this better, but this way I
-          can continue testing
-
-        Wed Aug 25 12:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.cpp (ior_interceptor_adapter):
-          Added ACE_CHECK_RETURN after the ACE_ENDTRY as last check for
-          uncaught exceptions
-
-        * tao/PortableServer/POA.cpp (object_reference_template_adapter):
-          Changed logic that when adapter_name_i fails we don't have a not
-          activated adapter. The guard here seems to cause a problem on Linux
-
-        Wed Aug 25 12:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.i:
-          Added missing returns statements
-
-        Wed Aug 25 12:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp (object_reference_template_adapter):
-          Fixed for emulated exception case
-
-        Wed Aug 25 10:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.i:
-          Removed the throw from get_obj_ref_factory() and
-          get_adapter_template() when we can't retrieve these, exceptions
-          are already thrown in the IORInterceptor and we call the
-          get_adapter_template() also from the POA and we don't want to have
-          an exception then.
-
-        * tao/PortableServer/POA.cpp:
-          In the destroy_i() check whether get_adapter_template() doesn't
-          return zero, if it returns zero, then we don't have an
-          adapter_template, so don't add it to the array, this can happen when
-          we don't load the ORT library.
-          In the object_reference_template_adapter() method use a POA Guard
-          that doesn't check for closure, this method can be called by
-          destroy_i() when we don't have an ORT library loaded and then we
-          don't want to get an exception by the guard that we are closing
-
-        Tue Aug 24 14:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp (destroy_i):
-          Changed the logic of informing the IORInterceptors of state changed,
-          first iterate through all the child_poa's, set their state to
-          inactive and gather the ort adapters, then in one call inform all
-          IORInterceptors, then destroy the child poa's and as last step
-          destroy ourself and only notify that this poa has changed to
-          non_existent, each child POA will have done this already for itself.
-
-        Tue Aug 24 13:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ObjRefTemplate/ORT_Adapter_Impl.{h,cpp}
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.{h,cpp}
-        * tao/PortableServer/ORT_Adapter.h:
-        * tao/PortableServer/POA.cpp:
-          Instead of passing and storing a TAO_POA*, pass a
-          PortableServer::POA_ptr, duplicate that and store it in a
-          PortableServer::POA_var. At the moment the ORT adapter is then
-          destructed we automatically drop the refcount on the POA and we
-          don't have the risk the POA is destructed before the ORT adapter is
-          destructed. There is no need anymore then for the poa() method to
-          set the TAO_POA* to zero.
-
-        Tue Aug 24 12:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp:
-          Added todo with activation of ort_adapter because we hold the lock
-          there
-
-        Tue Aug 24 10:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        The ORTrefactor branch is now ORTrefactor_2 and the compile archive is
-        branched now.
-
-        * tests/Abstract_Interface/Abstract_Interface.mpc:
-          Added missing base projects
-
-        * tests/ORT/ORT.mpc:
-        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc:
-        * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc:
-          Added missing base projects and removed not needed idlflags
-
-        * tao/PortableServer/*C.i:
-          Renamed all generated .i files to .inl
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_*.*:
-          Renamed all to ORT_*.*, moved classes to TAO namespace and shortened
-          classnames
-
-        * tao/PortableServer/POA.h:
-          Make TAO_IORInfo a friend and make the methods that this class needs
-          protected instead of public.
-
-        * tao/Messaging.mpc:
-          Messaging is dependent on valuetype
-
-        Mon Aug 23 18:33:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/Thread_Per_Connection_Handler.cpp:
-
-          Fixed a compile error with the latest version of ACE. This has
-          been fixed in the main trunk.
-
-        * tao/IORInterceptor/IORInterceptor_List.cpp:
-        * tao/IORInterceptor/IORInterceptor_List.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.inl:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.inl:
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.cpp:
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.h:
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h:
-        * tao/PortableServer/POA.cpp:
-        * tao/PortableServer/POA.h:
-
-          Added a number of comments and suggestions for Johnny. The
-          significant among them are:
-
-          - adding implementations in the TAO namespace. The TAO_* naming
-            should be killed.
-
-          - Make the names of the classes and file names shorter. The
-            existing makes things harder to read and find the relation
-            ships. I have done a few. I have left the rest for Johnny as
-            homework :-)
-
-        Mon Aug 23 12:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor/IORInterceptor_List.cpp:
-          When copying the array into the sequence to an add_ref on each of
-          array members. Have to look a little bit more at this, but now the
-          tests doesn't crash, but I think I maybe have a leak now somewhere.
-
-        Fri Aug 20 14:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POAManager.cpp:
-          Corrected the variable to be passed
-
-        Fri Aug 20 12:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableInterceptor.pidl:
-        * tao/IORInterceptor/IORInfo.pidl:
-          Moved AdapterState constants from IORInfo to PortableInterceptor
-          file
-
-        * tao/PortableInterceptorC.h:
-        * tao/IORInterceptor/IORInfoC.{h,cpp,inl}:
-          Updated these files with changes above
-
-        * tao/PortableServer/POA.cpp:
-        * tao/PortableServer/POAManager.cpp:
-          No need anymore to include IORInfoC.h to get AdapterState constants
-
-        Fri Aug 20 12:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.{h,cpp}:
-          Include PI_ForwardC.h in header file, and PortableInterceptorC.h in
-          the cpp file.
-
-        Fri Aug 20 12:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp:
-          Removed some commented out code and removed comment after include of
-          IORInfoC.h, no good idea yet how to prevent this
-
-        Fri Aug 20 12:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POAManager.cpp:
-          Removed not needed include of Interceptor_List
-
-        Fri Aug 20 11:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor.mpc:
-          IORInterceptor is now dependent on PortableServer
-
-        * tao/IORInterceptor_Adapter.h:
-          Added several new pure virtual methods that must be implemented by
-          the real adapter implementations
-
-        * tao/ORB_Core.{h,cpp}:
-          Removed ior_interceptor_list(), make ior_interceptor_adapter()
-          public, the POA will just retrieve the ior_interceptor_adapter from
-          the ORB core and will use it then from then.
-
-        * tao/PortableServer.mpc:
-          PortableServer is not dependent on IORInterceptor anymore.
-
-        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
-          Initialise pointer with 0.
-
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.{h,cpp}:
-          Implemented new pure virtual methods from the base, this code was
-          previously in the POA, but couples the POA to the IORInterceptor, by
-          moving it here we can decouple it
-
-        * tao/PortableServer/POA.cpp:
-        * tao/PortableServer/POAManager.cpp:
-          Instead of handling IORInterceptors here, just try to retrieve the
-          IORInterceptor adapter from the ORB Core and pass the call to the
-          adapter, this removes the dependency of the POA on IORInterceptor
-
-        * tao/PortableServer/IORInfo.{h,cpp,inl}:
-        * tao/IORInterceptor/IORInfo.{h,cpp,inl}:
-          Moved this class from PortableServer to IORInterceptor, because of
-          the changes above the usage of IORInfo is restricted to the
-          IORInterceptor library
-
-        Fri Aug 20 07:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor/IORInterceptor.pidl:
-        * tao/IORInterceptor/IORInfo.pidl:
-          Moved IORInfo interface to its own file
-
-        * tao/IORInterceptor/IORInterceptorC.{h,cpp,i}:
-          Regenerated
-
-        * tao/IORInterceptor/IORInfoC.{h,cpp,i}:
-          New generated files
-
-        * tao/PortableServer/IORInfo.h:
-          Include IORInfoC.h instead of IORInterceptorC.h
-
-        Thu Aug 19 17:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI_Forward.pidl:
-          Moved AdapterManagerId and AdapterState typedefs to this file
-
-        * tao/PI_ForwardC.{h,cpp,i,inl}:
-          Regenerated these files, replaced .i with .inl file
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
-          No need to include orb.idl, removed AdapterMangerId and
-          AdapterState, these moved to other places
-
-        * tao/ObjRefTemplate/Attic/ObjectReferenceTemplate_Adapter_Impl.cpp:
-          Added missing .in()
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.{h,cpp,i,inl}:
-          Regenerated these files, replaced .i with .inl file
-
-        * tao/PortableServer/POA.h:
-          Fixed include
-
-        * tao/PortableServer/POA_Manager.h:
-          No need to include ObjectReferenceTemplaceC.h now the typedefs are
-          in PI_Forward
-
-        * tao/IORInterceptor/IORInterceptor.pidl:
-          Moved AdapterState constants to this file
-
-        * tao/IORInterceptor/IORInterceptorC.{h,cpp,i,inl}:
-          Regenerated these files
-
-        * tao/diffs/ObjectReferenceTemplate.diff:
-          No diffs need to be applied anymore, so zapped this file
-
-        Wed Aug 18 13:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.h:
-          Removed some unneeded friends but had to make invoke_key_to_object
-          public because we now need it from the ORT library, friend doesn't
-          work anymore because it moved to a default servant we don't know
-          anything about in this library, any other ideas?
-
-        Wed Aug 18 12:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor/IORInterceptor.pidl:
-        * tao/IORInterceptor/IORInterceptorC.{h,cpp,i,inl}:
-          Regenerated these files, no need to apply patches anymore, and use
-          .inl file instead of .i files.
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.h:
-          Added typedef for a list of ORT Adapter pointers
-
-        * tao/IORInterceptor/IORInterceptor_List.{h,cpp}:
-          Removed typedef of array of ObjectReferenceTemplate*, include the
-          ORT Adapter header file instead
-
-        * tao/PorableServer.mpc:
-        * tao/ObjRefTemplate.mpc:
-          PortableServer library is not dependent on objreftemplate anymore
-          but objreftemplate is dependent on portableserver
-
-        * tao/ObjRefTemplate/ObjectReferneceTemplate_Adapter_Impl.{h,cpp,i}:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.{h,cpp,i}:
-          Split the adapter implementation and the ort_factory and
-          ort_template. The adapter creates a TAO_ObjectReferenceTemplate
-          which is a ort_template, which then also a ort_factory. The
-          ort_factory can be replaced using IORInfo, for the identity methods
-          the ort_template is used, until the ort_factory is changed from
-          outside the ort_template is used, after that the new set one.
-
-        Tue Aug 17 14:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-          Checkin of rework until now, not happy with the interfaces yet, now
-          the test app seems to work a little, I am going to review all
-          changed interfaces again and improve things.
-
-        * tao/POA.{h,cpp}:
-          - Changed adapter_state_changed to use IORInterceptor_List
-          functionality to call adapter_state_changed on all IORInterceptors
-          - Changed access of some methods
-        * tao/IORInfo.cpp:
-          Commented out some add_refs on the ORT, this should be done in the
-          ORT Adapter. Need to check this
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory.{h,cpp}:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Impl.{h,cpp,inl}:
-          New files with first implementation
-
-        Tue Aug 17 13:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor/IORInterceptor_List/{h,cpp}:
-          Added adapter_state_changed, this gets a normal
-          TAO_ObjectReferenceTemplate_Array, converts this into a corba
-          sequence and calls adapter_state_change for each interceptor.
-
-        * tao/PortableServer/diffs/Default_ORT.diff:
-          Zap this file
-
-        Tue Aug 17 10:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.h:
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h:
-          Corrected export macro
-
-        Tue Aug 17  90:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.cpp:
-          Fixed incorrect include
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.h:
-          - Added adapter_name as constructor argument
-          - Added destroy() method, called by POA when this adapter is not
-          needed anymore, adapter must do its own cleanup
-          - Added activate() method with just a ORT* to activate the adapter
-          with an existing factory.
-          - Added get_adapter_template and get_obj_ref_factory to get the real
-          servant, this is needed for the IORInterceptors
-
-        * tao/PortableServer/POA.{h,cpp,i}:
-          - Added invoke_key_to_object_helper() which will check for the ORT and
-          if available will call that or will call invoke_key_to_object
-          instead.
-          - Added object_reference_template_adapter() which will check
-          ir an ORT Adapter is already available, if not, tries to get an
-          ORT Adapater Factory, if that is available, create a new ORT
-          Adapter.
-          - Added some doxygen grouping to group methods belonging to each other
-          in one doxygen group.
-          - Added ort_adapter_ member to store the ORT Adapter when we have
-          retrieved one.
-          - Removed set_adapter_template() from the header file, there is no
-          implementation of this method and it is not needed
-          - Added TAO_POA_Static_Resources to store the name of the ORT factory,
-          used the TAO_ORB_Core_Static_Resources but I didn't it put it there
-          because the ORB_Core doesn't need to know anything or ORT.
-          - Removed old ort_template, def_ort_template and obj_ref_factory and
-          its usage.
-
-        * tao/PortableServer/Default_ORT*.*:
-        * tao/PortableServer/ObjectReferenceTemplate.{h,cpp,i}:
-          Removed these files, default ORT implementation is now in the ORT
-          library
-
-        Fri Aug 13 18:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.{h,cpp}
-          New file with base calss for ORT Adapters
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter_Facotry.{h,cpp}
-          New file with base calss for ORT Adapter factories
-
-Fri Aug 27 00:25:47 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/ORB_Constants.h:
-
-          No need to include "tao/TAO_Export.h".
-
-          (CORBA::OMGVMCID):
-
-          Added documentation about how and when to use this constant.
-
-          (TAO_DEFAULT_MINOR_CODE, TAO_MAX_MINOR_CODE):
-
-          Deprecated these constants.  They have been replaced with
-          counterparts in the TAO namespace, as described below, but still
-          exist in order to maintain backward compatibility for a
-          reasonable amount of time.
-
-          Added documentation that details how TAO_DEFAULT_MINOR_CODE is
-          often misused.
-
-          (TAO::VMCID):
-
-          New constant in the TAO namespace that replaces
-          global namespace constant TAO_DEFAULT_MINOR_CODE.  The latter
-          constant name was not very descriptive about what the constant
-          represents.  "TAO::VMCID" is improves on that, and is also more
-          consistent with OMG naming conventions.
-
-          (TAO::MAX_MINOR_CODE):
-
-          Moved the global namespace TAO_MAX_MINOR_CODE constant into the
-          TAO namespace to be consistent with the above TAO::VMCID
-          change.
-
-          Added documentation that makes it obvious how this constant is
-          determined.  Previously, a "magic number" was assigned to this
-          constant (actually TAO_MAX_MINOR_CODE).  This constant is now
-          defined in terms of TAO::VMCID.
-
-          (TAO::VPVID):
-
-          New TAO namespace constant that is TAO's OMG assigned Vendor
-          PolicyType Valueset ID (VPVID).  This constant is the same as
-          the VMCID, and is automatically assigned by the OMG in this
-          manner when a VMCID is reserved for a given vendor (i.e TAO /
-          DOC group in this case).  Please refer to the documentation for
-          this constant when creating new TAO-specific CORBA::PolicyType
-          values.
-
-        * tao/Exception.cpp:
-
-          Use new TAO::VMCID instead of the deprecated
-          TAO_DEFAULT_MINOR_CODE constant.
-
-        * tao/CORBA.pidl:
-
-          Removed this file.  It has been deprecated for at least four
-          years.
-
-        * tao/Invocation_Endpoint_Selectors.cpp:
-        * tao/Profile_Transport_Resolver.cpp:
-
-          Corrected grammar in a comment.
-
-        * tao/Policy_Forward.pidl:
-
-          Added a "-*- IDL -*-" Emacs mode comment to this file so that we
-          can automatically get some syntax highlighting and automatic
-          indenting.
-
-        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
-
-          Corrected minor codes passed to CORBA::SystemException
-          constructors.  They were not logically OR-ed with the
-          CORBA::OMGVMCID constant.
-
-Fri Aug 27 00:03:51 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/AV/Makefile.am:
-        * orbsvcs/orbsvcs/Concurrency/Makefile.am:
-        * orbsvcs/orbsvcs/CosEvent/Makefile.am:
-        * orbsvcs/orbsvcs/Event/Makefile.am:
-        * orbsvcs/orbsvcs/Naming/Makefile.am:
-        * orbsvcs/orbsvcs/Property/Makefile.am:
-        * orbsvcs/orbsvcs/Sched/Makefile.am:
-        * orbsvcs/orbsvcs/Time/Makefile.am:
-        * orbsvcs/orbsvcs/Trader/Makefile.am:
-
-          Removed.
-
-        * orbsvcs/tests/Concurrency/CC_naming_service.cpp:
-        * orbsvcs/tests/Concurrency/CC_test_utils.cpp:
-        * orbsvcs/tests/Concurrency/CC_tests.cpp:
-        * orbsvcs/tests/Time/client.cpp:
-
-          Changed to #include "ace/Log_Msg.h"
-
-        * examples/RTScheduling/Starter.h:
-        * examples/Simple/Simple_util.h:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h:
-        * orbsvcs/tests/Sched_Conf/Sched_Conf.cpp:
-
-          Changed #include "orbsvcs/Naming/Naming_Utils.h" to #include
-          "orbsvcs/Naming/Naming_Client.h" and
-          "orbsvcs/Naming/Naming_Server.h".
-
-        * examples/Callback_Quoter/Notifier_Input_Handler.h:
-        * examples/Event_Comm/Notifier_Server.h:
-        * examples/Logging/Logging_Service_i.h:
-        * examples/Quoter/server.h:
-        * orbsvcs/Concurrency_Service/Concurrency_Service.h:
-        * orbsvcs/Naming_Service/Naming_Service.h:
-        * orbsvcs/Time_Service/Clerk_i.h:
-        * orbsvcs/Time_Service/Server_i.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Loader.h:
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h:
-        * orbsvcs/tests/Redundant_Naming/client.cpp:
-        * orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp:
-        * orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp:
-        * utils/NamingViewer/NamingViewerDlg.cpp:
-        * utils/wxNamingViewer/wxNamingViewerFrame.cpp:
-
-          Changed #include "orbsvcs/Naming/Naming_Utils.h" to #include
-          "orbsvcs/Naming/Naming_Server.h".
-
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h:
-        * orbsvcs/examples/Callback_Quoter/Consumer_Handler.h:
-        * orbsvcs/examples/Callback_Quoter/Supplier_i.h:
-        * orbsvcs/examples/CosEC/Factory/FactoryDriver.h:
-        * orbsvcs/examples/Event_Comm/Consumer_Handler.h:
-        * orbsvcs/examples/Event_Comm/Notifier_Handler.h:
-        * orbsvcs/tests/AVstreams/Asynch_Three_Stage/Connection_Manager.h:
-        * orbsvcs/tests/AVstreams/Bidirectional_Flows/receiver.h:
-        * orbsvcs/tests/AVstreams/Bidirectional_Flows/sender.h:
-        * orbsvcs/tests/AVstreams/Component_Switching/Connection_Manager.h:
-        * orbsvcs/tests/AVstreams/Full_Profile/server.h:
-        * orbsvcs/tests/AVstreams/Modify_QoS/receiver.h:
-        * orbsvcs/tests/AVstreams/Modify_QoS/sender.h:
-        * orbsvcs/tests/AVstreams/Multicast/ftp.h:
-        * orbsvcs/tests/AVstreams/Multicast/server.h:
-        * orbsvcs/tests/AVstreams/Multicast_Full_Profile/ftp.h:
-        * orbsvcs/tests/AVstreams/Multicast_Full_Profile/server.h:
-        * orbsvcs/tests/AVstreams/Multiple_Flows/receiver.h:
-        * orbsvcs/tests/AVstreams/Multiple_Flows/sender.h:
-        * orbsvcs/tests/AVstreams/Pluggable/ftp.h:
-        * orbsvcs/tests/AVstreams/Pluggable/server.h:
-        * orbsvcs/tests/AVstreams/Pluggable_Flow_Protocol/receiver.h:
-        * orbsvcs/tests/AVstreams/Pluggable_Flow_Protocol/sender.h:
-        * orbsvcs/tests/AVstreams/Simple_Three_Stage/distributer.h:
-        * orbsvcs/tests/AVstreams/Simple_Three_Stage/receiver.h:
-        * orbsvcs/tests/AVstreams/Simple_Three_Stage/sender.h:
-        * orbsvcs/tests/AVstreams/Simple_Two_Stage/receiver.h:
-        * orbsvcs/tests/AVstreams/Simple_Two_Stage/sender.h:
-        * orbsvcs/tests/AVstreams/Simple_Two_Stage_With_QoS/receiver.h:
-        * orbsvcs/tests/AVstreams/Simple_Two_Stage_With_QoS/sender.h:
-        * orbsvcs/tests/Concurrency/CC_naming_service.h:
-        * orbsvcs/tests/Property/client.h:
-        * orbsvcs/tests/Property/server.h:
-        * orbsvcs/tests/Simple_Naming/client.h:
-        * orbsvcs/tests/Time/Client_i.h:
-        * examples/Logging/Logging_Test_i.h:
-        * performance-tests/POA/Demux/demux_test_server.h:
-
-          Changed #include "orbsvcs/Naming/Naming_Utils.h" to #include
-          "orbsvcs/Naming/Naming_Client.h".
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Updated.
-
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-
-          Changed Naming_Utils.{cpp,h} to Naming_{Client,Server}.{cpp,h}.
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.h:
-
-          Removed files.
-
-        * orbsvcs/orbsvcs/Naming/Naming_Client.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Client.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Server.h:
-
-          New files, split out from Naming_Utils.cpp and Naming_Utils.h so
-          that it is possible to have client and server side libraries.
-
-Thu Aug 26 22:54:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Current.pidl:
-
-          Added #ifndef guard, as was done with GIOP.idl in:
-          Thu Aug 26 22:54:35 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Thu Aug 26 22:48:26 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * Makefile.am:
-        * configure.ac:
-
-          Changed to enable building utils directory.
-
-        * utils/Makefile.am:
-        * utils/catior/Makefile.am:
-        * utils/nslist/Makefile.am:
-
-          New files, built with a little help from MPC.
-
-Thu Aug 26 22:46:24 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Fixed tipo I introduced when adding Shutdown_Utilities.cpp.
-
-Thu Aug 26 22:54:35 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/GIOP.pidl:
-
-          Added missing #ifndef guard around the file. With recent
-          changes that have tightened up redefinition checking in
-          reopened modules, we were getting a redefinition error
-          from GIOP.pidl being included in FT_CORBA_ORB.idl by
-          two different paths and having no protection from the
-          #ifndef guard. Thanks to J.T. Conklin <jtc@acorntoolworks.com>
-          for reporting the problem.
-
-Thu Aug 26 20:19:19 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Added back includedir definition that got lost in a previous
-          edit.
-
-Thu Aug 26 22:07:30 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be_include/be_visitor_amh_pre_proc.h:
-        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
-
-          Removed the overridden visit_scope() method. It does
-          nothing different from the be_visitor_scope base class
-          method. This closes [BUGID:1882].
-
-Thu Aug 26 18:58:22 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_is.cpp:
-
-          Fixed code generation in implementation files for local
-          interfaces. Changes include:
-
-          - inheritance from TAO_Local_RefCounted_Object instead
-            of PortableServer::ServantBase.
-
-          - no copy constructor generated.
-
-          - tao/LocalObject.h included if local interface is seen.
-
-        This fix closes [BUGID:1871].
-
-Thu Aug 26 18:11:09 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
-
-          Changed the minor code of a BAD_PARAM exception to 3
-          (local name clash) from its incorrect value of 5
-          (inherited name clash).
-
-Thu Aug 26 16:37:29 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * interop-tests/wchar/interop_wchar.idl:
-        * interop-tests/wchar/interop_wchar_i.h:
-        * interop-tests/wchar/interop_wchar_i.cpp:
-        * interop-tests/wchar/Client.java:
-        * interop-tests/wchar/WChar_PasserImpl.java:
-          Modified to test interoperability test JDK 1.4x ORB.
-          The JDK ORB has trouble marshaling wide character strings
-          when they are embedded in structures.
-          This revised test reveals the problem so the solution
-          can be tested.
-          Declare/implement methods to send and receive wide
-          character strings in structures and validate the
-          results.
-          Remove explicit references to JACOrb.
-
-        * interop-tests/wchar/Server.java:
-          Honor -o option rather than using argv[1] as IOR filename.
-
-
-Thu Aug 26 16:29:53 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
-
-          Changed the check for generating _add_ref(), _remove_ref(),
-          and _tao_to_value() for valuetypes from support of
-          abstract interface(s) to support for any interface(s).
-          For the first two methods, the generation is done to avoid
-          their ambiguous inheritance. One source of inheritance
-          is CORBA::ValueBase, and the other could be CORBA::Object,
-          or CORBA::AbstractBase, or both. The third method is
-          generated to extract a valuetype from an abstract
-          interface, if it was passed by value. A valuetype could
-          support a concrete interface that inherits from an
-          abstract one, so again the method is necessary even if
-          the valuetype supports a concrete interface.
-
-Thu Aug 26 15:46:36 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_component.cpp:
-        * TAO_IDL/ast/ast_home.cpp:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_valuetype.cpp:
-        * TAO_IDL/include/ast_component.h:
-        * TAO_IDL/include/ast_home.h:
-        * TAO_IDL/include/ast_interface.h:
-        * TAO_IDL/include/ast_valuetype.h:
-        * TAO_IDL/include/utl_scope.h:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Made UTL_Scope::look_in_inherited() virtual and a no-op,
-          while adding overrides to the appropriate AST_* classes.
-          Also added a no-op look_in_supported() to UTL_Scope,
-          and overrides where appropriate. Modified code in
-          UTL_Scope::lookup_by_name() to call these new methods,
-          and removed the check for node type, which is no longer
-          needed. Thanks to Boris Kolpackov <boris@dre.vanderbilt.edu>
-          for providing the IDL example that (legally) references
-          by local name things declared in supported interfaces,
-          base valuetypes, base components and base homes. This
-          closes [BUGID:1706].
-
-Thu Aug 26 13:48:31 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_module.cpp:
-        * TAO_IDL/include/ast_module.h:
-        * TAO_IDL/include/utl_scope.h:
-
-          Specialized the referenced() method for modules to
-          catch redefinitions in a reopened module. Thanks to
-          Boris Kolpackov <boris@dre.vanderbilt.edu> for reporting
-          this bug. This fixed closes [BUGID:1695].
-
-Thu Aug 26 12:37:45 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_check_for_include):
-
-          Added check for .pidl file included as a local filename.
-          Because of lookup quirks necessary for orb.idl, the
-          above case will also be found, even without a proper
-          -I option, but the generated C++ include will be incorrect.
-          So we add the necessary path to the .pidl filename before
-          it is stored for later validation and code generation.
-          This closes [BUGID:1608].
-
-Thu Aug 26 11:22:51 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/Abstract_Interface/Abstract_Interface.mpc:
-
-          Changed dependencies in the client project, and added
-          explicit file lists to both projects.
-
-Thu Aug 26 10:38:49 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
-
-          Fix fuzz build complaints about returning 'int' rather than
-          'bool' from operator== and operator!=.
-
-Thu Aug 26 10:17:45 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-
-          Fixed incorrect generation of base classes for C++ classes
-          mapped from valuetypes, to include only the immediate
-          supported abstract interfaces rather than the entire
-          graph of supported abstract interfaces.
-
-Thu Aug 26 00:17:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Added Shutdown_Utilities.cpp to Svc_Util libraries sources.
-
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
-
-          Removed -Gv from IDL compiler flags.
-
-Wed Aug 25 16:03:29 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/Naming_Service/Naming_Server.cpp:
-        * orbsvcs/Naming_Service/Naming_Service.cpp:
-        * orbsvcs/Naming_Service/Naming_Service.h:
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp:
-        * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
-        * orbsvcs/orbsvcs/Shutdown_Utilities.h:
-        * orbsvcs/orbsvcs/Svc_Utils.mpc:
-        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
-        * utils/nslist/nsadd.cpp:
-        * utils/nslist/nsdel.cpp:
-
-          Integrated many memory leak fixes for the Naming Service
-          originally done in OCITAO 1.3a.  All relevant original changelog
-          entries are below:
-
-        Thu Jul 22 11:31:30 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * utils/nslist/nsdel.cpp (main):
-
-                  Added a new option, --destroy, that can be used to destroy the
-                  specified context after the unbind.  If the context is unbound
-                  but not destroyed using "nsdel", then the context will leak
-                  within the Naming Service because no NS client will be able to
-                  resolve() to get a reference to it again.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (TAO_Storable_Naming_Context::DTOR):
-
-                  Corrected a problem where the file that acts as persistent
-                  backing store for context information didn't get removed when
-                  the context had been destroyed via the "destroy()" operation.
-                  This should address [RT 4221].
-
-        Wed Jul  7 15:41:33 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (TAO_Naming_Server):
-                  Made deletion of servant_activator_ conditional on the
-                  use_servant_activator_ member variable, since servant_activator_
-                  should only have a value when use_servant_activator_ is true.
-                  For safety sake, however, we now also explicitly initialize
-                  servant_activator_ to zero.
-
-                  This should fix scoreboard problems on tests that instantiate a
-                  TAO_Naming_Server directly in their code rather than starting up
-                  a naming service executable, such as TAO/examples/Simple/grid.
-
-        Fri Jul  2 10:16:06 2004  Rich Seibel <seibel_r@ociweb.com>
-
-                * utils/nslist/nsadd.cpp:
-                  Integrated change from Dave Knox at Intrado Inc. to add the
-                  ability to add a new context to the Naming Service.
-                  At the same time, I pulled over the DOC group change to
-                  automatically add any intermediate contexts.  RT4014.
-
-                * utils/nslist/runtest.pl:
-                  New test added to test the ability to use the above.
-
-        Wed Jun 30 12:29:50 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (File_Open_Lock_and_Check::File_Open_Lock_and_Check):
-                  Added an else clause to delete the file returned from
-                  create_stream in case none of the other branches were executed.
-                  This eliminates a continuous leak seen only using the "-u"
-                  option on the Naming Service.
-
-        Wed Jun 30 12:29:18 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
-                  (TAO_Naming_Server::DTOR): Added an explicit delete for the
-                  servant_activator_.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
-                  (ServantActivator): Eliminated the inheritance from
-                  TAO_RefcountedLocalObject.  The inheritance was placed there
-                  with the thought that the servant would be reference counted
-                  and, thus, its lifecycle magically managed.  Empirical evidence
-                  shows otherwise, so we have these two changes.  This eliminates
-                  a one-time 88 byte or so leak when running the Naming Service
-                  with flat file persistence.
-
-        Mon Jun 21 16:43:06 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: Forgot to
-                  update this when I did the entry below.
-
-        Mon Jun 21 12:17:35 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
-                  (TAO_Storable_Naming_Context):
-                * tao/ORB_Core.{h,cpp} (instance_):
-
-                  Changed use of auto_ptr<> to ACE_Auto_Ptr<> to avoid
-                  compatibility problems on VC6 platforms.
-
-        Sun Jun 20 09:34:46 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: More tweaks in
-                  various places to use *_var's in() method in order to de-warn
-                  about ambiguous conversions on certain compilers.
-
-                * orbsvcs/tests/ImplRepo/NameService/run_test.pl: Increaed the
-                  waitforfile_timed timeout value so the test could succeed on
-                  slow/overloaded nightly build platforms.
-
-        Sat Jun 19 00:21:28 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (~TAO_Storable_Naming_Context): Sigh...removed code residue from
-                  debugging the problem below that was causing rampant breakage on
-                  any platform that wasn't glibc-based.
-
-        Fri Jun 18 17:34:22 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (~TAO_Storable_Naming_Context): Got rid of the call to remove
-                  the file.  Having the remove in here broke persistence when all
-                  the memory leaks got fixed, because upon destruction it would
-                  end up removing the file for the context.  This should fix the
-                  failures of the persistent variant of the Simple_Naming test.
-
-                  A point worth noting is that I originally thought that the
-                  remove() needed to be moved into a different, new method so that
-                  when a context got unbound the file would get properly removed.
-                  While I can find no place in the code where an unbind calls the
-                  equivalent of remove(), anecdotal evidence shows that, indeed,
-                  the files get removed at unbind time, and everything works the
-                  way it's supposed to.  Mysterious...
-
-        Fri Jun 18 13:52:07 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/IOR_Multicast.cpp (~TAO_IOR_Multicast): Changed
-                  to use the leave() method, since apparently *all* unsubscribe
-                  methods are deprecated.
-
-        Fri Jun 18 13:34:01 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: Tweaks in
-                  various places to use the ORB_var's in() method in order to
-                  de-warn on gcc 3.2.
-
-                * orbsvcs/orbsvcs/IOR_Multicast.cpp (~TAO_IOR_Multicast):
-                  Eliminated use of deprecated unargumented unsubscribe() call,
-                  and use the correct calls instead.  This should get rid of the
-                  deprecation message printed out when the naming service
-                  terminates, which was also upsetting the Simple_Naming test
-                  output processing script (see below).
-
-                * orbsvcs/Naming_Service/Naming_Server.cpp (operator()): Made the
-                  message only get printed out when the debug level is turned on.
-                  Seems that the multithreaded version of the Simple_Naming test
-                  was seeing this message, not expecting it, and declaring that
-                  the test had failed.
-
-        Thu Jun 17 18:30:52 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/Naming_Service/Naming_Service.cpp (fini): Add call to
-                  the naming server object's fini method so things get properly
-                  removed/deallocated.
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (fini): Moved code that
-                  was in the destructor into here in order to parallel the
-                  allocation of things occurring in the init*() methods.
-
-                  Also changed to get the reactor through orb->orb_core() rather
-                  than TAO_ORB_Core_instance(), which is old and decrepit.
-
-                  Hopefully this fixes core dumps on exit when using "-m 1".
-
-        Tue Jun 15 17:34:42 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (DTOR):
-
-                  Removed the delete of the servant activator.  Turns out that
-                  reference-counting the servant activator was enough.  This
-                  should fix a core dump observed in the nightly builds on exit
-                  from the Naming Service.
-
-        Mon Jun 14 13:56:22 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (init_with_orb):
-
-                  Fixed message printed in exception so that it has the correct
-                  class name.
-
-        Mon Jun 14 12:22:03 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                  Corrected a bunch of memory leaks throughout the naming
-                  service.  Details below...
-
-                * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp (close):
-
-                  Properly close the flat file to reclaim memory allocated in the
-                  system's stdio library.
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (init_with_orb):
-
-                  Use auto_ptr<> to hold the persistence factory so that it gets
-                  properly cleaned up.
-
-                  The servant activator accepts and holds on to a pointer to the
-                  persistence factory.  However, we don't always create a servant
-                  activator.  We need to use auto_ptr<> over the persistence
-                  factory to insure proper cleanup in the case of an exception or
-                  in the case where we don't use use servant activator, so the
-                  code is a little goofy, and we end up releasing the pointer from
-                  the auto_ptr<> if the servant activator's in use.
-
-                  There's probably a better way to handle this, such as reference
-                  counting, but I wanted going for the minimal thing that worked.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.*:
-
-                  Refined the role of the activator with regard to ownership of
-                  and responsibility for managing the persistence factory--the
-                  activator is now responsible for cleaning up the persistence
-                  factory.
-
-                  The destructor now performs its duty.
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (init_new_naming):
-
-                  Change to hold the heap-allocated servant activator in a data
-                  member rather than a local so that we can clean it up when we're
-                  finished rather than just leak it.
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (DTOR):
-
-                  Make sure everything gets cleaned up.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
-
-                  Discontinued use of the TAO_Persistent_*Id classes.  These
-                  classes were designed and implemented to be used with the
-                  Persistent store, which is memory-mapped.   Therefore, they
-                  assume that some external entity will be doing any and all
-                  dynamic allocations, and that they should do none lest they
-                  screw it up.
-
-                  We now have analogous TAO_Storable_*Id classes which DO assume
-                  responsibility for managing their dynamically-allocated memory.
-                  For the moment, since they are not used anywhere except within
-                  the Storable_Naming_Context, they do not have their own files.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.* (gfl_):
-
-                  Wrap in an auto_ptr<> so that the stream gets properly destroyed
-                  at the proper time and doesn't leak.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (shared_bind):
-
-                  Capture the return from object_to_string in a String_var to
-                  eliminate a leak.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp (DTOR):
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp (recreate_all):
-
-                  Use an auto_ptr<> to capture the values returned from
-                  create_stream() so that they get properly destroyed.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h (TAO_Storable_Bindings_Map):
-
-                  Hold the ORB reference in a _var rather than a _ptr so it gets
-                  properly refcounted.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
-
-                  Mixed-in TAO_Local_RefCounted_Object hoping that the POA called
-                  the reference-counting methods, and, thus, it would insure that
-                  the POA would manage the activator's instance automagically.
-                  Alas, this didn't appear to work, but I can't see any harm in
-                  leaving this in for now.
-
-        Mon Jun 14 12:06:45 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/Naming_Service/Naming_Service.*:
-
-                  Added a fini() method to clean up resources acquired/allocated
-                  in the init*() methods.  The onus is on the application to call
-                  fini(), however.
-
-                * orbsvcs/Naming_Service/Naming_Server.cpp (main):
-
-                  Added call to new fini() method to insure proper cleanup.
-
-        Mon Jun  7 11:13:44 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
-
-                  Defined our own TAO_ORBSVCS_MAXSIG as "one plus the largest
-                  signal number to which we pay attention", rather than using
-                  SIGRTMIN.  This should be portable across all platforms.
-
-                  Bracketed use of actual signal names in the convenience CTOR by
-                  ACE_LACKS_UNIX_SIGNALS so that non-Unix platforms actually
-                  compile.
-
-        Fri Jun  4 16:16:02 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Shutdown_Utilities.h:
-                * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
-                * orbsvcs/orbsvcs/Svc_Utils.mpc:
-
-                  Added a new utility class to the Svc_Utils library that makes it
-                  easy to have a service propertly shut itself down in response to
-                  a signal.  The motivation for this was an apparent memory leak
-                  in the Naming Service and the desire to use purify-like tools to
-                  diagnose.  However, the service never shut itself down properly,
-                  so purify would not produce a leak report.
-
-                * orbsvcs/Naming_Service/Naming_Service.h (shutdown):
-                * orbsvcs/Naming_Service/Naming_Service.cpp (shutdown):
-
-                  Added a new method to shut down the Naming Service.
-
-                * orbsvcs/Naming_Service/Naming_Server.cpp:
-
-                  Added code to use the new shutdown utility classes to gracefully
-                  shut down the naming service.
-
-Wed Aug 25 15:06:35 2004  Rich Seibel <seibel_r@ociweb.com>
-
-        * examples/PluggableUDP/tests/SimplePerformance/client.cpp:
-        The test does an FPE if the time measured is smaller than
-        the resolution of the Hi-Res timer.  It now tests for zero
-        elapsed time and does not try to divide by zero.
-
-Wed Aug 25 11:24:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp:
-
-          Include <openssl/{x509,rsa,dsa,dh}.h to pull in OpenSSL function
-          prototypes used in this file.  Fixes compile-time problems that
-          occur when using older versions of OpenSSL.  Thanks to Chris
-          Cleeland for pointing this out.
-
-Wed Aug 25 13:11:39 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
-
-          Fixed newline formatting of generated code.
-
-Wed Aug 25 09:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
-          Added missing sys in the include path of my change below
-
-Wed Aug 25 07:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
-          Instead of including sys/loadavg.h, include
-          ace/os_include/os_loadavg.h
-
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
-          Instead of including sys/loadavg.h, include
-          ace/os_include/os_loadavg.h. Added include of os_pstat.h to fix
-          compile error on HPUX on Itanium
-
-Tue Aug 24 20:33:08 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/RTCORBA/RTMutex/server.cpp:
-
-          Changed test_mutex_try_lock to unlock mutex before releasing it.
-
-Tue Aug 24 16:09:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * docs/releasenotes/OBV.html:
-        * docs/releasenotes/index.html:
-
-          Updated documentation of valuetype support. See [Bug 1908].
-
-Tue Aug 24 08:53:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * docs/compiler.html:
-
-          Removed documentation of '-Sv' option. See [Bug 1908].
-
-Tue Aug 24 06:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc:
-          Added missing base project, removed not needed idlflags
-
-Mon Aug 23 23:27:01 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * Makefile.am (AUTOMAKE_OPTIONS):
-
-          Removed required Automake version from `Makefile.am'.
-          `configure.ac' already defines it.
-
-        * configure.ac (AM_INIT_AUTOMAKE):
-
-          Updated required version of Automake to 1.9.
-
-Mon Aug 23 21:40:36 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/Synch_Invocation.cpp:
-        * tao/Messaging/Asynch_Invocation.cpp:
-
-          Fixed a problem which used to make the client ORB hang when the
-          BiDirPolicy was set and a corbaloc URL was used. The problem
-          stemmed from the following
-
-          - The reply dispatcher was bound to the table with some
-            request ID.
-
-          - When the request header was generated, the request ID was
-            munged to be compliant with BiDir GIOP semantics.
-
-          - The request could possible be sent out with a different
-            request ID whose reply dispatcher could have been bounded with
-            a different ID.
-
-          The above made the client ORB hang. We now marshal the whole
-          request before we bind the dispatcher, which will get us the
-          right ID. This fixes the problem. After getting permissions from
-          Thomas Lockhart, I will checkin the test.
-
-          Thanks to Thomas Lockhart for reporting the problem.
-
-Mon Aug 23 20:36:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/Transport_Connector.cpp:
-
-          A simple programmatic error while trying to set the type of role
-          on the client caused a bunch of tests to fail. Many tests should be
-          going strong after this change.
-
-Mon Aug 23 06:40:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
-          Fixed incorrect usage of iterator, thanks to Sebastien Roy
-          <sroy@positron.qc.ca> for reporting this. This fixes bugzilla
-          id [1911].
-
-Sun Aug 22 10:04:33 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/DynamicAny.mpc:
-
-          Changed to not inherit from valuetype.
-
-Sun Aug 22 10:19:00 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Wait_On_LF_No_Upcall.cpp:
-          Fixed compile error with Borland compiler
-
-Sun Aug 22 09:44:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/util/utl_global.cpp:
-
-          Removed all support for '-Gv' and '-Sv' valuetype switches as per
-          [Bug 1908].
-
-Fri Aug 20 13:11:38 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Updated.
-
-        * orbsvcs/orbsvcs/ec_typed_events.mpc:
-
-          Changed to prepend "orbsvcs/" to export include path.
-
-Fri Aug 20 19:15:16 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/Wait_On_LF_No_Upcall.cpp:
-        * tao/Wait_On_LF_No_Upcall.h:
-
-          Moved the classes within the TAO namespace. The TAO_* classes
-          have to die. New classes needs to go in TAO namespace.
-
-        * tao/Transport.cpp:
-        * tao/Transport.h:
-        * tao/Transport.inl:
-
-          The Connection_Role enum is now in TAO namespace instead of the
-          the global namespace.
-
-        * tao/Acceptor_Impl.cpp:
-        * tao/Transport_Connector.cpp:
-        * tao/default_client.cpp:
-
-          Changes that got propagated from above.
-
-Fri Aug 20 10:36:57 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tao/Wait_On_LF_No_Upcall.h: Fix fuzz build errors from missing
-          /**/ on pre.h/post.h includes.
-
-Fri Aug 19 14:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1670_Regression/Bug_1670_Regression.mpc:
-          Instead of adding -GH to the idlflags, use amh as base project, this
-          does the same and is much better to maintain
-
-Fri Aug 19 14:43:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1568_Regression/Bug_1568_Regression.mpc:
-          Instead of adding -GH to the idlflags, use amh as base project, this
-          does the same and is much better to maintain
-
-Fri Aug 19 10:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport.h:
-          Removed not allowed comma at end of enum list
-
-Fri Aug 20 02:15:42 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Updated to account for addition of Wait_On_LF_No_Upcall.*
-          plus some improvements in MPC's automake support.
-
-Fri Aug 20 09:27:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
-
-        * tests/ORT/ORT.mpc:
-        * tests/Bug_1670_Regression/Bug_1670_Regression.mpc:
-        * tests/Bug_1568_Regression/Bug_1568_Regression.mpc:
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc:
-          Removed outdated -Gv IDL option according to [Bug 1908].
-
-Thu Aug 19 23:28:25 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Acceptor_Impl.cpp:
-
-          Include "Transport.h" to pull in "TAO_SERVER_ROLE" enumeration
-          member definition.
-
-Thu Aug 19 22:00:39 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc:
-        * orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc:
-        * orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc:
-
-          Fixed incorrect base project.  "orbsvcslib", not "orbsvcsexe".
-          Addresses problems related to missing directories in the
-          preprocessor include path.
-
-          Removed unecessary base projects from client projects.
-
-Thu Aug 19 16:49:24 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tao/Wait_On_LF_No_Upcall.h:
-        * tao/Wait_On_LF_No_Upcall.cpp:
-        * tao/tao.mpc:
-
-          Created new wait strategy that combines features of Wait_On_Read
-          and Wait_On_Leader_Follower.  This strategy re-enters the
-          leader-follower, but does not permit nested upcalls on the
-          requesting thread while waiting for a reply.  Other threads are
-          permitted to operate normally.  The strategy was motivated by
-          the need to recognize connections opened in the client role and
-          closed by the far side.  Using Wait_On_Read, the closure would
-          only be recognized the next time an invocation gets made that
-          goes through that connection.  Notably in the notification
-          service, there is a _narrow() that causes an invocation on an
-          object, and that connection never gets reused.  Thus, it sits in
-          CLOSE_WAIT consuming a file descriptor for the rest of the
-          process.
-
-          Implementing this required modifications to other files to
-          allocate and honor a flag set by this wait strategy.
-
-        * docs/Options.html:
-
-          Added documentation on the new wait strategy.
-
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * tao/Strategies/DIOP_Connection_Handler.cpp:
-        * tao/Strategies/SCIOP_Connection_Handler.cpp:
-        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
-        * tao/Strategies/UIOP_Connection_Handler.cpp:
-        * tao/Transport.h:
-        * tao/Transport.cpp:
-        * tao/Transport.inl:
-        * tao/Transport_Connector.cpp:
-        * tao/Connection_Handler.h:
-        * tao/Connection_Handler.inl:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.cpp:
-        * tao/Connection_Handler.cpp:
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/Acceptor_Impl.cpp:
-        * tao/default_client.cpp:
-        * tao/default_client.h:
-        * tao/Thread_Per_Connection_Handler.cpp:
-
-          Updated to cooperate with the new wait strategy.  Note that some
-          refactoring in the Connection_Handler requires changes in any
-          pluggable transport's derived Connection_Handler in order to
-          participate in this wait strategy.
-
-Thu Aug 19 01:54:51 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h:
-
-          Fixed some syntax errors that MSVC++ 6 let slip through.
-
-Thu Aug 19 08:49:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BiDir_GIOP/BiDirGIOP.h:
-          Corrected comment after #endif
-
-Thu Aug 19 08:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * PROBLEM-REPORT-FORM:
-          Ask for the default.features file used by MPC.
-
-Wed Aug 18 23:09:29 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl:
-
-          Due MSVC++ 6's inability to correctly deduce the function
-          template specialization to use based on the function argument,
-          resort to explicitly calling the type-specific
-          TAO::SSLIOP::OpenSSL trait function instead.  Once we drop
-          support for MSVC++ 6, we can go back to using the function
-          templates so that the code can be cleaner once again.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h:
-
-          Added new _duplicate() static trait function.  MSVC++ 6 couldn't
-          handle the function templates in the TAO::SSLIOP namespace so
-          resort to reproducing code in each specialization.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp (copy):
-
-          Not all versions of OpenSSL declare the RSAPrivateKey_dup()
-          function in the global namespace.  Remove the global "::"
-          namespace qualifier to fix a compile-time error when using those
-          versions of OpenSSL.
-
-Wed Aug 18 10:41:03 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_component/component.cpp:
-
-          Changed context state in switch case labels to correspond with
-          changes in
-
-          Tue Aug 17 15:48:28 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Wed Aug 18 08:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.h:
-          Converted some old style documentation to doxygen style
-
-Wed Aug 18 06:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies/SCIOP_Connector.{h,cpp}:
-          Fixed compile errors in sctp enabled builds. Now the ATL builds
-          are online again, these reported some errors.
-
-Tue Aug 17 21:33:35 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-
-          Removed explicit libs and after statements for messaging, since
-          project allready inherits from messaging base project.
-
-Tue Aug 17 21:16:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-
-          Changed to inherit from corba_messaging instead of providing
-          requires statement to eliminate duplicate entries in list.
-
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-        * orbsvcs/orbsvcs/Security.mpc:
-
-          Changed to inherit from interceptors instead of providing
-          requires statements to eliminate duplicate entries in list.
-
-Tue Aug 17 17:32:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * {docs,examples,orbsvcs,performance-tests,utils}/.../*.{cpp,h,idl}:
-
-          Changed #include <orbsvcs/orbsvcs/...> to #include <orbsvcs/...>.
-
-Tue Aug 17 17:56:23 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_component/component.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/fe/fe_interface_header.cpp:
-        * TAO_IDL/include/utl_err.h:
-        * TAO_IDL/util/utl_err.cpp:
-
-          Eliminated the error message generated when a component is
-          supporting an abstract interface - it was mistakenly assumed
-          that such a thing was barred by the spec. Once this error
-          was eliminated, other changes were required to support the
-          new 'feature'.
-
-Tue Aug 17 15:48:28 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_interface.cpp:
-
-          Changed the logic of the check for 'mixed parentage'
-          (abstract & concrete) in an interface, to return true not
-          only if an interface has an immediate abstract parent (as
-          before) but also if there is an abstract interface
-          anywhere in its ancestry. This is necessary for skeletons-side
-          code generation, since abstract interfaces have no operations
-          generated on the skeleton side for children to inherit, the
-          operations must be regenerated in each child.
-
-        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:
-
-          For the gen_abstract_ops_helper() static method in each of the
-          above visitors, changed the logic to do nothing unless the
-          base interface passed to the method is abstract. The check
-          has been moved here from its former location in the method
-          call so operations inherited from distance abstract ancestors
-          can be found and regenerated. Thanks to Markus Stenberg
-          <markus.stenberg@conformiq.com> for sending in an example that
-          uncovered the bug.
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be_include/be_valuetype.h:
-
-          Removed unused code.
-
-Tue Aug 17 11:40:05 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-
-          Added generation of '\n' as the very last thing that
-          happens in each generated file, to make absolutely
-          sure every file ends with a newline (required by CVS
-          and some compilers). Thanks to
-          Markus Stenberg <markus.stenberg@conformiq.com> for
-          reporting the problem in *S.inl when -Sp (suppression
-          of thru-POA collocation code) is in effect.
-
-Mon Aug 16 23:56:21 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-
-          Changed FTRT_EventChannel project to inherit from core.
-
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
-
-          Changed RTCosScheduling project to inherit from core.
-
-Tue Aug 17 06:49:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-          Fixed member initialisation order warning
-
-Mon Aug 16 23:35:00 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Update to configure orbsvcs/tests/F*.
-
-        * orbsvcs/tests/Makefile.am:
-
-          Update to build new tests.
-
-        * orbsvcs/tests/FT_App/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am:
-        * orbsvcs/tests/FtRtEvent/Makefile.am:
-
-          New files.
-
-        * orbsvcs/orbsvcs/AV.mpc:
-        * orbsvcs/orbsvcs/CosConcurrency.mpc:
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosLifeCycle.mpc:
-        * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosProperty.mpc:
-        * orbsvcs/orbsvcs/CosTime.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-        * orbsvcs/orbsvcs/FTORB.mpc:
-        * orbsvcs/orbsvcs/FaultTolerance.mpc:
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-        * orbsvcs/orbsvcs/PortableGroup.mpc:
-        * orbsvcs/orbsvcs/RTCORBAEvent.mpc:
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/RTSched.mpc:
-        * orbsvcs/orbsvcs/RT_Notification.mpc:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-        * orbsvcs/orbsvcs/Security.mpc:
-        * orbsvcs/orbsvcs/Svc_Utils.mpc:
-
-          Changed to prepend "orbsvcs/" to export include path.
-
-        * orbsvcs/Concurrency_Service/Makefile.am:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Dump_Schedule/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/LoadBalancer/Makefile.am:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-        * orbsvcs/Scheduling_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am:
-        * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am:
-        * orbsvcs/tests/AVStreams/Full_Profile/Makefile.am:
-        * orbsvcs/tests/AVStreams/Latency/Makefile.am:
-        * orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multicast/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am:
-        * orbsvcs/tests/AVStreams/Pluggable/Makefile.am:
-        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am:
-        * orbsvcs/tests/Bug_1334_Regression/Makefile.am:
-        * orbsvcs/tests/Concurrency/Makefile.am:
-        * orbsvcs/tests/CosEvent/Basic/Makefile.am:
-        * orbsvcs/tests/CosEvent/lib/Makefile.am:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/EC_MT_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Multiple/Makefile.am:
-        * orbsvcs/tests/EC_Throughput/Makefile.am:
-        * orbsvcs/tests/Event/Basic/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Common/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Complex/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Simple/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am:
-        * orbsvcs/tests/Event/Performance/Makefile.am:
-        * orbsvcs/tests/Event/lib/Makefile.am:
-
-          Updated to access orbsvcs headers with -I$(TAO_ROOT)/orbsvcs.:
-
-Mon Aug 16 16:45:06 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc:
-
-          Changed muf_client project to inherit from svc_utils.
-
-        * {docs,examples,orbsvcs,performance-tests,utils}/.../*.{cpp,h,idl}:
-
-          Changed #include "orbsvcs/orbsvcs/..." to #include "orbsvcs/...".
-
-Mon Aug 16 18:14:53 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_interface.cpp (gen_stub_ctor):
-
-          Fixed logic in generation of constructor taking stub and
-          servant, for abstract interfaces that inherit from other
-          abstract interfaces.
-
-Mon Aug 16 16:31:19 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * TAO-INSTALL.html (href):
-
-          Addressed an additional concern from Dr. Schmidt regarding
-          broken documentation.
-
-Mon Aug 16 12:13:30 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * TAO-INSTALL.html (href):
-
-          Fixed some notes on .sln files generated for VC71.
-
-Sun Aug 15 18:16:00 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_decl.cpp:
-
-          Fixed minor bug in setting the default version to 1.0.
-
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h:
-        * TAO_IDL/driver/drv_preproc.cpp:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/util/utl_global.cpp:
-
-          - Moved code to create AST nodes for a struct and sequence
-            implied IDL for 'uses multiple' declarations from the
-            parser back to its original location in the CCM preprocessing
-            visitor.
-
-          - Added a command line option (-Sm) to suppress the CCM
-            preprocessing visitor, for use on IDL files that have
-            already had their CCM-related implied IDL converted explicitly.
-
-          - Added a flag to change the way the includes orb.idl,
-            Components.idl and *.pidl are handled. This flag can be set
-            to modify the default behavior by a plugin back end.
-
-Sun Aug 15 18:07:04 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * docs/compiler.html:
-        * docs/releasenotes/index.html:
-
-          Added items for a new IDL compiler command line option -Sm, that
-          disables the visitor that converts IDL3 constructs to the
-          equivalent IDL2. This option is for use in IDL files where such
-          conversions are already present explicitly, for example if the
-          IDL file is the product of a converstion tool.
-
-Sat Aug 14 20:21:34 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h (OpenSSL_traits):
-
-          Replaced primary template definition with a forward declaration.
-          OpenSSL data structure-specific traits should always
-          define/specialize their own traits template.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h (OpenSSL_traits):
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h (OpenSSL_traits):
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h (OpenSSL_traits):
-
-          More MSVC++ 6 brain damage.  MSVC++ 6 cannot handle
-          initialization of a static constant variable in the structure
-          declaration.  It considers non-zero initialization to be an
-          improper pure function specifier despite the fact no function is
-          declared in this case.  Define the constant inside an
-          enumeration instead to work around the problem.
-
-Sat Aug 14 18:17:59 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_interface.cpp:
-
-          In the traversal of the inheritance graph for components, changed
-          the algorithm so that CCMObject is processed before the base
-          component, if any. This move ensures that, in the generated
-          copy constructor in the skeleton class of the equivalent interface,
-          the calls to base class copy constructors will be generated in
-          the correct order. For compilers that are strict about this,
-          the correct order is depth-first pre-order on the inheritance
-          tree.
-
-Sat Aug 14 12:11:06 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp (is_loopback):
-
-          The "ACE_Sock_Connect" interim pseudo namespace no longer
-          exists.  Use the true "ACE" C++ namespace instead.  Fixes a
-          compile-time error.
-
-Fri Aug 13 23:58:50 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Thread_Per_Connection_Handler.cpp (svc):
-
-          The "ACE_Flag_Manip" pseudo namespace no longer exists, and was
-          not meant to be used in the long run in this code.  Use the true
-          "ACE" C++ namespace instead.
-
-Sat Aug 14 03:32:38 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tests/Bug_1904_Regression/test.cpp:
-
-          Fixed warnings in the daily builds.
-
-Fri Aug 13 11:06:43 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h (OpenSSL_st_var):
-
-          The types used as template parameters for this class template do
-          not inherit from a common base class so there is no need to
-          inherit from TAO_Base_var and declare undefined a TAO_Base_var
-          copy constructor and assignment operator to prevent widening
-          assignments.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl (OpenSSL_st_var):
-
-          Removed TAO_Base_var constructor call from the base member
-          initializer list.  This class no longer inherits from
-          TAO_Base_var.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h (Current_var):
-
-          Define this class in terms of the TAO::Pseudo_Var_T class
-          template instead of customized class.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp:
-
-          Removed the custom TAO::SSLIOP::Current_var class definition.
-          It is no longer needed.
-
-        * orbsvsc/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
-        * orbsvsc/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp:
-        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp:
-
-          Added missing explicit template instantiations for
-          TAO_Pseudo_Var_T template instances defined in the corresponding
-          headers of these files.  Fixes link-time errors in explicit
-          template instantiation builds.
-
-Fri Aug 13 17:46:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IOR_Parser.h:
-          Small doxygen tag improvements
-
-Fri Aug 13 10:25:25 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h (OpenSSL_traits):
-
-          Corrected doxygen documentation for this traits structure.
-          "@struct", not "@class".
-
-Fri Aug 13 10:17:46 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-          Remove PIDL_Files.  Thanks to Ossama Othman who let me know that
-          ssl_endpoint.pidl needn't be installed.
-
-Fri Aug 13 09:38:24 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h (copy):
-
-          Corrected function parameter.  It should have been "T const &",
-          not "T *".  This should fix a Borland C++ Builder X compile-time
-          problem.  Interestingly, g++ 3.4.1 did not complain about this
-          problem.
-
-Fri Aug 13 11:10:00 2004  Liang-Jui Shen <ls1@cec.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h:
-
-        My previous check-ins failed the tests. Therefore, I reverted to
-        the original version.
-
-Fri Aug 13 09:01:00 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-          Update to configure orbsvcs/tests/[A-E]*.
-
-        * orbsvcs/Makefile.am:
-          Update to build tests.
-
-        * orbsvcs/tests/Makefile.am
-        * orbsvcs/tests/AVStreams/Makefile.am:
-          Updated.
-
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am:
-        * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am:
-        * orbsvcs/tests/AVStreams/Full_Profile/Makefile.am:
-        * orbsvcs/tests/AVStreams/Latency/Makefile.am:
-        * orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multicast/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am:
-        * orbsvcs/tests/AVStreams/Pluggable/Makefile.am:
-        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am:
-        * orbsvcs/tests/Bug_1334_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_1393_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_1630_Regression/Makefile.am:
-        * orbsvcs/tests/Concurrency/Makefile.am:
-        * orbsvcs/tests/CosEvent/Makefile.am:
-        * orbsvcs/tests/CosEvent/Basic/Makefile.am:
-        * orbsvcs/tests/CosEvent/lib/Makefile.am:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/EC_MT_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Multiple/Makefile.am:
-        * orbsvcs/tests/EC_Throughput/Makefile.am:
-        * orbsvcs/tests/Event/Makefile.am:
-        * orbsvcs/tests/Event/Basic/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Common/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Complex/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Simple/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am:
-        * orbsvcs/tests/Event/Performance/Makefile.am:
-        * orbsvcs/tests/Event/lib/Makefile.am:
-          New files, built with a little help from MPC.
-
-Fri Aug 13 09:30:54 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * orbsvcs/tests/ior_corbaname/README:
-
-          Fixed a typo in the instructions. Thanks to TG <groth dot th at
-          nord-com dot net>.
-
-Fri Aug 13 12:48:48 2004  Simon McQueen  <sm@prismtechnologies.com>
-
-        * TAO_IDL/fe/fe_lookup.cpp (lookup):
-          Fixed warning in Linux builds.
-
-        * tests/Bug_1904_Regression/test.mpc:
-          Added missing $Id tag.
-
-Fri Aug 13 00:46:24 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-          Update to account for Ossama's SSLIOP changes.
-
-        * configure.ac:
-          Update to configure orbsvcs/performance-tests/*.
-
-        * orbsvcs/Makefile.am:
-          Update to build performance-tests.
-
-        * orbsvcs/performance-tests/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-          New files, built with a little help from MPC.
-
-Thu Aug 12 21:00:22 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-          Update, with a little help from MPC.
-
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-        * tao/BiDir_GIOP.mpc:
-        * tao/Domain.mpc:
-        * tao/DynamicAny.mpc:
-        * tao/DynamicInterface.mpc:
-        * tao/IFR_Client.mpc:
-        * tao/IORInterceptor.mpc:
-        * tao/IORManipulation.mpc:
-        * tao/IORTable.mpc:
-        * tao/Messaging.mpc:
-        * tao/ObjRefTemplate.mpc:
-        * tao/PortableServer.mpc:
-        * tao/RTCORBA.mpc:
-        * tao/RTPortableServer.mpc:
-        * tao/RTScheduler.mpc:
-        * tao/SmartProxies.mpc:
-        * tao/Strategies.mpc:
-        * tao/TypeCodeFactory.mpc:
-        * tao/Utils.mpc:
-        * tao/Valuetype.mpc:
-        * tao/tao.mpc:
-          Use new PIDL_Files custom file type so that *.pidl files are
-          known to MPC.  This will be used by the automake template so
-          *.pidl files are installed.
-
-Thu Aug 12 19:21:25 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-
-          Removed SSLIOPS.cpp from the source file list.  No unconstrained
-          interfaces are defined in the SSLIOP.idl IDL file, meaning that
-          there is no need to compile and link the corresponding
-          skeleton file.
-
-Thu Aug 12 18:45:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
-
-          Added new OpenSSL "SSL" data structure constructor parameter,
-          and accompanying cached member.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
-          (ClientCredentials):
-
-          Initialize new SSL data structure member with given SSL
-          argument.
-
-          (parent_credentials, client_authentication, integrity):
-
-          Implemented these methods.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (ssliop_connect):
-
-          Do not widen the retrieved OwnCredentials pointer to a
-          Credentials pointer.  We really want to retain the narrower
-          interface for later use.  Furthermore, it is more correct to
-          store an OwnCredentials reference in an endpoint rather than one
-          that has been widened to a Credentials reference.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
-
-          Cosmetic updates.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
-          (client_credentials):
-
-          Pass the underlying SSL data structur to the ClientCredentials
-          constructor.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h:
-
-          The types that were defined in these files are now implemented
-          in terms of the new TAO::SSLIOP::OpenSSL_st_T<> template.
-          Reduces code duplication and maintenance burden.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i:
-
-          Cache and return an OwnCredentials reference, not a wider
-          Credentials reference.  It is more correct to use the former.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl:
-
-          New template used to implement a "_var" class for OpenSSL data
-          structures such as "X509, EVP_PKEY" and "SSL".
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
-
-          Corrected typo in documentation.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h:
-
-          New files containing TAO::SSLIOP::SSL_var typdef and
-          accompanying explicit template instantiations.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.inl:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.inl:
-
-          Removed these files.  They are no longer used.
-
-Thu Aug 12 17:52:36 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp (operator==):
-
-          Cast away the const-ness of the right hand side argument before
-          invoking its non-const cred_type() method.  The method in
-          question doesn't modify the object so doing so is not violating
-          any "immutability contract".  Fixes a compile-time error.
-
-Thu Aug 12 17:51:52 2004  Simon McQueen  <sm@prismtechnologies.com>
-
-        * TAO_IDL/fe/fe_lookup.cpp (lookup):
-          Added test for matching string lengths to prevent incorrect
-          identification of non-keyword strings as c++ keywords.
-
-          This fixes bugzilla #1904.
-
-        * tests/Bug_1904_Regression/test.cpp:
-        * tests/Bug_1904_Regression/test.idl:
-        * tests/Bug_1904_Regression/test.mpc:
-
-          Regression test for the above.
-
-Thu Aug 12 11:56:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IIOP_Transport.cpp:
-        * tao/Codeset_Manager.cpp:
-          Smaller debug message formatting so that things look the same and
-          that it is directly clear where the message is coming from when
-          reading a log.
-
-        * tao/IIOP_Transport.cpp (set_bidir_context_info):
-          After we retrieved all listen_points check that the list is
-          empty, if it is, we really have a problem and we report it.
-
-        * tao/IIOP_Connection_Handler.cpp (process_listen_point_list):
-          This method processes the listen_point_list, when we are here we
-          should have a list with something in it, when the client has a
-          misconfigured DNS, it can be that an empty list is send by the
-          client because in TAO_IIOP_Transport::get_listen_point we only
-          add endpoints there that match the local address and when we have
-          misconfigured this, this check could fail and we could send an
-          empty list.
-
-Thu Aug 12 10:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Big_Oneways/server.cpp:
-        * tests/Big_Oneways/Session_Control.cpp:
-          Added a few more debug lines to the shutdown process, so that we
-          can see how far we get when this test fails.
-
-Thu Aug 12 09:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp:
-          When catching an exception, tell whether it is in the client or
-          server task. When an event loop ends, also tell which loop it is.
-
-Thu Aug 12 09:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/AMI_Buffering/admin.cpp:
-        * tests/AMI_Buffering/client.cpp:
-        * tests/AMI_Buffering/server.cpp:
-          When catching an exception, tell whether it is in the client,
-          admin or server.
-
-        * tests/Faults/client.cpp:
-        * tests/Faults/middle.cpp:
-        * tests/Faults/ping.cpp:
-        * tests/Faults/server.cpp:
-          When catching an exception, tell whether it is in the client,
-          ping, admin or server. When an event loop ends, also tell which
-          loop it is.
-
-Wed Aug 11 22:28:47 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/CSI.idl:
-        * orbsvcs/orbsvcs/CSIIOP.idl:
-        * orbsvcs/orbsvcs/SecurityLevel3.idl:
-
-          Fixed fuzz errors.
-
-Wed Aug 11 18:54:35 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-          Update, with help from the latest version of automake.mpd.
-          Adds resource files to EXTRA_DIST, and installs *.idl files.
-
-Wed Aug 11 15:34:59 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp:
-
-          Remove explicit namespace qualifier from base class constructor
-          call in the base member initializer list due to MSVC++ 6 brain
-          damage.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp (operator==):
-
-          Added missing SSLIOP Credentials attribute checks.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp:
-
-          Coding style updates.
-
-Wed Aug 11 14:54:31 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * docs/ORBEndpoint.html:
-
-          Improved documentation with additional examples and fixed a few
-          typos. Thanks to Jules Colding <jules at tdcadsl dot dk> for
-          motivating this.
-
-Wed Aug 11 09:36:16 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-         * docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc:
-         * docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc:
-         * docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc:
-         * docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc:
-         * examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc:
-         * examples/OBV/Typed_Events/Typed_Events.mpc:
-         * examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
-         * examples/POA/DSI/POA_DSI.mpc:
-         * examples/POA/Default_Servant/POA_Default_Servant.mpc:
-         * examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
-         * examples/POA/FindPOA/POA_FindPOA.mpc:
-         * examples/POA/Forwarding/POA_Forwarding.mpc:
-         * examples/POA/Generic_Servant/POA_Generic_Servant.mpc:
-         * examples/POA/Loader/POA_Loader.mpc:
-         * examples/POA/NewPOA/POA_NewPOA.mpc:
-         * examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
-         * examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc:
-         * examples/POA/POA_BiDir/POA_BiDir.mpc:
-         * examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc:
-         * examples/POA/TIE/POA_TIE.mpc:
-         * examples/Quoter/Quoter.mpc:
-         * examples/TypeCode_Creation/TypeCode_Creation.mpc:
-         * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-         * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc:
-         * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc:
-         * orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc:
-         * orbsvcs/examples/ORT/ORT.mpc:
-         * orbsvcs/orbsvcs/CosEvent.mpc:
-         * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
-         * orbsvcs/orbsvcs/FaultTolerance.mpc:
-         * orbsvcs/orbsvcs/FtRtEvent.mpc:
-         * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc:
-         * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc:
-         * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc:
-         * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc:
-         * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc:
-         * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc:
-         * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
-         * orbsvcs/tests/Bug_1630_Regression/test.mpc:
-         * orbsvcs/tests/FT_App/FT_App.mpc:
-         * orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc:
-         * orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc:
-         * orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc:
-         * orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc:
-         * orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc:
-         * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc:
-         * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
-         * performance-tests/Latency/DII/DII.mpc:
-         * performance-tests/Latency/DSI/DSI.mpc:
-         * performance-tests/Latency/Deferred/Deferred.mpc:
-         * performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc:
-         * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc:
-         * performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc:
-         * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc:
-         * performance-tests/Sequence_Latency/DII/DII.mpc:
-         * performance-tests/Sequence_Latency/DSI/DSI.mpc:
-         * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
-         * tao/DynamicInterface.mpc:
-         * tests/Bug_1636_Regression/test.mpc:
-         * tests/POA/Default_Servant/Default_Servant.mpc:
-         * tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc:
-         * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc:
-         * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc:
-         * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc:
-         * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc:
-         * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc:
-         * tests/RTCORBA/Policies/Policies.mpc:
-         * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc:
-         * tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc:
-         * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc:
-         * tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc:
-         * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc:
-         * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc:
-
-           Changed to inherit from minimum_corba instead of providing
-           avoids statements to eliminate duplicate entries in list.
-
-Wed Aug 11 13:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Oneway_Buffering/admin.cpp:
-        * tests/Oneway_Buffering/client.cpp:
-        * tests/Oneway_Buffering/server.cpp:
-          When catching an exception, tell whether it is in the client,
-          admin or server.
-
-Wed Aug 11 09:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.h:
-          Updated documentation to doxygen style
-
-Wed Aug 11 09:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ImplRepo.pidl:
-          Updated documentation to doxygen style
-
-Wed Aug 11 07:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Notify/Basic/Basic.mpc:
-        * orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc:
-          Removed naming as base project, the notifytests base used is also
-          based on naming
-
-Tue Aug 10 18:33:30 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/LoadBalancer/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-          Initial support for user-configurable features (ssl, rt_corba,
-          minimum_corba, etc.) with automake conditionals.  Conditional
-          values are currently hard-coded in configure.ac and will have
-          to be replaced by --with-* and --enable-* options.
-
-Tue Aug 10 17:56:00 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_interface.cpp:
-
-          Fixed bug in the inheritance graph traversal algorithm
-          that was sometimes failing to enqueue CCMObject and therefore
-          also its parents Navigation, Receptacles, and Events. Thanks
-          to Matthew Gillen <mgillen@bbn.com> for pointing out
-          resulting runtime error in the generated skeleton operation
-          table.
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-
-          Fixed bug where the stub export macro was getting generated
-          on the skeleton side.
-
-        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
-
-          Cosmetic changes to source code.
-
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-
-          Removed generation of collocation classes for abstract interfaces
-          in the skeleton header file, since they are not generated in
-          the skeleton source file, thus causing a link error. For
-          abstract interfaces, all the code related to their operations
-          is duplicated in code generation for concrete interfaces
-          deriving from them, at least on the skeleton side, so no code
-          generation is required on the skeleton side at all for
-          abstract interfaces.
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp:
-
-          Fixed a bug in code generation of the copy constructor for
-          a valuetype that supports an abstract interface.
-
-Tue Aug 10 13:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BiDir_GIOP/BiDirPolicy_Validator.h:
-          Use unique ifdef defines
-
-Tue Aug 10 12:54:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1476_Regression/Client_Task.cpp:
-        * tests/Bug_1476_Regression/Sender_i.h:
-          Fixed compile errors with emulated exceptions
-
-Tue Aug 10 10:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-          Updated that the fixes for bug 1476 aren't planned anymore but
-          will be visible in the x.4.3 release
-
-Tue Aug 10 08:13:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1476_Regression/*:
-          New regression test for bug 1476. This tests that when using
-          oneways with sync_none policy applied the ORB doesn't block
-          on connection establishment. To be able to run this test you
-          must have a long connection establishment time, this isn't
-          the case on localhost, so run client and server far far from
-          away. Because of this, this test isn't able to run in our
-          daily builds.
-
-Tue Aug 10 00:41:10 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * utils/nslist/nslist.cpp (display_endpoint_info):
-
-          Fixed compile-time error.  "CORBA::is_nil()", not
-          "CORBA::Object::is_nil()".
-
-Mon Aug  9 23:31:45 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/PSS/PSDL_Scope.cpp:
-          Change call to ACE_OS::to_lower() to ACE_OS::ace_tolower()
-          to adapt to API change.
-
-Mon Aug  9 17:43:33 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Utils/Servant_Var.inl:
-
-          Include "tao/Exception.h" to pull CORBA::Exception declaration.
-          Fixes a compile-time error regarding an incomplete
-          CORBA::Exception type in a catch() statement.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl:
-
-          Renamed TAO::SSLIOP::Credentials class to
-          TAO::SSLIOP_Credentials, i.e. moved it one namespace level up.
-          Brain damaged MSVC++ 6 cannot handle calling base class
-          constructors of classes declared in a nested namespace inside a
-          sub-class base member initializer.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h:
-
-          Updated these sources to refer to the renamed
-          TAO::SSLIOP_Credentials class.
-
-Mon Aug  9 12:16:50 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/BD_String_Argument_T.cpp:
-
-          Fixed incorrect placement of #if TAO_HAS_INTERCEPTORS == 1
-          guard.
-
-Mon Aug  9 15:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.{h,cpp}:
-          Updated these files because of the interface changes of the base class
-
-Mon Aug  9 11:51:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Integration of the fixes for bug 1476. In short, when making oneway
-        calls with sync_none policy applied, the ORB shouldn't block, this was
-        working for all calls, except for the first call, the connection
-        establishment blocked and violated the meaning of sync_none. All changes
-        below are there to also don't block on the first call, but just queue
-        the messages until the transport is connection. Thanks to Bala for
-        helping with this.
-
-        Fri Aug  6 15:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector:
-                * tao/SCIOP_Connection:
-                * tao/UIOP_Connector:
-                * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
-                * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
-                  As last step in the make_connection register the transport with the
-                  reactor when the transport is connected. When it is not connected it
-                  will or happen in the Transport_Connector when there the connection
-                  is established or in the Transport::post_open when the transport is
-                  connected and we have outgoing data.
-
-        Fri Aug  6 15:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector.cpp (make_connection):
-                * tao/Transport_Connector.cpp (connect):
-                  Corrected method name in debug statement
-
-        Fri Aug  6 14:58:18 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-                * tao/IIOP_Connector.cpp:
-                * tao/Transport_Connector.cpp:
-
-                  Test for is_connected () before registration.
-
-        Fri Aug  6 14:11:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-                * tao/IIOP_Connection_Handler.cpp:
-
-                  Cosmetic fix.
-
-                * tao/IIOP_Connector.cpp:
-
-                  Register handler after the caching the transport.
-
-                * tao/Transport.cpp:
-
-                  Register handler if there is a non-empty queue. then call
-                  schedule_wakeup (). Added locks to prevents races.
-
-                  Removed locks from format_queue_message (), since I think its
-                  not necessary.
-
-                * tao/Transport.inl:
-
-                  Added a lock to is_connected (). This introduces a lock on the
-                  critical path. We need to think about this later.
-
-                * tao/Transport_Connector.cpp:
-
-                  Added code to register the handler with the reactor.
-
-        Fri Aug  6 13:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connection_Handler.cpp:
-                  Removed duplicate include
-
-                * ace/Thread_Per_Connection_Handler.cpp:
-                  Corrected classname in debug statement
-
-        Thu Aug  5 08:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Invocation_Adapter.{h,cpp}:
-                  Renamed set_sync_policy to set_response_flags, we are setting
-                  the response flags using sync_policy for oneways. Also, when
-                  having a twoway set the correct response_flags, this was done
-                  later in the twoday invocation, but the response_flags are
-                  SYNC_NONE by default, resulting that all twoways used a non
-                  blocking connect. By setting the response_flags earlier, the
-                  blocked member of the profile transport resolver is set
-                  to the correct value
-
-                * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
-                  Corrected some errors
-
-                * tao/Transport.cpp:
-                  When we are not connected, also purge us from the connection
-                  cache. When we are connected, the connection closure will do this
-                  but not when we are not connected. Use in recache_transport() the
-                  this->purge_entry() call to reduce code duplication
-
-                * tao/IIOP_Connector:
-                * tao/SCIOP_Connection:
-                * tao/UIOP_Connector:
-                * orbsvcs/orbsvcs/SSLIOP_Connector.cpp:
-                * orbsvcs/orbsvcs/IIOP_SSL_Connector.cpp:
-                  When the connect() calls return -1, only when errno == EWOULDBLOCK
-                  we wait for completion, for other errno's we have to set
-                  transport to zero, because the transport is not usable in that
-                  case and we just don't have a connection then.
-
-        Wed Aug  4 09:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * orbsvs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
-                * orbsvs/orbsvcs/SSLIOP/SSLIOP_Connector.{h,cpp}:
-                * orbsvs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-                  Updated for changes. These files wheren't added to my original
-                  branch and they where recently changed by Ossame, so make a new
-                  branch bug1476 on the head, so that I can merge all changes in one
-                  action to the main
-
-        Wed Aug  4 09:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector.cpp:
-                  Fixed typo in debug line
-
-                * tao/IIOP_Connector.h:
-                  Added virtual to cancel_svc_handler() to show that this is a virtual
-                  method.
-
-                * tao/Strategies/DIOP_Connection_Handler.cpp:
-                * tao/Strategies/SCIOP_Connection_Handler.cpp:
-                * tao/Strategies/SHMIOP_Connection_Handler.cpp:
-                * tao/Strategies/UIOP_Connection_Handler.cpp:
-                * tao/Strategies/DIOP_Connector.{h,cpp}:
-                * tao/Strategies/SCIOP_Connector.{h,cpp}:
-                * tao/Strategies/SHMIOP_Connector.{h,cpp}:
-                * tao/Strategies/UIOP_Connector.{h,cpp}:
-                  Updated these protocols with all changes we did in the base classes
-
-        Tue Aug  3 11:56:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                  An overview of the changes in the pluggable transport interface
-                  which has to be done in all pluggable transports:
-                  * Connection_Handler::open(), instead of setting just the id of the
-                    transport, call transport::post_open() with the id, this will set
-                    the id, mark the transport as connected, register the transport with
-                    the reactor and in case there is data in the outgoing queue it
-                    will also schedule the transport for output.
-                  * Connection_Handler::close(), check the implementation of this
-                    method, it should in most cases sufficient to just call
-                    this->close_handler().
-                  * Connector::make_connection(), check using the profile transport
-                    resolver whether to make a blocked connect or non blocked. A non
-                    blocked is done when making oneways with sync_none policy applied.
-                    In case the connect returns -1 and errno == EWOULDBLOCK use the
-                    base method wait_for_connection_completion to wait for the
-                    connection to be established. Don't register here anymore the
-                    transport with the reactor, this is already done in your derived
-                    Connection_Handler::open() by calling the post_open()
-                  * Connector::cancel_svc_handler, a new method that must be
-                    implemented by each pluggable protocol to cancel the connection
-                    handler from the connector.
-
-        Tue Aug  3 09:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Remove_Invocation.cpp:
-                  Removed debug comment
-
-        Tue Aug  3 09:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.{h,cpp}:
-                * tao/IIOP_Connector.cpp:
-                  Changed signature of wait_for_connection_completion, pass transport
-                  as *&, so that is can be set to 0 when not usable and return a bool
-                  whether succeeded or not.
-
-        Tue Aug  3 08:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.h:
-                  Corrected link to pluggable protocols documentation
-
-        Mon Aug  2 18:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.cpp:
-                  Added wait_for_connection_completion() which now contains the code
-                  from connect that handles the waiting until the connection is
-                  completed. The only thing is the result value, maybe add a bool as
-                  return value and pass Transport by *&, what about that?
-
-                * tao/IIOP_Connector.cpp:
-                  Use the new Transport_Connector::wait_for_connection_completion
-                  instead of doing everything here again
-
-        Mon Aug  2 13:52:27 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-                * tao/Transport_Connector.cpp (connect):
-
-                  Left some comments for Johnny.
-
-        Mon Aug  2 09:45:36 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.h:
-                  Added a todo that event_handler_i has to be renamed to event_handler
-
-                * tao/Transport.cpp (send_message_shared_i):
-                  Use ACE_ERROR for a fatal message instead of a debug
-
-        Mon Aug  2 09:16:36 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.cpp (connect):
-                  Refactored this method so that checking for errors is easier, seems
-                  to me that part of this method can be factored out again and can
-                  then also be called from IIOP_Connector::make_connection(). Added
-                  some remarks for Bala, in case we do a wait of zero on a non
-                  blocking connection, how to handle any return value?
-
-        Mon Aug  2 07:54:36 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.{h,cpp}:
-                  Changed the result value type of post_open from int to bool. In case
-                  registration succeeds and we have data in our outgoing queue,
-                  schedule ourselves for output.
-
-                * tao/IIOP_Connection_Handler.cpp:
-                  Check the result value of post_open. In case this fails, we return
-                  -1, the setting of the state to success, is now moved after the
-                  post_open.
-
-                * tao/IIOP_Connector.cpp:
-                  Added a comment for Bala. Only call check_connection_closure when
-                  wait return -1.
-
-                * tao/Transport_Connector.{h,cpp}:
-                  Only when wait fails call check_connection_closure. Removed the
-                  result argument from this method, the caller should only call this
-                  when wait returns -1, clarified the return value meaning. Removed
-                  the printing of errno when connection establishment fails, shouldn't
-                  we do the same in TAO_IIOP_Connector::make_connection()?
-
-                  Not all comments of Bala below are handled yet, handling
-                  of connection failures must still be improved.
-
-        Mon Aug  2 03:40:36 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-                * tao/Transport_Connector.cpp:
-
-                  Fixed a logic error and added a few comments for Johnny.
-
-                * tao/IIOP_Connection_Handler.cpp:
-                * tao/IIOP_Connector.cpp:
-                * tao/Transport.cpp:
-                * tao/Transport_Connector.h:
-
-                  More comments for Johnny.
-
-        Fri Jul 30 10:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.cpp:
-                * tao/Transport_Connector.cpp:
-                * tao/IIOP_Connector.cpp:
-                  Added some comments, removed commented out code
-
-                * tao/IIOP_Connection_Handler.cpp:
-                  Removed not needed include which I added during my changes but is
-                  now not needed anymore
-
-                * tao/Invocation_Endpoint_Selectors.cpp:
-                  Removed comments and changed the logic of selecting an endpoint, if
-                  one isn't usable not break but try the next.
-
-        Thu Jul 29 13:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.cpp:
-                  Removed not needed include
-
-        Thu Jul 29 13:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.{h,cpp}:
-                  Renamed set_connected to post_open, we do much more then just
-                  setting a property. When the transport is connected we register
-                  ourselves with the reactor. In case of failure we close the
-                  connection. The thing to check is whether it is safe to assume that
-                  we are also in the transport cache
-
-                * tao/Transport_Connector.{h,cpp}:
-                  Removed register_transport() because the transport register itselves
-                  now. Also removed the calls to register_transport, we don't have to
-                  register the transport as connector anymore, the transport does
-                  that.
-
-                * tao/IIOP_Connector.cpp (make_connection):
-                  Removed the registration of the transport with the reactor, see
-                  above. Use a ACE_Event_Handler_var to make sure that we always do
-                  a remove reference on the connection handler.
-
-                * tao/IIOP_Connection_Handler.cpp (open):
-                  Call transport::post_open instead of set_connected
-
-        Thu Jul 29 10:00:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.cpp (set_connected):
-                  Commented out schedule_output, this doesn't work, have to think
-                  about something else
-
-                * tao/Transport_Connector.cpp (connect):
-                  When we get a connected transport out of the transport cache it can
-                  happen that another thread drove the reactor and set the transport
-                  to connected, but then it is not registered with the reactor, so add
-                  a check here that when we get a connected transport and it is not
-                  registered it yet, register it.
-
-                  In case we get a setup where the connection_handler::open() could
-                  safely register it, we could remove the checks above.
-
-        Thu Jul 29 08:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.cpp (connect):
-                  Added more error handling to handle situations where connections
-                  can't be established
-
-        Wed Jul 28 15:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.{h,cpp}
-                  Added pure virtual cancel_svc_handler() method which must be
-                  implemented by derived connectors to cancel the passed svc_handler
-                  with their base connector, the cancel on the base_connector must
-                  have derived connection handler, so we just can't do it in the base.
-                  Another option would be to make Transport_Connector a template which
-                  gets the connection handler type as template argument.
-                  Added also check_connection_closure, which is now generic and can
-                  also be used from the connect() call.
-
-                * tao/IIOP_Connector.{h,cpp}:
-                  Implemented the cancel_svc_handler() and removed the
-                  check_connection_closure() because it is now in the base.
-
-        Tue Jul 27 18:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Connection_Handler.{h,cpp}:
-                  Added virtual close_handler() method, this will be called the the
-                  Transport_Connector and derived classes if they want to close the
-                  connection_handler, the default implementation changes the LF state
-                  to closed and removes a reference from the transport
-
-                * tao/IIOP_Connection_Handler.cpp (close):
-                  Instead of modifing the LF state and removing a reference from the
-                  transport, just call this->close_handler(), this calls the
-                  Connection_Handler::close_handler().
-
-                  With this we can close handlers in a generic way from the
-                  Transport_Connectors.
-
-                  When we would move a template class between
-                  the ACE_Svc_Handler template and the derived connection handlers,
-                  this extra template could implement the close method in a generic
-                  way, this would reduce the footprint a little.
-
-                * tao/IIO_Connector.cpp:
-                  Moved docu to the correct place
-
-        Tue Jul 27 17:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connection_Handler.cpp:
-                  Instead of modifying the transport in several steps, just call
-                  set_connected which will do all work.
-
-                * tao/Transport.{h,cpp,inl}:
-                  Removed the is_connected accessor, made a set_connected, which will
-                  set the id, set the connected_ bool and will schedule an output
-                  when the queue is not empty
-
-        Tue Jul 27 12:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.{h,cpp}:
-                * tao/Synch_Invocation.cpp:
-                  Renamed queue_message to format_queue_message
-
-        Tue Jul 27 12:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.{h,cpp}:
-                  Added out_stream() which returns the out_stream from the
-                  messaging_object, this way the invocation classes don't need to use
-                  messaging_object anymore, just get the stream from the transport
-
-                * tao/Synch_Invocation.cpp:
-                * tao/Messaging/Asynch_Invocation.cpp:
-                * tao/LocateRequest_Invocation.cpp:
-                  Instead of getting the out_stream from the messaging_object which is
-                  retrieved from the transport, get it from the transport. This way we
-                  don't have to include tao/Pluggable_Messaging.h
-
-        Tue Jul 27 08:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.{h,cpp}:
-                  Factered out the registration of the transport into
-                  register_transport()
-
-        Tue Jul 27 07:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Sync_Invocation.cpp:
-                * tao/Transport.{h,cpp}:
-                  Changed queue_message so that transport does the formatting
-
-        Tue Jul 27 02:47:18 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-                * tao/Synch_Invocation.cpp:
-
-                  Left some comments for Johnny.
-
-        Mon Jul 26 13:48:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Synch_Invocation.cpp (remote_oneway):
-                  When queueing the message, stream it first else we just queue no
-                  message contents. The only question is how to handle the failure
-                  of the streaming
-
-        Mon Jul 26 13:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.{h,cpp}:
-                  Moved cleaning up the queue out of destruction and
-                  send_connection_closed_notifications_i annd into the new method
-                  cleanup_queue_i which is called from these places
-
-                * tao/IIOP_Connection_Handler.cpp:
-                  Marked the transport as connected after we changed the state to
-                  success
-
-                * tao/IIOP_Connector.cpp:
-                  We have to handle the timeout of wait, made an implementation, but
-                  with a remark to Bala to check this, not sure if this is the correct
-                  way todo.
-
-        Mon Jul 26 11:38:41 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-                * tao/Transport.cpp (TAO_Transport):
-
-                  Left a comment for Johnny.
-
-        Mon Jul 26 11:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Invocation_Adapter.cpp:
-                  Check for blocked or not blocked connection was wrong
-
-                * tao/Transport_Connector.cpp:
-                  Corrected debug statement
-
-        Mon Jul 26 09:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.cpp:
-                  In case we destruct a not connected transport it can happen that
-                  we have queued messages, zap these then from memory, we just can't
-                  deliver them.
-
-        Sat Jul 24 18:08:13 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-                * tao/Connect_Strategy.h:
-
-                  Added a new wait () method which takes in a transport.
-
-                * tao/Blocked_Connect_Strategy.cpp:
-                * tao/Blocked_Connect_Strategy.h:
-
-                  Provided a default implementation for the new wait () method.
-
-                * tao/LF_Connect_Strategy.cpp:
-                * tao/LF_Connect_Strategy.h:
-                * tao/Reactive_Connect_Strategy.cpp:
-                * tao/Reactive_Connect_Strategy.h:
-
-                  Provided an implementation of the new wait () method.
-
-                * tao/Invocation_Adapter.h:
-
-                  Changed the setup_operation_details_i () to set_syncscope_policy
-                  () since that is what it does.
-
-                * tao/Invocation_Adapter.cpp:
-
-                  Changed the operation name in the implementation of the above
-                  method. Did a bunch of cosmetic changes to keep the line lengths
-                  smaller.
-
-                * tao/Profile_Transport_Resolver.h:
-                * tao/Profile_Transport_Resolver.inl:
-
-                  Changed the name of the connected () method as blocked
-                  (). Improved const correctness so that the blocked_ data member
-                  is const.
-
-                * tao/Invocation_Endpoint_Selectors.cpp:
-
-                  Use TAO::ProfileTransportResolver::blocked () instead of
-                  TAO::ProfileTransportResolver::connected ().
-
-                * tao/Transport_Connector.cpp:
-                * tao/IIOP_Connector.cpp:
-
-                  Made a bunch of changes to improve readability of the code. Left
-                  a couple of questions for Johnny. There are a few more things
-                  that need to be addressed here.
-
-        Fri Jul 22 09:54:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector.cpp (make_connection):
-                  Call the check_connection_closure only when we want to have a
-                  connected transport, for the non-blocking case we have to do
-                  something else because the return value of -1 doesn't mean there
-                  always the we have a problem just establishing this connection.
-
-                * tao/IIOP_Connector.{h,cpp} (check_connection_closure):
-                  Changed method signature to have a return value
-
-        Fri Jul 22 09:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.cpp (connect):
-                  When getting a transport out of the cache, print out whether it is
-                  connected or not
-
-        Thu Jul 21 15:03:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector.cpp (make_connection):
-                  Use timeout to change the sync_options, this way we don't change
-                  the bitmask
-
-        Thu Jul 21 14:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/ORB_Core.h:
-                  Removed the transport_cache accessor method, it was just declared
-                  and not implemented, the ORB_Core know nothing about this
-
-        Thu Jul 21 13:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.cpp:
-                  In case we have a not connected transport we should look if we need
-                  to deliver a connected transport or not and behave accordingly to it
-
-        Wed Jul 20 15:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/TAO_Server_Request.cpp:
-                  Updated all ACE_DEBUG and ACE_ERROR macros so that the formatting of
-                  messages is the same as in the rest of TAO. This makes reading the
-                  logfiles much easier.
-
-        Wed Jul 20 14:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector.cpp (make_connection):
-                  Removed commented out code and only check for registration errors
-                  when we are calling the register_handler().
-
-        Wed Jul 20 11:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.cpp:
-                  Changed some remarks, some are not valid, some need some more
-                  clarification
-
-                * tao/IIOP_Connector.{h,cpp}:
-                  Moved the handling of connection closure to a new separate method
-                  check_connection_closure(). This contains code original in
-                  make_connection(). This code is dependent on the type of tranport
-                  used, so it can't move into the base class.
-
-        Thu Jul  8 14:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connection_Handler.cpp (open):
-                  Set the transport to connected here. We should refactor the last
-                  lines of this method, these lines are copied in each different type
-                  of connection_handler.
-
-                * tao/IIOP_Connector.cpp:
-                  Removed not needed code, just us is_connected() on the transport.
-                  Made a remark with the registration of the wait_strategy, do we need
-                  to do this here?
-
-                * tao/Transport_Connector.cpp:
-                  Use the transport->is_connected() instead of the wait of the result.
-
-                  Thanks to Bala for getting me on the right track.
-
-        Thu Jul  8 13:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector.cpp:
-                * tao/Transport_Connector.cpp:
-                  Some changes to handle the wait, but things are still not correct
-
-                * tao/Transport.cpp:
-                  Initialize is_connected+ to false
-
-        Thu Jul  8 11:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector.cpp:
-                  Added some test code for how the handle the wait result value
-
-                * tao/Transport_Connector.cpp:
-                  Added more logic what to do when a not connected transport is
-                  retrieved
-
-        Mon Jul  5 12:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.{h,cpp}:
-                  Removed commented out method in the header file and give purge_entry
-                  a return value, so that we can check for failure.
-
-        Mon Jul  5 12:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector.cpp:
-                * tao/Transport_Connector.cpp:
-                * tao/Profile_Transport_Resolver.cpp:
-                  Added some documentation and added some question to some code parts
-                  to be sure that we check this
-
-        Fri Jul  2 11:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Invocation_Adapter.{h,cpp}:
-                  Added setup_operation_details_i() which will setup the operation
-                  details and determine whether we want to block until a connection
-                  is ready or not, this removes duplicated code and we ony determine
-                  the settings once in the invocation path.
-
-        Thu Jul  1 12:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.{h,cpp}:
-                  Removed the block argument from the make_connection and connect
-                  method again, if we should get a connected transport or not can be
-                  retrieved from the ProfileTransportResolver
-
-                * tao/Transport_Connector.cpp:
-                  In case we get a transport from the cache that is not connected,
-                  call wait with zero time. We have to add more functionality here
-                  to handle the closing of that transport, and check the
-                  implementation what we do when we can't register the wait strategy
-                  with the reactor
-
-                * tao/IIOP_Connector.{h,cpp}:
-                  Added better handling of blocking or non-blocking connects.
-
-        Thu Jul  1 10:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.{h,inl}:
-                  Added connection_handler accessor function and made
-                  connetion_handler_i protected again
-
-                * tao/Transport_Connector.cpp:
-                  Use Transport::connection_handler instead of the _i version.
-
-        Wed Jun 30 14:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Profile_Transport_Resolver.{h,cpp,i}:
-                  Instead of passed with each operation whether the connect should
-                  block or not, we now pass a boolean with the constructor if this
-                  tranport must deliver a connected transport or whether it is also
-                  allowed to deliver a not connected transport. Added an accessor for
-                  this member.
-
-                * tao/Invocation_Adapter.cpp:
-                * tao/Invocation_Endpoint_Selectors.{h,cpp}:
-                * tao/LocateRequest_Invocation_Adapter.cpp:
-                  Instead of passing the block boolean with each operation, pass it
-                  with the constructor or the Profile_Transport_Resolver.
-
-        Wed Jun 30 10:19:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Synch_Invocation (remote_oneway):
-                  At the top of the method we check for sync with server or sync with
-                  target. In case of this we do a twoway. I don't see any reason why
-                  lower in the method we check another time for sync with server, so
-                  removed that check. Changed the calling of
-                  Synch_Twoway_Invocation::remote_twoway(), so that we check for
-                  exceptions in case of emulated exception macros. Add transport local
-                  variable, so that we don't need to get it several times in one
-                  method call.
-
-                * tao/Transport.cpp (send_message_shared_i):
-                  Removed queueing, it should be here, added some comments that the
-                  code checking for twoways or replies should go out of here. This
-                  class also got the new methods queue_message and queue_message_i
-                  when it was created as branch.
-
-        Tue Jun 20 10:10:10 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.{h,cpp}:
-                  Added queue_message and queue_message_i to be able to queue a
-                  message from the outside, use this method also internally.
-                  Added connected_ member and accessors to indicate whether this
-                  transport is connected or not
-
-                * tao/LocateRequest_Invocation_Adapter.cpp:
-                  We use the Profile_Transport_Resolver here, assume that we always
-                  need to get a connected transport
-
-Mon Aug  9 09:29:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Buffer_Allocator_T.h:
-          Added missing access control specifier public for the base class
-
-Sat Aug  7 23:06:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-          Changed to introduce an intermediate dependency between the IDL
-          sources and generated output files so that only one instance of
-          tao_idl is spawned per input file with parallel make.
-
-Sat Aug  7 18:08:51 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * utils/catior/catior.cpp:
-
-          Removed direct inclusion of <ctype.h>. This file already
-          includes ace/os_include/os_ctype.h. If LynxOS has problems, then
-          the problem is elsewhere.
-
-        * utils/nslist/nslist.cpp:
-
-          Used Object::is_nil () instead of _nil ().
-
-Fri Aug  6 15:44:50 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/TAO_Service/Makefile.am:
-          New file.
-
-Fri Aug  6 12:51:33 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/Argument.cpp:
-        * tao/Argument.h:
-        * tao/BD_String_Argument_T.cpp:
-        * tao/BD_String_Argument_T.h:
-        * tao/BD_String_SArgument_T.cpp:
-        * tao/BD_String_SArgument_T.h:
-        * tao/Basic_Argument_T.cpp:
-        * tao/Basic_Argument_T.h:
-        * tao/Basic_SArgument_T.cpp:
-        * tao/Basic_SArgument_T.h:
-        * tao/DomainC.cpp:
-        * tao/Fixed_Array_Argument_T.cpp:
-        * tao/Fixed_Array_Argument_T.h:
-        * tao/Fixed_Array_SArgument_T.cpp:
-        * tao/Fixed_Array_SArgument_T.h:
-        * tao/Fixed_Size_Argument_T.cpp:
-        * tao/Fixed_Size_Argument_T.h:
-        * tao/Fixed_Size_SArgument_T.cpp:
-        * tao/Fixed_Size_SArgument_T.h:
-        * tao/Object_Argument_T.cpp:
-        * tao/Object_Argument_T.h:
-        * tao/Object_SArgument_T.cpp:
-        * tao/Object_SArgument_T.h:
-        * tao/Special_Basic_Argument_T.cpp:
-        * tao/Special_Basic_Argument_T.h:
-        * tao/Special_Basic_SArgument_T.cpp:
-        * tao/Special_Basic_SArgument_T.h:
-        * tao/UB_String_Argument_T.cpp:
-        * tao/UB_String_Argument_T.h:
-        * tao/UB_String_SArgument_T.cpp:
-        * tao/UB_String_SArgument_T.h:
-        * tao/Var_Array_Argument_T.cpp:
-        * tao/Var_Array_Argument_T.h:
-        * tao/Var_Array_SArgument_T.cpp:
-        * tao/Var_Array_SArgument_T.h:
-        * tao/Var_Size_Argument_T.cpp:
-        * tao/Var_Size_Argument_T.h:
-        * tao/Var_Size_SArgument_T.cpp:
-        * tao/Var_Size_SArgument_T.h:
-        * tao/operation_details.cpp:
-        * tao/operation_details.h:
-        * tao/DynamicInterface/DII_Invocation.cpp:
-
-          Added TAO_HAS_INTERCEPTORS == 1 guards to all interceptor-related
-          operations, so code generated from IDL operations will compile
-          if Any operators (used by interceptors) are suppressed in code
-          generation. Thanks to Nicolas HUYNH <HUYNH_Nicolas at cena dot fr>
-          for reporting the problem.
-
-Fri Aug  6 15:45:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * TAO/utils/catior/catior.cpp
-          Added #include <ctype.h> required for Lynxos cross build.
-
-Fri Aug  6 08:05:25 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp (TAO_LogMgr_i): Initialize
-          max_id_ to 0.  Thanks to Thomas Girard <thomas.g.girard@free.fr>
-          for reporting this.
-
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp (create_with_id):
-          Duplidate object references before putting them in the hash map.
-          Thanks to Thomas Girard <thomas.g.girard@free.fr> for this fix.
-
-Fri Aug  6 12:16:35 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * utils/nslist/nslist.cpp:
-
-          Fixed a core dump with the Object is _nil (). Thanks to Tufan
-          Oruk <toruk at usa dot net> for the patch.
-
-Thu Aug  5 23:42:02 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/ec_typed_events.mpb:
-          Changed to inherit from dynamicinterface and ifr_client instead
-          of providing libs and after statements so that dependency chain
-          is complete.
-
 Thu Aug  5 20:20:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/orbsvcs/Makefile.am:
-          Changed custom build rules to use $(srcdir)/<input-file> so
-          resulting makefiles will work on systems where make doesn't
-          support VPATH.
+	* orbsvcs/orbsvcs/Makefile.am:
+	  Changed custom build rules to use $(srcdir)/<input-file> so
+	  resulting makefiles will work on systems where make doesn't
+	  support VPATH.
 
 Thu Aug  5 07:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -5199,60 +20,60 @@ Thu Aug  5 07:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Wed Aug  4 23:03:45 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp (Credentials):
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp (Credentials):
 
-          Older versions of OpenSSL didn't define the OpenSSL macro.  Use
-          CRYPTO_free if OPENSSL_free isn't defined.
+	  Older versions of OpenSSL didn't define the OpenSSL macro.  Use
+	  CRYPTO_free in OPENSSL_free isn't defined.
 
 Wed Aug  4 22:13:19 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
-          (register_acquirer_factory):
+	* orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+	  (register_acquirer_factory):
 
-          Release the String_var containing the acquisition method Id once
-          the factory is successfully registered.  Memory management
-          becomes the responsiblity of the CredentialsCurator.  Fixes a
-          double deletion error.
+	  Release the String_var containing acquisition method Id  once
+	  the factory is successfully registered.  Memory management
+	  becomes the responsiblity of the CredentialsCurator.  Fixes a
+	  double deletion error.
 
 Wed Aug  4 21:23:52 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * tao/IIOP_Acceptor.h (BASE_ACCEPTOR, CREATION_STRATEGY):
-          (CONCURRENCY_STRATEGY, ACCEPT_STRATEGY):
-        * tao/IIOP_Acceptor.cpp:
+	* tao/IIOP_Acceptor.h (BASE_ACCEPTOR, CREATION_STRATEGY):
+	  (CONCURRENCY_STRATEGY, ACCEPT_STRATEGY):
+	* tao/IIOP_Acceptor.cpp:
 
-          Removed the "TAO_IIOP_" prefix from these typedefs.  It was
-          redundant since these typedefs are already encapsulated within
-          the TAO_IIOP_Acceptor class.
+	  Removed the "TAO_IIOP_" prefix from these typedefs.  It was
+	  redundant since these typedefs are already encapsulated within
+	  the TAO_IIOP_Acceptor class.
 
-        * tao/ORB_Table.cpp (get_orbs):
+	* tao/ORB_Table.cpp (get_orbs):
 
-          Minor TAO coding convention update.
+	  Minor TAO coding convention update.
 
 Wed Aug  4 21:16:42 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
-          (ClientCredentials):
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
-          (OwnCredentials):
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
-          (TargetCredentials):
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+	  (ClientCredentials):
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+	  (OwnCredentials):
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+	  (TargetCredentials):
 
-          Explicitly qualify the namespace to which the Credentials base
-          class belongs to work around MSVC++ 6 namespace brain damage.
+	  Explicitly qualify the namespace to which the Credentials base
+	  class belongs to work around MSVC++ 6 namespace brain damage.
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (open, close):
-          (iiop_connect):
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (open, close):
+	  (iiop_connect):
 
-          Wrap calls to TAO::IIOP_SSL_Connector base class methods with
-          the ACE_NESTED_CLASS macro to work around MSVC++ 6 namespace
-          brain damage.
+	  Wrap calls to TAO::IIOP_SSL_Connector base class methods with
+	  the ACE_NESTED_CLASS macro to work around MSVC++ 6 namespace
+	  brain damage.
 
 Wed Aug  4 15:48:06 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * TAO_IDL/be/be_global.cpp (destroy):
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_cpp_init):
+	* TAO_IDL/be/be_global.cpp (destroy):
+	* TAO_IDL/driver/drv_preproc.cpp (DRV_cpp_init):
 
-          Fixed memory leaks.
+	  Fixed memory leaks.
 
 Wed Aug  4 14:10:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -5268,52 +89,52 @@ Wed Aug  4 07:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Tue Aug  3 17:08:38 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/orbsvcs/Makefile.am:
-          Removed duplicate rules for building CosEventComm and
-          CosEventChannelAdmin IDL files.
-          Changed to not install headers, at least for the time
-          being.
-
-        * orbsvcs/FTRT_Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/LoadBalancer/Makefile.am:
-        * orbsvcs/Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-          New file.
-
-        * orbsvcs/Concurrency_Service/Makefile.am:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Dump_Schedule/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Scheduling_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-          Update, with a little help from MPC.
-
-        * orbsvcs/Makefile.am:
-          Added Concurrency, CosEvent, Dump Schedule, Event, Fault
-          Detector, Fault Notifier, FT Replication Manager, FTRT Event,
-          IFR, LifeCycle, Load Balancer, Logging, Naming, Notify,
-          Scheduling, Time, and Trading services to list of SUBDIRS.
-
-        * configure.ac:
-          Added Concurrency, CosEvent, Dump Schedule, Event, Fault
-          Detector, Fault Notifier, FT Replication Manager, FTRT Event,
-          IFR, LifeCycle, Load Balancer, Logging, Naming, Notify,
-          Scheduling, Time, and Trading service Makefile.am's to list of
-          config files.
+	* orbsvcs/orbsvcs/Makefile.am:
+	  Removed duplicate rules for building CosEventComm and
+	  CosEventChannelAdmin IDL files.
+	  Changed to not install headers, at least for the time
+	  being.
+
+	* orbsvcs/FTRT_Event_Service/Makefile.am:
+	* orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
+	* orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
+	* orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
+	* orbsvcs/FT_ReplicationManager/Makefile.am:
+	* orbsvcs/Fault_Detector/Makefile.am:
+	* orbsvcs/Fault_Notifier/Makefile.am:
+	* orbsvcs/LoadBalancer/Makefile.am:
+	* orbsvcs/Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+	* orbsvcs/Notify_Service/Makefile.am:
+	  New file.
+
+	* orbsvcs/Concurrency_Service/Makefile.am:
+	* orbsvcs/CosEvent_Service/Makefile.am:
+	* orbsvcs/Dump_Schedule/Makefile.am:
+	* orbsvcs/Event_Service/Makefile.am:
+	* orbsvcs/IFR_Service/Makefile.am:
+	* orbsvcs/LifeCycle_Service/Makefile.am:
+	* orbsvcs/Naming_Service/Makefile.am:
+	* orbsvcs/Scheduling_Service/Makefile.am:
+	* orbsvcs/Time_Service/Makefile.am:
+	* orbsvcs/Trading_Service/Makefile.am:
+	  Update, with a little help from MPC.
+
+	* orbsvcs/Makefile.am:
+	  Added Concurrency, CosEvent, Dump Schedule, Event, Fault
+	  Detector, Fault Notifier, FT Replication Manager, FTRT Event,
+	  IFR, LifeCycle, Load Balancer, Logging, Naming, Notify,
+	  Scheduling, Time, and Trading services to list of SUBDIRS.
+
+	* configure.ac:
+	  Added Concurrency, CosEvent, Dump Schedule, Event, Fault
+	  Detector, Fault Notifier, FT Replication Manager, FTRT Event,
+	  IFR, LifeCycle, Load Balancer, Logging, Naming, Notify,
+	  Scheduling, Time, and Trading service Makefile.am's to list of
+	  config files.
 
 Tue Aug  3 16:32:56 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
@@ -5328,37 +149,40 @@ Tue Aug  3 16:32:56 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Tue Aug  3 13:10:04 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/orbsvcs/Makefile.am:
-          Update, with a little help from MPC.
+	* orbsvcs/orbsvcs/Makefile.am:
+	  Update, with a little help from MPC.
 
-        * orbsvcs/Makefile.am:
-          Added orbsvcs to list of SUBDIRS.
+	* orbsvcs/Makefile.am:
+	  Added orbsvcs to list of SUBDIRS.
 
-        * configure.ac:
-          Added orbsvcs/orbsvcs/Makefile to list of config files.
+	* configure.ac:
+	  Added orbsvcs/orbsvcs/Makefile to list of config files.
 
 Tue Aug  3 08:05:20 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/PSS/PSDL_Datastore.cpp:
-          Fixed TAO_PSDL_Datastore::create_index_helper() where the
-          ACE_NEW_RETURN macro was being ab/used for placement new.
-          This caused problems for targets w/ACE_HAS_NOTHROW_NEW.
-          I eliminated the error checks because this function can
-          never called with a bad buffer pointer.
+	* orbsvcs/PSS/PSDL_Datastore.cpp:
+	  Fixed TAO_PSDL_Datastore::create_index_helper() where the
+	  ACE_NEW_RETURN macro was being ab/used for placement new.
+	  This caused problems for targets w/ACE_HAS_NOTHROW_NEW.
+	  I eliminated the error checks because this function can
+	  never called with a bad buffer pointer.
+
+	* orbsvcs/TAO_Service/Makefile.am:
+	  Update, with a little help from MPC.
 
-        * orbsvcs/PSS/Makefile.am:
-          New file.
+	* orbsvcs/PSS/Makefile.am:
+	  New file.
 
-        * orbsvcs/Makefile.am:
-          Update with current MPC generated file, but enable only
-          PSS and TAO_Service in SUBDIRS.
+	* orbsvcs/Makefile.am:
+	  Update with current MPC generated file, but enable only
+	  PSS and TAO_Service in SUBDIRS.
 
-        * Makefile.am:
-          Added orbsvcs to SUBDIRS.
+	* Makefile.am:
+	  Added orbsvcs to SUBDIRS.
 
-        * configure.ac:
-          Added orbsvcs/{,PSS/,TAO_Service/}Makefile to list of
-          config files.
+	* configure.ac:
+	  Added orbsvcs/{,PSS/,TAO_Service/}Makefile to list of
+	  config files.
 
 Tue Aug  3 13:47:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -5407,9 +231,9 @@ Mon Aug  2 06:46:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Aug  1 23:41:50 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/Makefile.am:
-          Update after last change.  Fixes "make install" failure due to
-          bad dependencies.
+	* tao/Makefile.am:
+	  Update after last change.  Fixes "make install" failure due to
+	  bad dependencies.
 
 Mon Aug  2 06:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -5434,47 +258,47 @@ Mon Aug  2 06:10:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Aug  1 22:39:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/BiDir_GIOP.mpc:
-        * tao/Domain.mpc:
-        * tao/DynamicAny.mpc:
-        * tao/DynamicInterface.mpc:
-        * tao/IFR_Client.mpc:
-        * tao/IORInterceptor.mpc:
-        * tao/IORManipulation.mpc:
-        * tao/IORTable.mpc:
-        * tao/Messaging.mpc:
-        * tao/ObjRefTemplate.mpc:
-        * tao/PortableServer.mpc:
-        * tao/RTCORBA.mpc:
-        * tao/RTPortableServer.mpc:
-        * tao/RTScheduler.mpc:
-        * tao/SmartProxies.mpc:
-        * tao/Strategies.mpc:
-        * tao/TypeCodeFactory.mpc:
-        * tao/Utils.mpc:
-        * tao/Valuetype.mpc:
-          Fix thinko.  When these files were moved from subdirectories, I
-          first merged them into tao.mpc, which required explicit project
-          names.  I didn't realize at that time that the precise name was
-          significant.  This caused build failures due to bad dependencies.
-          I've removed the explicit names since the projects have been
-          split back into separate project files.
+	* tao/BiDir_GIOP.mpc:
+	* tao/Domain.mpc:
+	* tao/DynamicAny.mpc:
+	* tao/DynamicInterface.mpc:
+	* tao/IFR_Client.mpc:
+	* tao/IORInterceptor.mpc:
+	* tao/IORManipulation.mpc:
+	* tao/IORTable.mpc:
+	* tao/Messaging.mpc:
+	* tao/ObjRefTemplate.mpc:
+	* tao/PortableServer.mpc:
+	* tao/RTCORBA.mpc:
+	* tao/RTPortableServer.mpc:
+	* tao/RTScheduler.mpc:
+	* tao/SmartProxies.mpc:
+	* tao/Strategies.mpc:
+	* tao/TypeCodeFactory.mpc:
+	* tao/Utils.mpc:
+	* tao/Valuetype.mpc:
+	  Fix thinko.  When these files were moved from subdirectories, I
+	  first merged them into tao.mpc, which required explicit project
+	  names.  I didn't realize at that time that the precise name was
+	  significant.  This caused build failures due to bad dependencies.
+	  I've removed the explicit names since the projects have been
+	  split back into separate project files.
 
 Sun Aug  1 21:05:59 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * TAO_IDL/Makefile.am:
-          Add _LDFLAGS definitions with -version-number flag for FE and BE
-          libraries.
+	* TAO_IDL/Makefile.am:
+	  Add _LDFLAGS definitions with -version-number flag for FE and BE
+	  libraries.
 
-        * tao/Makefile.am:
-          Update, with a little help from MPC.
+	* tao/Makefile.am:
+	  Update, with a little help from MPC.
 
-        * Makefile.am:
-          Update.
+	* Makefile.am:
+	  Update.
 
-        * configure.ac:
-          Added.  First cut at a new configure script with bits taken from
-          ACE's configure.ac and the old TAO configure.in in the CVS Attic.
+	* configure.ac:
+	  Added.  First cut at a new configure script with bits taken from
+	  ACE's configure.ac and the old TAO configure.in in the CVS Attic.
 
 Sun Aug  1 20:57:32 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
@@ -5507,63 +331,63 @@ Sun Aug  1 20:57:32 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Sun Aug  1 16:32:56 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * TAO_IDL/Makefile.am:
-          Update, with a little help from MPC.
+	* TAO_IDL/Makefile.am:
+	  Update, with a little help from MPC.
 
-        * TAO_IDL/ast/Makefile.am:
-        * TAO_IDL/be/Makefile.am:
-        * TAO_IDL/be_include/Makefile.am:
-        * TAO_IDL/driver/Makefile.am:
-        * TAO_IDL/fe/Makefile.am:
-        * TAO_IDL/include/Makefile.am:
-        * TAO_IDL/narrow/Makefile.am:
-        * TAO_IDL/util/Makefile.am:
-          Remove stale Makefile.am's.
+	* TAO_IDL/ast/Makefile.am:
+	* TAO_IDL/be/Makefile.am:
+	* TAO_IDL/be_include/Makefile.am:
+	* TAO_IDL/driver/Makefile.am:
+	* TAO_IDL/fe/Makefile.am:
+	* TAO_IDL/include/Makefile.am:
+	* TAO_IDL/narrow/Makefile.am:
+	* TAO_IDL/util/Makefile.am:
+	  Remove stale Makefile.am's.
 
 Sun Aug  1 09:48:46 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/BiDir_GIOP/BiDir_GIOP.mpc:
-        * tao/Domain/Domain.mpc:
-        * tao/DynamicAny/DynamicAny.mpc:
-        * tao/DynamicInterface/DynamicInterface.mpc:
-        * tao/IFR_Client/IFR_Client.mpc:
-        * tao/IORInterceptor/IORInterceptor.mpc:
-        * tao/IORManipulation/IORManipulation.mpc:
-        * tao/IORTable/IORTable.mpc:
-        * tao/Messaging/Messaging.mpc:
-        * tao/ObjRefTemplate/ObjRefTemplate.mpc:
-        * tao/PortableServer/PortableServer.mpc:
-        * tao/RTCORBA/RTCORBA.mpc:
-        * tao/RTPortableServer/RTPortableServer.mpc:
-        * tao/RTScheduling/RTScheduler.mpc:
-        * tao/SmartProxies/SmartProxies.mpc:
-        * tao/Strategies/Strategies.mpc:
-        * tao/TypeCodeFactory/TypeCodeFactory.mpc:
-        * tao/Utils/Utils.mpc:
-        * tao/Valuetype/Valuetype.mpc:
-          Move from here...
-
-        * tao/BiDir_GIOP.mpc:
-        * tao/Domain.mpc:
-        * tao/DynamicAny.mpc:
-        * tao/DynamicInterface.mpc:
-        * tao/IFR_Client.mpc:
-        * tao/IORInterceptor.mpc:
-        * tao/IORManipulation.mpc:
-        * tao/IORTable.mpc:
-        * tao/Messaging.mpc:
-        * tao/ObjRefTemplate.mpc:
-        * tao/PortableServer.mpc:
-        * tao/RTCORBA.mpc:
-        * tao/RTPortableServer.mpc:
-        * tao/RTScheduler.mpc:
-        * tao/SmartProxies.mpc:
-        * tao/Strategies.mpc:
-        * tao/TypeCodeFactory.mpc:
-        * tao/Utils.mpc:
-        * tao/Valuetype.mpc:
-          ...to here.  Adapt as necessary to find source, inline, and
-          template files.
+	* tao/BiDir_GIOP/BiDir_GIOP.mpc:
+	* tao/Domain/Domain.mpc:
+	* tao/DynamicAny/DynamicAny.mpc:
+	* tao/DynamicInterface/DynamicInterface.mpc:
+	* tao/IFR_Client/IFR_Client.mpc:
+	* tao/IORInterceptor/IORInterceptor.mpc:
+	* tao/IORManipulation/IORManipulation.mpc:
+	* tao/IORTable/IORTable.mpc:
+	* tao/Messaging/Messaging.mpc:
+	* tao/ObjRefTemplate/ObjRefTemplate.mpc:
+	* tao/PortableServer/PortableServer.mpc:
+	* tao/RTCORBA/RTCORBA.mpc:
+	* tao/RTPortableServer/RTPortableServer.mpc:
+	* tao/RTScheduling/RTScheduler.mpc:
+	* tao/SmartProxies/SmartProxies.mpc:
+	* tao/Strategies/Strategies.mpc:
+	* tao/TypeCodeFactory/TypeCodeFactory.mpc:
+	* tao/Utils/Utils.mpc:
+	* tao/Valuetype/Valuetype.mpc:
+	  Move from here...
+
+	* tao/BiDir_GIOP.mpc:
+	* tao/Domain.mpc:
+	* tao/DynamicAny.mpc:
+	* tao/DynamicInterface.mpc:
+	* tao/IFR_Client.mpc:
+	* tao/IORInterceptor.mpc:
+	* tao/IORManipulation.mpc:
+	* tao/IORTable.mpc:
+	* tao/Messaging.mpc:
+	* tao/ObjRefTemplate.mpc:
+	* tao/PortableServer.mpc:
+	* tao/RTCORBA.mpc:
+	* tao/RTPortableServer.mpc:
+	* tao/RTScheduler.mpc:
+	* tao/SmartProxies.mpc:
+	* tao/Strategies.mpc:
+	* tao/TypeCodeFactory.mpc:
+	* tao/Utils.mpc:
+	* tao/Valuetype.mpc:
+	  ...to here.  Adapt as necessary to find source, inline, and
+	  template files.
 
 Sun Aug  1 17:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -5581,10 +405,10 @@ Sun Aug  1 17:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Aug  1 08:53:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/tao.mpc:
-          Updated Header_Files, Inline_Files, and Template_Files so that
-          generated project files will contain complete list for install.
-          Suggested by Chad Elliot <elliot_c@ociweb.com>.
+	* tao/tao.mpc:
+	  Updated Header_Files, Inline_Files, and Template_Files so that
+	  generated project files will contain complete list for install.
+	  Suggested by Chad Elliot <elliot_c@ociweb.com>.
 
 Sun Aug  1 15:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -5622,30 +446,30 @@ Sun Aug  1 15:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Aug  1 08:16:27 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-          Changed ftrtec_export.h to FtRtEvent/EventChannel/ftrtec_export.h
-          in Header_Files.
+	* orbsvcs/orbsvcs/FtRtEvent.mpc:
+	  Changed ftrtec_export.h to FtRtEvent/EventChannel/ftrtec_export.h
+	  in Header_Files.
 
-        * tao/tao.mpc:
-        * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
-          Removed Auto_Functor.cpp from Template_Files.
+	* tao/tao.mpc:
+	* orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
+	  Removed Auto_Functor.cpp from Template_Files.
 
-        * TAO_IDL/tao_idl.1: Update to reflect current file extensions.
+	* TAO_IDL/tao_idl.1: Update to reflect current file extensions.
 
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-          Changed group name from EventLog to DsEventLogAdmin.
+	* orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+	  Changed group name from EventLog to DsEventLogAdmin.
 
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-          Changed group name from Log to DsLogAdmin.
+	* orbsvcs/orbsvcs/DsLogAdmin.mpc:
+	  Changed group name from Log to DsLogAdmin.
 
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-          Changed group name from Log to DsNotifyLogAdmin.
+	* orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+	  Changed group name from Log to DsNotifyLogAdmin.
 
 Sun Aug  1 09:10:39 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * ChangeLogs/ChangeLog-04a:
+	* ChangeLogs/ChangeLog-04a:
 
-          Moved the contents to the new directory.
+	  Moved the contents to the new directory.
 
 Sat Jul 31 11:14:00 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index 75b66ba6476..f3c62adda15 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -9,7 +9,7 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = 1.9 foreign
 
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = -I ../m4
@@ -21,8 +21,7 @@ man_MANS = tao-config.1
 SUBDIRS = \
         TAO_IDL \
         tao \
-	orbsvcs \
-	utils
+	orbsvcs
 
 ## For some reason, automake doesn't include acconfig.h in the distribution
 EXTRA_DIST =  \
@@ -33,7 +32,7 @@ EXTRA_DIST =  \
   README.sun \
   tao-config.in \
   tao-config.1.in \
-  taoConf.sh.in
+  taoConf.sh.in 
 
 DISTCLEANFILES = tao-config taoConf.sh tao-config.1
 
diff --git a/TAO/NEWS b/TAO/NEWS
index 6ecc7a99d2f..2d13bccc0f7 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -4,70 +4,32 @@ PLANNED MAJOR CHANGES TARGETED FOR TAO-1.4.3
 - (Johnny/Ossama) Bug 1420-Protocols in Transport Cache not amenable for
   strict policy enforcement
 
-- (Johnny/Ossama) Location Forwarding fixes
+- (Johnny/Ossama) Bug 1476-SyncScope::NONE blocks during connects
 
-- (Ossama) Typecode overhaul
+- (Johnny/Ossama) Location Forwarding fixes
 
-  . ONGOING - ETA 8/31
+- (Ossama) Typecode refactoring fixes
 
 - (Ossama) Remainder of CSIv2 code that didn't make it into TAO 1.4.2
 
-  . ONGOING - ETA 9/26
-
 - (Ossama/Jeff) Skeleton refactoring
 
-  . TO BE STARTED - 9/1
-
 - (Johnny/Ossama) POA refactoring/modularization
 
-  . ONGOING - ETA unknown
-
 - (JTC/Ossama) autoconf support for TAO
 
-  . ONGOING - ETA unknown
-
-- (Bala) Implementation Repository enhancements
-
 - (OCI) Naming Service implementation fixes
 
-  Wed Aug 25 16:03:29 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
 - (OCI) Wait on LF No Upcalls wait strategy
 
-  Thu Aug 19 16:49:24 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
 - (OCI) Parse-magic-bytes re-integration
 
-  Chris/Bala--need to coordinate.  Hopefully week of 8/30?
+- (OCI) TSS memory leak fixes (Bug 1542)
 
 - (OCI) [hopeful] Notification Service EventReliability and ConnectionReliability QoS
 
-  Dale Wilson, Ongoing.
-
 - (OCI) better compatibility with JDK orb
 
-  Dale Wilson will do this week of 8/30.
-
-- (JTC) Split ORB Services into stub, skeleton, and implementation libraries.
-
-  Naming, Trading, Event, Notification, and Logging Services have commited.
-
-- (OCI) Install common utilities (tao_imr, tao_ifr, nslist, nsadd,
-  nsdel, NamingViewer) in $ACE_ROOT/bin.
-
-  Sat Sep 11 12:25:07 2004  Steve Totten  <totten_s@ociweb.com>
-
-USER VISIBLE CHANGES BETWEEN TAO-1.4.2 and TAO-1.4.3
-====================================================
-
-. ORB
-  - Bug 1476-SyncScope::NONE blocks during connects
-
-. POA
-  - The PortableServer library isn't depended anymore on the
-    ObjRefTemplate and IORInterceptor libraries.  ObjRefTemplate and
-    IORInterceptor are loaded on demand and depend on PortableServer.
-
 USER VISIBLE CHANGES BETWEEN TAO-1.4.1 and TAO-1.4.2
 ====================================================
 
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 451457668da..5e87818f757 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -1,9 +1,7 @@
-[Please use the PRF form below to submit bug reports, problem
+[Please use the form below to submit bug reports, problem
  reports, etc., to the TAO developers and interested users.
- Send to tao-bugs@cs.wustl.edu.  If you are using OCI or PrismTech's
- versions of TAO do not send bugs to this mailing list, but
- instead contact those companies for support.  Please also send your
- PRF as plain ASCII text, _not_ uuencoded or as an attachment.
+ Send to tao-bugs@cs.wustl.edu.  Please send it as plain
+ ASCII text, _not_ uuencoded or as an attachment.
 
  We prefer that all bug reports be submitted through our bug tracking
  system.  See $ACE_ROOT/docs/usage-bugzilla.html for more information
@@ -32,12 +30,6 @@
  Subjects like "TAO bug" or "bug report" are not helpful!
  Also, do _not_ include the word "help" in the Subject!]
 
- When including your config.h and platform_macros.GNU files as requested
- below, only include the contents if you use the recommended method of
- including the platform-specific file in your file. If you use a link
- to the platform-specific file, simply state which one - DO NOT include
- an entire platform-specific configuration file in the form.
-
 8<----------8<----------8<----------8<----------8<----------8<----------8<----
 
 To: tao-bugs@cs.wustl.edu
@@ -53,15 +45,6 @@ Subject: [area]: [synopsis]
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
     COMPILER NAME AND VERSION (AND PATCHLEVEL):
 
-    CONTENTS OF $ACE_ROOT/ace/config.h [if you use a link to a platform-
-    specific file, simply state which one]:
-
-    CONTENTS OF $ACE_ROOT/include/makeinclude/platform_macros.GNU (unless
-    this isn't used in this case, e.g., with Microsoft Visual C++):
-
-    CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-    (used by MPC when you generate your own makefiles):
-
     AREA/CLASS/EXAMPLE AFFECTED:
 [What example failed?  What module failed to compile?]
 
diff --git a/TAO/Release b/TAO/Release
index f70cefc8c91..2adbc52bf02 100644
--- a/TAO/Release
+++ b/TAO/Release
@@ -22,7 +22,6 @@ CONTROLLED_FILES = TAO/COPYING* \
 		   TAO/TAO_IDL \
 		   TAO/VERSION \
 		   TAO/docs \
-		   TAO/NEWS \
 		   TAO/examples \
 		   TAO/orbsvcs \
 		   TAO/performance-tests \
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 41f004eeaee..d581290c763 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -378,22 +378,11 @@ compiler), gperf, the orb services libraries, and the standalone
 executables (such as Naming Service, etc.).  It can be used to build
 all the files needed to build/run TAO applications.</P>  
 
-<<<<<<< TAO-INSTALL.html
-<H4>Visual C++ 7.1</H4> The DOC group doesn't support TAO on VC++ 7.0
-since the libraries that were shipped with VC++ 7.0 did not work
-well. The DOC group supports only VC++ 7.1, which is used by their
-sponsors. The following points are relevant to users who are trying to
-use TAO with VC++ 7.1.
-=======
 <H4>Visual C++ 7.1</H4>
 The DOC group doesn't support TAO on VC++ 7.0 since the libraries that
 were shipped with VC++ 7.0 did not work well. The DOC group supports
-only VC++ 7.1, which is used by their sponsors. The above mentioned
-points are also relevant to users who are trying to use TAO with VC++
-7.1. Additionally, all required options are set for the generated .sln
-files. If something is missing then it is probably a bug with
-MPC. Please report such bugs to the tao-users newsgroups.
->>>>>>> 1.86
+only VC++ 7.1, which is used by their sponsors. The following points are
+relevant to users who are trying to use TAO with VC++ 7.1. 
 
 <H4>Borland C++ Builder</H4> <P>
 
diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp
index b83509eff93..3e57283f4fc 100644
--- a/TAO/TAO_IDL/ast/ast_component.cpp
+++ b/TAO/TAO_IDL/ast/ast_component.cpp
@@ -73,58 +73,6 @@ AST_Component::redefine (AST_Interface *from)
   this->pd_consumes = c->pd_consumes;
 }
 
-AST_Decl *
-AST_Component::look_in_inherited (UTL_ScopedName *e,
-                                  idl_bool treat_as_ref)
-{
-  AST_Decl *d = 0;
-  
-  if (this->pd_base_component != 0)
-    {
-      d = this->pd_base_component->lookup_by_name (e, treat_as_ref);
-    }
-  
-  return d;
-}
-
-// Look through supported interface list.
-AST_Decl *
-AST_Component::look_in_supported (UTL_ScopedName *e,
-                                  idl_bool treat_as_ref)
-{
-  AST_Decl *d = 0;
-  AST_Interface **is = 0;
-  long nis = -1;
-
-  // Can't look in an interface which was not yet defined.
-  if (!this->is_defined ())
-    {
-      idl_global->err ()->fwd_decl_lookup (this,
-                                           e);
-      return 0;
-    }
-
-  // OK, loop through supported interfaces.
-
-  // (Don't leave the inheritance hierarchy, no module or global ...)
-  // Find all and report ambiguous results as error.
-
-  for (nis = this->n_supports (), is = this->supports ();
-       nis > 0;
-       nis--, is++)
-    {
-      d = (*is)->lookup_by_name (e,
-                                 treat_as_ref,
-                                 0 /* not in parent */);
-      if (d != 0)
-        {
-          break;
-        }
-    }
-    
-  return d;
-}
-
 AST_Component *
 AST_Component::base_component (void) const
 {
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index c0721b6a34b..dcc36e6cc99 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -871,6 +871,11 @@ AST_Decl::repoID (char *value)
     }
     
   this->repoID_ = value;
+
+  // Forces version to be set to the last id component.
+  delete [] this->version_;
+  this->version_ = 0;
+  (void) this->version ();
 }
 
 const char *
@@ -915,10 +920,6 @@ AST_Decl::version (void)
         {
           this->version_ = ACE::strnew (tail2 + 1);
         }
-      else
-        {
-          this->version_ = ACE::strnew ("1.0");
-        }
     }
 
   return this->version_;
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 4cd2bf8af20..bdd645d1024 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -1707,8 +1707,6 @@ eval_kind(AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EK_octet:
       return coerce_value (ev, AST_Expression::EV_octet);
-    case AST_Expression::EK_bool:
-      return coerce_value (ev, AST_Expression::EV_bool);
     default:
       return 0;
   }
@@ -1716,19 +1714,11 @@ eval_kind(AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
 
 // Private operations.
 
-// @@@ (JP) CORBA 2.6 and earlier say that in a constant expression,
-// each subexpression must fall within the range of the assigned type.
-// However, this may be hard for the compiler in some cases (must
-// evaluate all grouping possibilities). So there is an outstanding
-// issue, #1139, and the best guess is that it will ultimately be
-// decided that only the final value must fall within the range of
-// the assigned type. So there are no checks here, only in coerce().
-
 // Apply binary operators to an AST_Expression after evaluating
 // its sub-expressions.
 // Operations supported: '+', '-', '*', '/'
 AST_Expression::AST_ExprValue *
-AST_Expression::eval_bin_op (void)
+AST_Expression::eval_bin_op (AST_Expression::EvalKind /* ek */)
 {
   AST_ExprValue *retval = 0;
 
@@ -1736,14 +1726,29 @@ AST_Expression::eval_bin_op (void)
     {
       return 0;
     }
-    
+// @@@ (JP) See comment below.
+/*
+  this->pd_v1->set_ev (this->pd_v1->eval_internal (ek));
+
+  if (this->pd_v1->ev () == 0)
+    {
+      return 0;
+    }
+*/
   this->pd_v1->set_ev (this->pd_v1->coerce (EV_double));
 
   if (this->pd_v1->ev () == 0)
     {
       return 0;
     }
+/*
+  this->pd_v2->set_ev (this->pd_v2->eval_internal (ek));
 
+  if (this->pd_v2->ev () == 0)
+    {
+      return 0;
+    }
+*/
   this->pd_v2->set_ev (this->pd_v2->coerce (EV_double));
 
   if (pd_v2->ev () == 0)
@@ -1793,6 +1798,15 @@ AST_Expression::eval_bin_op (void)
       return 0;
     }
 
+  // @@@ (JP) CORBA 2.6 and earlier say that in a constant expression,
+  // each subexpression must fall within the range of the assigned type.
+  // However, this may be hard for the compiler in some cases (must
+  // evaluate all grouping possibilities). So there is an outstanding
+  // issue, #1139, and the best guess is that it will ultimately be
+  // decided that only the final value must fall within the range of
+  // the assigned type. So I've commented out the checks above, and
+  // added this final evaluation below. (02-06-25).
+//  return eval_kind (retval, ek);
   return retval;
 }
 
@@ -1828,12 +1842,6 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
       this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulong));
       retval->et = EV_ulong;
     }
-  else if (ek == EK_bool)
-    {
-      this->pd_v1->set_ev (this->pd_v1->coerce (EV_bool));
-      this->pd_v2->set_ev (this->pd_v2->coerce (EV_bool));
-      retval->et = EV_bool;
-    }
   else
     {
       this->pd_v1->set_ev (this->pd_v1->coerce (EV_long));
@@ -2169,9 +2177,6 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     case EV_octet:
       this->pd_ev = this->eval_internal (EK_octet);
       break;
-    case EV_bool:
-      this->pd_ev = this->eval_internal (EK_bool);
-      break;
     default:
       this->pd_ev = this->eval_internal (EK_const);
       break;
@@ -2272,13 +2277,6 @@ AST_Expression::eval_internal (AST_Expression::EvalKind ek)
       return eval_kind (this->pd_ev,
                         ek);
     }
-    
-  if (ek == EK_bool || ek == EK_octet)
-    {
-      // Operators may be used only with integer or floating point types.
-      idl_global->err ()->illegal_infix ();
-      return 0;
-    }
 
   //  OK, must evaluate operator.
   switch (this->pd_ec)
@@ -2288,7 +2286,7 @@ AST_Expression::eval_internal (AST_Expression::EvalKind ek)
     case EC_mul:
     case EC_div:
     case EC_mod:
-      this->pd_ev = this->eval_bin_op ();
+      this->pd_ev = this->eval_bin_op (ek);
       return eval_kind (this->pd_ev,
                         ek);
     case EC_or:
diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp
index bbc1c40615c..c098ccb4763 100644
--- a/TAO/TAO_IDL/ast/ast_home.cpp
+++ b/TAO/TAO_IDL/ast/ast_home.cpp
@@ -7,7 +7,6 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 #include "utl_indenter.h"
-#include "utl_err.h"
 #include "global_extern.h"
 
 ACE_RCSID (ast, 
@@ -58,58 +57,6 @@ AST_Home::~AST_Home (void)
 {
 }
 
-AST_Decl *
-AST_Home::look_in_inherited (UTL_ScopedName *e,
-                             idl_bool treat_as_ref)
-{
-  AST_Decl *d = 0;
-  
-  if (this->pd_base_home != 0)
-    {
-      d = this->pd_base_home->lookup_by_name (e, treat_as_ref);
-    }
-  
-  return d;
-}
-
-// Look through supported interface list.
-AST_Decl *
-AST_Home::look_in_supported (UTL_ScopedName *e,
-                             idl_bool treat_as_ref)
-{
-  AST_Decl *d = 0;
-  AST_Interface **is = 0;
-  long nis = -1;
-
-  // Can't look in an interface which was not yet defined.
-  if (!this->is_defined ())
-    {
-      idl_global->err ()->fwd_decl_lookup (this,
-                                           e);
-      return 0;
-    }
-
-  // OK, loop through supported interfaces.
-
-  // (Don't leave the inheritance hierarchy, no module or global ...)
-  // Find all and report ambiguous results as error.
-
-  for (nis = this->n_supports (), is = this->supports ();
-       nis > 0;
-       nis--, is++)
-    {
-      d = (*is)->lookup_by_name (e,
-                                 treat_as_ref,
-                                 0 /* not in parent */);
-      if (d != 0)
-        {
-          break;
-        }
-    }
-    
-  return d;
-}
-
 AST_Home *
 AST_Home::base_home (void) const
 {
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 8c41d3f43d5..3c43841b2f5 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -91,12 +91,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_err.h"
 #include "utl_identifier.h"
 #include "utl_indenter.h"
-#include "utl_string.h"
 #include "global_extern.h"
 #include "nr_extern.h"
 
-#include "ace/streams.h"
-
 ACE_RCSID (ast,
            ast_interface,
            "$Id$")
@@ -1481,76 +1478,6 @@ AST_Interface::redef_clash (void)
   return 0;
 }
 
-// Look through inherited interfaces.
-AST_Decl *
-AST_Interface::look_in_inherited (UTL_ScopedName *e,
-                                  idl_bool treat_as_ref)
-{
-  AST_Decl *d = 0;
-  AST_Decl *d_before = 0;
-  AST_Interface **is = 0;
-  long nis = -1;
-
-  // Can't look in an interface which was not yet defined.
-  if (!this->is_defined ())
-    {
-      idl_global->err ()->fwd_decl_lookup (this,
-                                           e);
-      return 0;
-    }
-
-  // OK, loop through inherited interfaces.
-
-  // (Don't leave the inheritance hierarchy, no module or global ...)
-  // Find all and report ambiguous results as error.
-
-  for (nis = this->n_inherits (), is = this->inherits ();
-       nis > 0;
-       nis--, is++)
-    {
-      d = (*is)->lookup_by_name (e,
-                                 treat_as_ref,
-                                 0 /* not in parent */);
-      if (d != 0)
-        {
-          if (d_before == 0)
-            {
-              // First result found.
-              d_before = d;
-            }
-          else
-            {
-              // Conflict against further results?
-              if (d != d_before)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "warning in %s line %d: ",
-                              idl_global->filename ()->get_string (),
-                              idl_global->lineno ()));
-
-                  e->dump (*ACE_DEFAULT_LOG_STREAM);
-
-                  ACE_ERROR ((LM_ERROR,
-                              " is ambiguous in scope.\n"
-                              "Found "));
-
-                  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
-
-                  ACE_ERROR ((LM_ERROR,
-                              " and "));
-
-                  d_before->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
-
-                  ACE_ERROR ((LM_ERROR,
-                              ".\n"));
-                }
-            }
-        }
-    }
-
-  return d_before;
-}
-
 AST_Decl *
 AST_Interface::lookup_for_add (AST_Decl *d,
                                idl_bool /* treat_as_ref */)
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index 707fb43f3fd..244521892aa 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -1000,7 +1000,7 @@ AST_Module::fe_add_constant (AST_Constant *t)
         {
           idl_global->err ()->redefinition_in_scope (t,
                                                      d);
-          return 0;
+          return NULL;
         }
     }
 
@@ -1633,21 +1633,6 @@ AST_Module::be_add_interface (AST_Interface *i,
   return 0;
 }
 
-// Has this node been referenced here before?
-idl_bool
-AST_Module::referenced (AST_Decl *e,
-                        Identifier *id)
-{
-  idl_bool refd = this->UTL_Scope::referenced (e, id);
-  
-  if (refd)
-    {
-      return I_TRUE;
-    }
-    
-  return this->look_in_previous (e->local_name ()) != 0;
-}
-
 void
 AST_Module::add_to_previous (AST_Module *m)
 {
diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp
index 2325c2684cd..1cd6826c64d 100644
--- a/TAO/TAO_IDL/ast/ast_root.cpp
+++ b/TAO/TAO_IDL/ast/ast_root.cpp
@@ -230,7 +230,7 @@ AST_Root::destroy ()
       
       if (d->node_type () == AST_Decl::NT_pre_defined)
         {
-          j = i + 1;
+          j = i;
           break;
         }
 
diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp
index 8d5a06dc9e9..348d5dbbf4d 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp
@@ -8,12 +8,9 @@
 #include "utl_err.h"
 #include "utl_identifier.h"
 #include "utl_indenter.h"
-#include "utl_string.h"
 #include "global_extern.h"
 #include "nr_extern.h"
 
-#include "ace/streams.h"
-
 ACE_RCSID (ast, 
            ast_valuetype, 
            "$Id$")
@@ -134,76 +131,6 @@ AST_ValueType::will_have_factory (void)
   return I_FALSE;
 }
 
-// Look through supported interface list.
-AST_Decl *
-AST_ValueType::look_in_supported (UTL_ScopedName *e,
-                                  idl_bool treat_as_ref)
-{
-  AST_Decl *d = 0;
-  AST_Decl *d_before = 0;
-  AST_Interface **is = 0;
-  long nis = -1;
-
-  // Can't look in an interface which was not yet defined.
-  if (!this->is_defined ())
-    {
-      idl_global->err ()->fwd_decl_lookup (this,
-                                           e);
-      return 0;
-    }
-
-  // OK, loop through supported interfaces.
-
-  // (Don't leave the inheritance hierarchy, no module or global ...)
-  // Find all and report ambiguous results as error.
-
-  for (nis = this->n_supports (), is = this->supports ();
-       nis > 0;
-       nis--, is++)
-    {
-      d = (*is)->lookup_by_name (e,
-                                 treat_as_ref,
-                                 0 /* not in parent */);
-      if (d != 0)
-        {
-          if (d_before == 0)
-            {
-              // First result found.
-              d_before = d;
-            }
-          else
-            {
-              // Conflict against further results?
-              if (d != d_before)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "warning in %s line %d: ",
-                              idl_global->filename ()->get_string (),
-                              idl_global->lineno ()));
-
-                  e->dump (*ACE_DEFAULT_LOG_STREAM);
-
-                  ACE_ERROR ((LM_ERROR,
-                              " is ambiguous in scope.\n"
-                              "Found "));
-
-                  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
-
-                  ACE_ERROR ((LM_ERROR,
-                              " and "));
-
-                  d_before->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
-
-                  ACE_ERROR ((LM_ERROR,
-                              ".\n"));
-                }
-            }
-        }
-    }
-
-  return d_before;
-}
-
 void
 AST_ValueType::destroy (void)
 {
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
index b00d7d35941..652a768516c 100644
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ b/TAO/TAO_IDL/be/be_attribute.cpp
@@ -25,8 +25,8 @@
 
 #include "global_extern.h"
 
-ACE_RCSID (be,
-           be_attribute,
+ACE_RCSID (be, 
+           be_attribute, 
            "$Id$")
 
 be_attribute::be_attribute (void)
@@ -77,15 +77,9 @@ be_attribute::be_attribute (idl_bool ro,
            be_operation_default_strategy (0));
   this->set_strategy_ = bods;
 
-  // TAO_IDL generated attribute methods currently have an exception
-  // specification containing CORBA::SystemException.  Make sure we
-  // generate a "tao/SystemException.h" include directive.
-  ACE_SET_BITS (idl_global->decls_seen_info_,
-                idl_global->decls_seen_masks.operation_seen_);
-
   if (!this->imported () && !this->is_local ())
     {
-      // For the return types of the two operations
+      // For the return types of the two operations 
       // generated from this attribute.
       this->set_arg_seen_bit (be_type::narrow_from_decl (ft));
       ACE_SET_BITS (idl_global->decls_seen_info_,
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index d1a72b65667..7cf18dcfe6e 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -462,7 +462,7 @@ TAO_CodeGen::start_server_header (const char *fname)
   if (be_global->gen_amh_classes ())
     {
       this->gen_standard_include (this->server_header_,
-                                  "tao/Messaging/AMH_Response_Handler.h");
+                                  "tao/PortableServer/AMH_Response_Handler.h");
     }
 
   *this->server_header_ << be_nl << be_nl
@@ -885,12 +885,6 @@ TAO_CodeGen::start_implementation_header (const char *fname)
     << "#pragma once\n"
     << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n\n";
 
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.local_iface_seen_))
-    {
-      *this->implementation_header_ << "#include \"tao/LocalObject.h\"\n\n";
-    }
-
   return 0;
 }
 
@@ -1169,10 +1163,7 @@ TAO_CodeGen::end_server_skeletons (void)
 int
 TAO_CodeGen::end_anyop_source (void)
 {
-  if (!be_global->gen_tmplinst ())
-    {
-      *this->anyop_source_ << "\n";
-    }
+  *this->anyop_source_ << "\n\n";
 
   return 0;
 }
@@ -1383,24 +1374,19 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
   this->gen_standard_include (this->client_header_,
                               "tao/ORB.h");
 
-  this->gen_cond_file_include (
-      idl_global->decls_seen_masks.operation_seen_,
-      "tao/SystemException.h",
-      this->client_header_
-    );
-
-  // Not needed at the moment, since UserException.h is pulled in by
-  // ORB.h, which is included in the stub header file. May change if
-  // ORB.h is rearranged to make a lighter include for applications.
-  // System exception throw spec for every operation may change soon.
+  // Not needed at the moment, since Exception.h is pulled in by ORB.h,
+  // included at the top of the stub header file. May change if ORB.h
+  // is rearranged to make a lighter include for applications.
 #if 0
+  // System exception throw spec for every operation may change soon.
   // For IDL exception, we need full knowledge of CORBA::UserException.
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.exception_seen_,
-      "tao/UserException.h",
+      idl_global->decls_seen_masks.operation_seen_
+      | idl_global->decls_seen_masks.exception_seen_,
+      "tao/Exception.h",
       this->client_header_
     );
-#endif  /* 0 */
+#endif
 
   this->gen_standard_include (this->client_header_,
                               "tao/Environment.h");
@@ -1570,22 +1556,6 @@ TAO_CodeGen::gen_stub_src_includes (void)
                                   "tao/Typecode.h");
     }
 
-  // The UserException::_tao_{en,de}code() methods can throw a
-  // CORBA::MARSHAL exception so make sure that system exception is
-  // fully declared/defined by including "tao/SystemException.h".
-  // However, only include "tao/SystemException.h" if a user exception
-  // was encountered and if we're not already including it in the stub
-  // header.
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.exception_seen_)
-      && ACE_BIT_DISABLED (idl_global->decls_seen_info_,
-                           idl_global->decls_seen_masks.operation_seen_))
-    {
-      this->gen_standard_include (this->client_stubs_,
-                                  "tao/SystemException.h");
-    }
-
-
   // Includes whatever Any template classes that may be needed.
   this->gen_any_file_includes ();
 
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 7d30f48bfd2..c4644d48969 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -83,8 +83,7 @@ BE_GlobalData::BE_GlobalData (void)
     lookup_strategy_ (TAO_PERFECT_HASH),
     void_type_ (0),
     ccmobject_ (0),
-    gen_anyop_files_ (I_FALSE),
-    do_ccm_preproc_ (I_TRUE)
+    gen_anyop_files_ (I_FALSE)
 {
 }
 
@@ -993,18 +992,6 @@ BE_GlobalData::gen_anyop_files (idl_bool val)
   this->gen_anyop_files_ = val;
 }
 
-idl_bool
-BE_GlobalData::do_ccm_preproc (void) const
-{
-  return this->do_ccm_preproc_;
-}
-
-void
-BE_GlobalData::do_ccm_preproc (idl_bool val)
-{
-  this->do_ccm_preproc_ = val;
-}
-
 ACE_CString
 BE_GlobalData::spawn_options (void)
 {
@@ -1369,6 +1356,11 @@ BE_GlobalData::parse_args (long &i, char **av)
             // generating Direct collocated stubs.
             be_global->gen_direct_collocation (1);
           }
+        else if (av[i][2] == 'v')
+          {
+            // enable OBV (Valuetype) support.
+            idl_global->obv_support (1);
+          }
         else if (av[i][2] == 'I')
           {
             size_t options = ACE_OS::strlen(av[i]) - 3;
@@ -1451,34 +1443,34 @@ BE_GlobalData::parse_args (long &i, char **av)
         if (av[i][2] == 'a')
           {
             // suppress Any support
-            be_global->any_support (I_FALSE);
+            be_global->any_support (0);
           }
         else if (av[i][2] == 't')
           {
             // suppress typecode support
             // Anys must be suppressed as well
-            be_global->tc_support (I_FALSE);
-            be_global->any_support (I_FALSE);
+            be_global->tc_support (0);
+            be_global->any_support (0);
           }
         else if (av[i][2] == 'p')
           {
             // suppress generating Thru_POA collocated stubs
-            be_global->gen_thru_poa_collocation (I_FALSE);
+            be_global->gen_thru_poa_collocation (0);
           }
         else if (av[i][2] == 'd')
           {
             // suppress generating Direct collocated stubs
-            be_global->gen_direct_collocation (I_FALSE);
+            be_global->gen_direct_collocation (0);
           }
         else if (av[i][2] == 'c')
           {
             // suppress generating tie classes and files
             be_global->gen_tie_classes (0);
           }
-        else if (av[i][2] == 'm')
+        else if (av[i][2] == 'v')
           {
-            // disable IDL3 to IDL2 preprocessing.
-            be_global->do_ccm_preproc (I_FALSE);
+            // disable OBV (Valuetype) support
+            idl_global->obv_support (0);
           }
         else
           {
@@ -1844,7 +1836,7 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Sm\t\t\tdisable IDL3 equivalent IDL preprocessing")
+      ACE_TEXT (" -Sv\t\t\tdisable OBV (Valuetype) support")
       ACE_TEXT (" (enabled by default)\n")
     ));
 }
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 58760041cfe..2856108bf60 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -520,7 +520,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
           << ")" << be_nl
           << ": ";
 
-      if (this->has_mixed_parentage_)
+      if (this->has_mixed_parentage_ && ! this->is_abstract ())
         {
           *os << "ACE_NESTED_CLASS (CORBA, AbstractBase) ("
               << be_idt << be_idt << be_idt_nl
@@ -553,7 +553,19 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
           *os << be_idt;
         }
 
-      if (!is_abstract_)
+      if (is_abstract_)
+        {
+          if (this->pd_n_inherits == 0)
+            {
+              *os << "ACE_NESTED_CLASS (CORBA, AbstractBase) ("
+                  << be_idt << be_idt_nl
+                  << "objref," << be_nl
+                  << "_tao_collocated," << be_nl
+                  << "servant" << be_uidt_nl
+                  << ")" << be_uidt;
+            }
+        }
+      else
         {
           *os << "ACE_NESTED_CLASS (CORBA, Object) ("
               << be_idt << be_idt_nl
@@ -1356,31 +1368,19 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
 void
 be_interface::analyze_parentage (void)
 {
-  if (this->has_mixed_parentage_ != -1)
-    {
-      return;
-    }
-  
   this->has_mixed_parentage_ = 0;
 
   for (long i = 0; i < this->pd_n_inherits; ++i)
     {
-      be_interface *parent =
-        be_interface::narrow_from_decl (this->pd_inherits[i]);
-    
-      if (parent->is_abstract () || parent->has_mixed_parentage ())
+      if (this->pd_inherits[i]->is_abstract ())
         {
           this->has_mixed_parentage_ = 1;
           break;
         }
     }
-    
-  AST_Decl::NodeType nt = this->node_type ();
-  idl_bool can_be_mixed = nt == AST_Decl::NT_interface 
-                          || nt == AST_Decl::NT_component
-                          || nt == AST_Decl::NT_home;
 
-  if (this->has_mixed_parentage_ == 1 && can_be_mixed)
+  if (this->has_mixed_parentage_ == 1
+      && this->node_type () == AST_Decl::NT_interface)
     {
       be_global->mixed_parentage_interfaces.enqueue_tail (this);
     }
@@ -1456,8 +1456,6 @@ be_interface::traverse_inheritance_graph (
       // If we are doing a component, we check for a parent.
       if (intf->node_type () == AST_Decl::NT_component)
         {
-          (void) this->insert_non_dup (be_global->ccmobject ());
-
           AST_Component *base =
             AST_Component::narrow_from_decl (intf)->base_component ();
 
@@ -1474,6 +1472,10 @@ be_interface::traverse_inheritance_graph (
                                                abstract_paths_only);
                 }
             }
+          else
+            {
+              (void) this->insert_non_dup (be_global->ccmobject ());
+            }
         }
 
       (void) this->insert_non_dup (intf, abstract_paths_only);
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 9936f760de0..4f1527cfcd8 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -121,22 +121,19 @@ BE_produce (void)
       BE_abort ();
     }
 
-  if (be_global->do_ccm_preproc ())
-    {
-      // Make a pass over the AST and introduce
-      // CCM specific nodes.
-      be_visitor_ccm_pre_proc ccm_preproc_visitor (&ctx);
+  // Make a pass over the AST and introduce
+  // CCM specific nodes.
+  be_visitor_ccm_pre_proc ccm_preproc_visitor (&ctx);
 
-      if (root->accept (&ccm_preproc_visitor) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%N:%l) be_produce - "
-                      "CCM preprocessing for Root failed\n"));
-          BE_abort ();
-        }
+  if (root->accept (&ccm_preproc_visitor) == -1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "(%N:%l) be_produce - "
+                  "CCM preprocessing for Root failed\n"));
+      BE_abort ();
     }
 
-  if (be_global->ami_call_back ())
+  if (be_global->ami_call_back () == I_TRUE)
     {
       // Make a pass over the AST and introduce
       // AMI specific interfaces, methods and valuetypes.
@@ -151,7 +148,7 @@ BE_produce (void)
         }
     }
 
-  if (be_global->gen_amh_classes ())
+  if (be_global->gen_amh_classes () == I_TRUE)
     {
       // Make a pass over the AST and introduce
       // AMH specific code
diff --git a/TAO/TAO_IDL/be/be_tmplinst.cpp b/TAO/TAO_IDL/be/be_tmplinst.cpp
index 2edee73bf39..e14b08e765a 100644
--- a/TAO/TAO_IDL/be/be_tmplinst.cpp
+++ b/TAO/TAO_IDL/be/be_tmplinst.cpp
@@ -52,7 +52,7 @@ template class ACE_Unbounded_Queue_Iterator <be_interface_fwd *>;
 #pragma instantiate ACE_Unbounded_Queue <be_interface_fwd *>
 #pragma instantiate ACE_Unbounded_Queue_Iterator <be_interface_fwd *>
 
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template class ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX>;
 template class ACE_Singleton<TAO_OutStream_Factory,ACE_SYNCH_RECURSIVE_MUTEX>;
 template class ACE_Singleton<TAO_Visitor_Factory,ACE_SYNCH_RECURSIVE_MUTEX>;
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index 60445e0aebc..844bd5704ee 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -755,7 +755,7 @@ be_valuetype::traverse_supports_list_graphs (
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_valuetype::"
-                             "traverse_supports_list_graphs - "
+                             "traverse_supports_graph_list - "
                              "error generating entries\n"),
                             -1);
         }
@@ -809,7 +809,29 @@ be_valuetype::abstract_supports_helper (be_interface *,
   *os << "," << be_nl
       << "public virtual "
       << base->name ();
+/*
+  if (base->is_nested ())
+    {
+      UTL_Scope *parent_scope = base->defined_in ();
+      AST_Decl *parent_decl = ScopeAsDecl (parent_scope);
+
+      *os << "ACE_NESTED_CLASS ("
+          << parent_decl->name () << ", "
+          << base->local_name () << ")";
+    }
+  else
+    {
+      *os << base->local_name ();
+    }
+*/
+  return 0;
+}
 
+int
+be_valuetype::gen_abstract_init_helper (be_interface *,
+                                        be_interface *,
+                                        TAO_OutStream *)
+{
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index f557bb052c8..09aa699302e 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -569,6 +569,90 @@ be_visitor_amh_pre_proc::visit_operation (be_operation *node)
   return 0;
 }
 
+// @@@ (JP) I think this can be removed. It is doing nothing
+// that the generic visit_scope() is not doing.
+int
+be_visitor_amh_pre_proc::visit_scope (be_scope *node)
+{
+  // proceed if the number of members in our scope is greater than 0
+  if (node->nmembers () > 0)
+    {
+      int number_of_elements = 0;
+
+      {
+        // initialize an iterator to iterate thru our scope
+        for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
+             !si.is_done ();
+             si.next ())
+          {
+            ++number_of_elements;
+          }
+      }
+
+      AST_Decl **elements;
+      ACE_NEW_RETURN (elements,
+                      AST_Decl *[number_of_elements],
+                      -1);
+
+      {
+        int position = 0;
+        // initialize an iterator to iterate thru our scope
+        for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
+             !si.is_done ();
+             si.next ())
+          {
+            elements[position++] = si.item ();
+          }
+      }
+
+
+      int elem_number = 0;
+
+      // continue until each element is visited
+      while (elem_number < number_of_elements)
+        {
+          AST_Decl *d = elements[elem_number];
+
+          if (!d)
+            {
+              delete [] elements;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "bad node in this scope\n"),
+                                -1);
+
+            }
+
+          be_decl *bd = be_decl::narrow_from_decl (d);
+
+          // set the scope node as "node" in which the code is being
+          // generated so that elements in the node's scope can use it
+          // for code generation
+          this->ctx_->scope (node->decl ());
+
+          // set the node to be visited
+          this->ctx_->node (bd);
+          ++elem_number;
+
+
+          // Send the visitor.
+          if (bd == 0 ||  bd->accept (this) == -1)
+            {
+              delete [] elements;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "codegen for scope failed\n"),
+                                -1);
+
+            }
+        } // end of while loop
+
+      delete [] elements;
+    } // end of if
+
+  return 0;
+}
+
 be_valuetype *
 be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 0eea91ba50e..3548c50705a 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -107,8 +107,6 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
   if (node->seen_in_operation ())
     {
       TAO_OutStream *os = this->ctx_->stream ();
-      idl_bool stub = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_CS);
-      BE_GlobalData *b = be_global;
 
       // This should be generated even for imported nodes. The ifdef guard prevents
       // multiple declarations.
@@ -116,9 +114,8 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
 
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_SPECIALIZATION" << be_nl
-          << "class "
-          << (stub ? b->stub_export_macro () : b->skel_export_macro ())
-          << " " << this->S_ << "Arg_Traits<"
+          << "class " << be_global->stub_export_macro () << " "
+          << this->S_ << "Arg_Traits<"
           << node->name () << ">" << be_idt_nl
           << ": public" << be_idt << be_idt_nl
           << "Object_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl
@@ -486,40 +483,7 @@ be_visitor_arg_traits::visit_array (be_array *node)
 
   // This should be generated even for imported nodes. The ifdef guard prevents
   // multiple declarations.
-//  os->gen_ifdef_macro (node->flat_name (), "arg_traits");
-
-  // Generate the array traits specialization definitions,
-  // guarded by #ifdef on unaliased array element type and length.
-
-  ACE_CString unique;
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Decl::NodeType nt = bt->node_type ();
-
-  if (nt == AST_Decl::NT_typedef)
-    {
-      be_typedef *td = be_typedef::narrow_from_decl (bt);
-      unique = td->primitive_base_type ()->flat_name ();
-    }
-  else
-    {
-      unique = bt->flat_name ();
-    }
-
-  char buf[NAMEBUFSIZE];
-
-  for (unsigned long i = 0; i < node->n_dims (); ++i)
-    {
-      ACE_OS::memset (buf,
-                      '\0',
-                      NAMEBUFSIZE);
-      ACE_OS::sprintf (buf,
-                       "_%ld",
-                       node->dims ()[i]->ev ()->u.ulval);
-      unique += buf;
-    }
-
-  unique += "_traits";
-  os->gen_ifdef_macro (unique.fast_rep ());
+  os->gen_ifdef_macro (node->flat_name (), "arg_traits");
 
   *os << be_nl << be_nl
       << "ACE_TEMPLATE_SPECIALIZATION" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
index fbb5e7613cd..2fa4e527ac7 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
@@ -101,12 +101,11 @@ int be_visitor_args_paramlist::visit_argument (be_argument *node)
       *os << " _tao_forany_" << node->local_name () << " (";
       *os << this->type_name (bt, "_dup");
       *os << " (";
-      
+      // This is to placate some compilers which have
+      // trouble with IN args that are multidimensional arrays.
+      //if (node->n_dims () > 1) cant do this here since dont have a be_array node
       if (this->direction () != AST_Argument::dir_IN)
-        {
-          *os << "(const ::" << bt->name () << "_slice *) ";
-        }
-        
+        *os << "(const ::" << bt->name () << "_slice *) ";
       *os << "this->";
       *os << node->local_name () << "_));" << be_nl;
       *os << "(*parameter_list)[len].argument <<= _tao_forany_" ;
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index 9923d6f7ee9..f4097be8b7e 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -276,7 +276,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
     }
   else
     {
-      storage_class = "TAO_EXPORT_MACRO ";
+      storage_class = "";
     }
 
   if (td != 0)
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index a0ef398247a..2ffa66396f2 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -195,7 +195,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << fname << "," << be_nl
       << fname << "_slice," << be_nl
       << fname << "_tag" << be_uidt_nl
-      << ">::free ("<< be_idt_nl
+      << ">::tao_free ("<< be_idt_nl
       << fname << "_slice * _tao_slice" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -210,7 +210,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << fname << "," << be_nl
       << fname << "_slice," << be_nl
       << fname << "_tag" << be_uidt_nl
-      << ">::dup (" << be_idt_nl
+      << ">::tao_dup (" << be_idt_nl
       << "const " << fname << "_slice * _tao_slice" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -225,7 +225,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << fname << "," << be_nl
       << fname << "_slice," << be_nl
       << fname << "_tag" << be_uidt_nl
-      << ">::copy (" << be_idt_nl
+      << ">::tao_copy (" << be_idt_nl
       << fname << "_slice * _tao_to," << be_nl
       << "const " << fname << "_slice * _tao_from" << be_uidt_nl
       << ")" << be_uidt_nl
@@ -241,7 +241,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << fname << "," << be_nl
       << fname << "_slice," << be_nl
       << fname << "_tag" << be_uidt_nl
-      << ">::alloc (void)" << be_uidt_nl
+      << ">::tao_alloc (void)" << be_uidt_nl
       << "{" << be_idt_nl
       << "return " << fname << "_alloc ();" << be_uidt_nl
       << "}";
diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
index 826b7082b6e..666e3e0b896 100644
--- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -58,8 +58,6 @@ be_exception *EXCEPS[N_EXCEPS];
 be_visitor_ccm_pre_proc::be_visitor_ccm_pre_proc (be_visitor_context *ctx)
   : be_visitor_scope (ctx),
     module_id_ ("Components"),
-    connection_ (0),
-    connections_ (0),
     cookie_ (0),
     already_connected_ (0),
     invalid_connection_ (0),
@@ -358,15 +356,6 @@ be_visitor_ccm_pre_proc::gen_uses (be_component *node)
         }
       else
         {
-          if (this->create_uses_multiple_stuff (node, pd) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_ccm_pre_proc::"
-                                 "gen_uses - "
-                                 "create_uses_multiple_stuff failed\n"),
-                                -1);
-            }
-
           if (this->gen_connect_multiple (node, pd) == -1)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -1466,152 +1455,6 @@ be_visitor_ccm_pre_proc::lookup_one_exception (be_component *node,
 }
 
 int
-be_visitor_ccm_pre_proc::create_uses_multiple_stuff (
-    be_component *node,
-    AST_Component::port_description *pd
-  )
-{
-  if (this->create_uses_multiple_struct (node, pd) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_stuff - "
-                         "create_uses_multiple_struct failed\n"),
-                        -1);
-    }
-
-  if (this->create_uses_multiple_sequence (node, pd) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_stuff - "
-                         "create_uses_multiple_sequence failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_ccm_pre_proc::create_uses_multiple_struct (
-    be_component *node,
-    AST_Component::port_description *pd
-  )
-{
-  UTL_ScopedName *full_name = 
-    this->create_scoped_name (0,
-                              pd->id->get_string (),
-                              "Connection",
-                              node);
-  ACE_NEW_RETURN (this->connection_,
-                  be_structure (0,
-                                0,
-                                0),
-                  -1);
-  this->connection_->set_defined_in (node);
-  this->connection_->set_imported (node->imported ());
-  this->connection_->set_name (full_name);
-
-  Identifier o_id ("objref");
-  UTL_ScopedName o_sn (&o_id,
-                       0);
-  AST_Field *m_objref = 0;
-  ACE_NEW_RETURN (m_objref,
-                  be_field (pd->impl,
-                            &o_sn),
-                  -1);
-  o_id.destroy ();
-
-  if (this->connection_->be_add_field (m_objref) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_struct - "
-                         "be_add_field failed\n"),
-                        -1);
-    }
-
-  Identifier v_id ("ck");
-  UTL_ScopedName v_sn (&v_id,
-                       0);
-  AST_Field *m_ck = 0;
-  ACE_NEW_RETURN (m_ck,
-                  be_field (this->cookie_,
-                            &v_sn),
-                  -1);
-
-  if (this->connection_->be_add_field (m_ck) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_struct - "
-                         "be_add_field failed\n"),
-                        -1);
-    }
-
-  if (node->be_add_structure (this->connection_) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_struct - "
-                         "be_add_structure failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_ccm_pre_proc::create_uses_multiple_sequence (
-    be_component *node,
-    AST_Component::port_description *pd
-  )
-{
-  ACE_UINT64 bound = 0;
-  ACE_NEW_RETURN (
-      this->connections_,
-      be_sequence (
-          idl_global->gen ()->create_expr (
-                                  bound,
-                                  AST_Expression::EV_ulong
-                                ),
-          this->connection_,
-          0,
-          0,
-          0
-        ),
-      -1
-    );
-
-  UTL_ScopedName *sn = 
-    this->create_scoped_name (0,
-                              pd->id->get_string (),
-                              "Connections",
-                              node);
-  AST_Typedef *td = 0;
-  ACE_NEW_RETURN (td,
-                  be_typedef (this->connections_,
-                              0,
-                              0,
-                              0),
-                  -1);
-  td->set_defined_in (node);
-  td->set_imported (node->imported ());
-  td->set_name (sn);
-
-  if (node->be_add_typedef (td) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_sequence - "
-                         "be_add_typedef failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
 be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
 {
   AST_Interface *event_consumer = 0;
@@ -1624,11 +1467,6 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
                               "Consumer",
                               ScopeAsDecl (node->defined_in ()));
 
-  // We're at global scope here so we need to fool the scope stack
-  // for a minute so the correct repo id can be calculated at
-  // interface construction time.
-  idl_global->scopes ().push (node->defined_in ());
-
   if (node->n_inherits () == 0
       || node->inherits ()[0]->node_type () == AST_Decl::NT_valuetype)
     {
@@ -1639,13 +1477,13 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
                                        &parent_local_name);
       UTL_NameList parent_list (&parent_full_name,
                                 0);
-      FE_InterfaceHeader header (consumer_name,
+      FE_InterfaceHeader header (0,
                                  &parent_list,
                                  I_FALSE,
                                  I_FALSE,
                                  I_TRUE);
       ACE_NEW_RETURN (event_consumer,
-                      be_interface (header.name (),
+                      be_interface (0,
                                     header.inherits (),
                                     header.n_inherits (),
                                     header.inherits_flat (),
@@ -1676,13 +1514,13 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
       parent_full_name->nconc (parent_local_name);
       UTL_NameList parent_list (parent_full_name,
                                 0);
-      FE_InterfaceHeader header (consumer_name,
+      FE_InterfaceHeader header (0,
                                  &parent_list,
                                  I_FALSE,
                                  I_FALSE,
                                  I_TRUE);
       ACE_NEW_RETURN (event_consumer,
-                      be_interface (header.name (),
+                      be_interface (0,
                                     header.inherits (),
                                     header.n_inherits (),
                                     header.inherits_flat (),
@@ -1693,21 +1531,9 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
       parent_full_name->destroy ();
     }
 
-  // Back to reality.
-  idl_global->scopes ().pop ();
-
   event_consumer->set_defined_in (s);
   event_consumer->set_imported (node->imported ());
   event_consumer->set_name (consumer_name);
-  
-  // Set repo id to 0, so it will be recomputed on the next access,
-  // and set the prefix to the eventtype's prefix. All this is
-  // necessary in case the eventtype's prefix was modified after
-  // its declaration. We assume 'implied IDL' means that the
-  // derived event consumer interface should have the same prefix.
-  event_consumer->repoID (0);
-  event_consumer->prefix (const_cast<char*> (node->prefix ()));
-  
   be_type::narrow_from_decl (event_consumer)->gen_fwd_helper_name ();
   m->be_add_interface (event_consumer);
   return this->gen_push_op (node,
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component.cpp b/TAO/TAO_IDL/be/be_visitor_component/component.cpp
index 70b53838e1f..80bf5a90a14 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component.cpp
@@ -45,11 +45,16 @@ be_visitor_component::visit_attribute (be_attribute *node)
 
   switch (this->ctx_->state ())
     {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
+    case TAO_CodeGen::TAO_ROOT_CH:
+      break;
     case TAO_CodeGen::TAO_ROOT_CS:
+      break;
     case TAO_CodeGen::TAO_ROOT_SH:
+      break;
     case TAO_CodeGen::TAO_ROOT_IH:
+      break;
     case TAO_CodeGen::TAO_ROOT_SS:
+      break;
     case TAO_CodeGen::TAO_ROOT_IS:
       break;
     default:
@@ -84,7 +89,7 @@ be_visitor_component::visit_operation (be_operation *node)
     {
     // These first two cases may have the context state changed
     // by a strategy, so we use the visitor factory below.
-    case TAO_CodeGen::TAO_INTERFACE_CH:
+    case TAO_CodeGen::TAO_ROOT_CH:
       ctx.state (TAO_CodeGen::TAO_OPERATION_CH);
       break;
     case TAO_CodeGen::TAO_ROOT_CS:
@@ -218,7 +223,7 @@ be_visitor_component::visit_structure (be_structure *node)
 
   switch (this->ctx_->state ())
     {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
+    case TAO_CodeGen::TAO_ROOT_CH:
       {
         be_visitor_structure_ch visitor (&ctx);
         status = node->accept (&visitor);
@@ -287,7 +292,7 @@ be_visitor_component::visit_typedef (be_typedef *node)
 
   switch (this->ctx_->state ())
     {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
+    case TAO_CodeGen::TAO_ROOT_CH:
       {
         be_visitor_typedef_ch visitor (&ctx);
         status = node->accept (&visitor);
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
index c2f85d715ff..b168399f32d 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -153,21 +153,6 @@ be_visitor_component_ch::visit_component (be_component *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  if (! node->is_abstract ())
-    {
-      node->analyze_parentage ();
-    }
-
-  // If we inherit from both CORBA::Object and CORBA::AbstractBase,
-  // we have to override _add_ref() to avoid ambiguity. A comopnent
-  // can have mixed parentage if it supports an abstract or mixed-
-  // parentage interface.
-  if (node->has_mixed_parentage ())
-    {
-      *os << be_nl << be_nl 
-          << "virtual void _add_ref (void);";
-    }
-
   *os << be_nl << be_nl
       << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
       << "const char *type_id" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
index cc46761452b..f35f7eab081 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -68,7 +68,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl
           << node->name () << "_ptr" << be_nl
-          << "TAO::Objref_Traits<" << node->name () << ">::duplicate ("
+          << "TAO::Objref_Traits<" << node->name () << ">::tao_duplicate ("
           << be_idt << be_idt_nl
           << node->name () << "_ptr p" << be_uidt_nl
           << ")" << be_uidt_nl
@@ -79,7 +79,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl
           << "void" << be_nl
-          << "TAO::Objref_Traits<" << node->name () << ">::release ("
+          << "TAO::Objref_Traits<" << node->name () << ">::tao_release ("
           << be_idt << be_idt_nl
           << node->name () << "_ptr p" << be_uidt_nl
           << ")" << be_uidt_nl
@@ -90,7 +90,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl
           << node->name () << "_ptr" << be_nl
-          << "TAO::Objref_Traits<" << node->name () << ">::nil (void)"
+          << "TAO::Objref_Traits<" << node->name () << ">::tao_nil (void)"
           << be_nl
           << "{" << be_idt_nl
           << "return " << node->name () << "::_nil ();" << be_uidt_nl
@@ -99,7 +99,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
+          << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal ("
           << be_idt << be_idt_nl
           << node->name () << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr" << be_uidt_nl
@@ -109,29 +109,6 @@ be_visitor_component_cs::visit_component (be_component *node)
           << "}";
     }
 
-  if (node->has_mixed_parentage ())
-    {
-      *os << be_nl << be_nl
-          << "void" << be_nl
-          << "CORBA::release ("
-          << node->name ()
-          << "_ptr p)" << be_nl
-          << "{" << be_idt_nl
-          << "CORBA::AbstractBase_ptr abs = p;" << be_nl
-          << "CORBA::release (abs);" << be_uidt_nl
-          << "}";
-
-      *os << be_nl << be_nl
-          << "CORBA::Boolean" << be_nl
-          << "CORBA::is_nil ("
-          << node->name ()
-          << "_ptr p)" << be_nl
-          << "{" << be_idt_nl
-          << "CORBA::Object_ptr obj = p;" << be_nl
-          << "return CORBA::is_nil (obj);" << be_uidt_nl
-          << "}";
-    }
-
   // Generate the proxy broker factory function pointer definition.
   *os << be_nl << be_nl
       << "// Function pointer for collocation factory initialization."
@@ -195,16 +172,6 @@ be_visitor_component_cs::visit_component (be_component *node)
           << "}" << be_nl << be_nl;
     }
 
-  if (node->has_mixed_parentage ())
-    {
-      *os << "void" << be_nl
-          << node->name () << "::_add_ref (void)" << be_nl
-          << "{" << be_idt_nl
-          << "this->ACE_NESTED_CLASS (CORBA, Object)::_add_ref ();"
-          << be_uidt_nl
-          << "}" << be_nl << be_nl;
-    }
-
   // The _narrow method.
   *os << node->full_name () << "_ptr" << be_nl << node->full_name ()
       << "::_narrow (" << be_idt << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
index 146ae4a0524..107adfc34af 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
@@ -83,8 +83,7 @@ be_visitor_component_sh::visit_component (be_component *node)
       class_name +=  node->local_name ();
     }
 
-  *os << be_nl << be_nl
-      << "// TAO_IDL - Generated from" << be_nl
+  *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   // Generate the skeleton class name.
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
index 66bf273b6b2..e2b980bd77e 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
@@ -282,7 +282,7 @@ be_visitor_field_cdr_op_cs::visit_interface (be_interface *node)
         }
       else
         {
-          *os << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
+          *os << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal ("
               << be_idt << be_idt_nl
               << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl
               << "strm" << be_uidt_nl
@@ -362,7 +362,7 @@ be_visitor_field_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
               *os << parent->name () << "::";
             }
 
-          *os << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
+          *os << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal ("
               << be_idt << be_idt_nl
               << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl
               << "strm" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index b6863cc1822..85503801aad 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -129,7 +129,7 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
     TAO_OutStream *os
   )
 {
-  if (!base->is_abstract ())
+  if (node == base)
     {
       return 0;
     }
@@ -149,7 +149,7 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_thru_poa_proxy_"
-                             "impl_sh::gen_abstract_ops_helper - "
+                             "impl_sh::abstract_base_ops_helper - "
                              "bad node in this scope\n"),
                             -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
index be617ef34ce..1986eae1270 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
@@ -63,7 +63,7 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
     TAO_OutStream *os
   )
 {
-  if (!base->is_abstract ())
+  if (node == base)
     {
       return 0;
     }
@@ -83,7 +83,7 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_direct_proxy"
-                             "_impl_ss::gen_abstract_ops_helper - "
+                             "_impl_ss::abstract_base_ops_helper - "
                              "bad node in this scope\n"),
                             -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp
index a040a8a5e89..3ffceb381fc 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp
@@ -90,7 +90,7 @@ be_visitor_interface_interceptors_ss::gen_abstract_ops_helper (
     TAO_OutStream *os
   )
 {
-  if (!base->is_abstract ())
+  if (node == base)
     {
       return 0;
     }
@@ -110,7 +110,7 @@ be_visitor_interface_interceptors_ss::gen_abstract_ops_helper (
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_interceptors_ss::"
-                             "gen_abstract_ops_helper - "
+                             "abstract_base_ops_helper - "
                              "bad node in this scope\n"),
                             -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index b02cd9a48e1..c9ae586fb1d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -116,13 +116,10 @@ be_visitor_interface::visit_scope (be_scope *node)
       return 0;
     }
 
-  // 'abstract_paths_only' arg is FALSE here because we want to traverse
-  // through concrete parents to get to all the abstract ones. The helper
-  // will do nothing unless the base interface passed to it is abstract.
   int status =
     intf->traverse_inheritance_graph (helper,
                                       this->ctx_->stream (),
-                                      I_FALSE);
+                                      I_TRUE);
 
   if (status == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 675f9e648d5..a0e3ce9f913 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -213,7 +213,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     }
 
   // If we inherit from both CORBA::Object and CORBA::AbstractBase,
-  // we have to override _add_ref() to avoid ambiguity.
+  // we have to override _add_ref() to avoid ambiguity, because it is
+  // called in _tao_Queryinterface().
   if (node->has_mixed_parentage ())
     {
       *os << "virtual void _add_ref (void);" << be_nl << be_nl;
@@ -378,7 +379,7 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node,
                                                   be_interface *base,
                                                   TAO_OutStream *os)
 {
-  if (!base->is_abstract ())
+  if (node == base)
     {
       return 0;
     }
@@ -397,7 +398,7 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node,
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_interface::"
-                             "gen_abstract_ops_helper - "
+                             "abstract_base_ops_helper - "
                              "bad node in this scope\n"),
                             -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 071136f1ee2..dbed26ff19a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -67,7 +67,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl
           << node->name () << "_ptr" << be_nl
-          << "TAO::Objref_Traits<" << node->name () << ">::duplicate ("
+          << "TAO::Objref_Traits<" << node->name () << ">::tao_duplicate ("
           << be_idt << be_idt_nl
           << node->name () << "_ptr p" << be_uidt_nl
           << ")" << be_uidt_nl
@@ -78,7 +78,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl
           << "void" << be_nl
-          << "TAO::Objref_Traits<" << node->name () << ">::release ("
+          << "TAO::Objref_Traits<" << node->name () << ">::tao_release ("
           << be_idt << be_idt_nl
           << node->name () << "_ptr p" << be_uidt_nl
           << ")" << be_uidt_nl
@@ -89,7 +89,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl
           << node->name () << "_ptr" << be_nl
-          << "TAO::Objref_Traits<" << node->name () << ">::nil (void)"
+          << "TAO::Objref_Traits<" << node->name () << ">::tao_nil (void)"
           << be_nl
           << "{" << be_idt_nl
           << "return " << node->name () << "::_nil ();" << be_uidt_nl
@@ -98,7 +98,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl
           << "CORBA::Boolean" << be_nl
-          << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
+          << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal ("
           << be_idt << be_idt_nl
           << node->name () << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr" << be_uidt_nl
@@ -562,7 +562,7 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node,
                                                   be_interface *base,
                                                   TAO_OutStream *os)
 {
-  if (!base->is_abstract ())
+  if (node == base)
     {
       return 0;
     }
@@ -581,7 +581,7 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node,
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_cs::"
-                             "gen_abstract_ops_helper - "
+                             "abstract_base_ops_helper - "
                              "bad node in this scope\n"),
                             -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
index 7bb033fb1df..42246e077a4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
@@ -77,16 +77,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
       *os << node->full_skel_name ();
     }
 
-  *os << ", public virtual ";
-  
-  if (node->is_local ())
-    {
-      *os << "TAO_Local_RefCounted_Object";
-    }
-  else
-    {
-      *os << "PortableServer::RefCountServantBase";
-    }
+  *os << ", public virtual PortableServer::RefCountServantBase";
 
   *os << be_nl
       << "{" << be_nl
@@ -95,7 +86,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
       <<  be_global->impl_class_prefix () << namebuf
       << be_global->impl_class_suffix () << " (void);" << be_nl << be_nl;
 
-  if (be_global->gen_copy_ctor () && !node->is_local ())
+  if (be_global->gen_copy_ctor ())
     {
       *os << "//Copy Constructor"<<be_nl
           << be_global->impl_class_prefix () << namebuf
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
index fa25566ca54..ed87e053a6f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
@@ -76,7 +76,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
   *os << "{" <<be_nl;
   *os << "}" << be_nl << be_nl;
 
-  if (be_global->gen_copy_ctor () && !node->is_local ())
+  if (be_global->gen_copy_ctor ())
     {
       *os << "//Implementation Skeleton Copy Constructor" << be_nl;
 
@@ -88,7 +88,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
           << be_global->impl_class_suffix () << "& rhs)" << be_idt_nl
           << ": TAO_Abstract_ServantBase (rhs)," << be_nl
           << "  TAO_ServantBase (rhs)";
-          
+
       if (node->traverse_inheritance_graph (be_interface::copy_ctor_helper,
                                             os)
            == -1)
@@ -99,22 +99,19 @@ be_visitor_interface_is::visit_interface (be_interface *node)
                             -1);
         }
 
-      if (!node->is_local ())
+      *os << "," << be_nl;
+
+      if (node->is_nested ())
+        {
+          be_decl *scope;
+          scope = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+
+          *os << "  ACE_NESTED_CLASS (POA_" << scope->name () << ", "
+              << node->local_name () << ") (rhs)";
+        }
+      else
         {
-          *os << "," << be_nl;
-
-          if (node->is_nested ())
-            {
-              be_decl *scope;
-              scope = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-              *os << "  ACE_NESTED_CLASS (POA_" << scope->name () << ", "
-                  << node->local_name () << ") (rhs)";
-            }
-          else
-            {
-              *os << "  " << node->full_skel_name () << " (rhs)";
-            }
+          *os << "  " << node->full_skel_name () << " (rhs)";
         }
 
       *os << be_uidt_nl
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 e8d950f4d1f..1e798193964 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -39,221 +39,225 @@ int
 be_visitor_interface_sh::visit_interface (be_interface *node)
 {
   if (node->srv_hdr_gen () 
-      || node->imported ()
-      || node->is_abstract ())
+      || node->imported ())
     {
       return 0;
     }
 
-  // If this node is a AMH-RH node, then generate code for it
-  if (node->is_local ())
+  // For abstract interfaces, we just generated the collocation stuff
+  // (see below).
+  if (! node->is_abstract ())
     {
-      if (this->is_amh_rh_node (node))
-        {
-          // Create amh_rh_visitors.
-          be_visitor_amh_rh_interface_sh amh_rh_intf (this->ctx_);
-          amh_rh_intf.visit_interface (node);
-        }
-
-      return 0;
-    }
-
-  if (this->generate_amh_classes (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_visitor_interface_sh::"
-                          "visit_interface - "
-                          "codegen for AMH classes failed\n"),
-                        -1);
-    }
-
-  TAO_OutStream *os  = this->ctx_->stream ();
-  ACE_CString class_name;
-
-  // We shall have a POA_ prefix only if we are at the topmost level.
-  if (!node->is_nested ())
-    {
-      // We are outermost.
-      class_name += "POA_";
-      class_name += node->local_name ();
-    }
-  else
-    {
-      class_name +=  node->local_name ();
-    }
-
-  *os << be_nl << be_nl
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // Generate the skeleton class name.
-  *os << "class " << class_name.c_str () << ";" << be_nl;
-
-  // Generate the _ptr declaration.
-  *os << "typedef " << class_name.c_str () << " *" << class_name.c_str ()
-      << "_ptr;" << be_nl << be_nl;
-
-  // Forward class declarations.
-  if (be_global->gen_thru_poa_collocation ())
-    {
-      *os << "class " << node->thru_poa_proxy_impl_name () << ";" << be_nl;
-    }
-
-  if (be_global->gen_direct_collocation ())
-    {
-      *os << "class " << node->direct_proxy_impl_name () << ";" << be_nl;
-    }
-
-  if (be_global->gen_thru_poa_collocation ()
-      || be_global->gen_direct_collocation ())
-    {
-      *os << "class " << node->strategized_proxy_broker_name ()
-          << ";" << be_nl;
-    }
-
-  *os << be_nl;
-
-  // Now generate the class definition.
-  *os << "class " << be_global->skel_export_macro ()
-      << " " << class_name.c_str () << be_idt_nl << ": " << be_idt;
-
-  long n_parents = node->n_inherits ();
-  AST_Interface *parent = 0;
-  int has_concrete_parent = 0;
-
-  for (int i = 0; i < n_parents; ++i)
-    {
-      parent = node->inherits ()[i];
-    
-      if (parent->is_abstract ())
-        {
-          continue;
-        }
-
-      if (has_concrete_parent == 1)
-        {
-          *os << "," << be_nl;
-        }
-
-      *os << "public virtual " << "POA_"
-          << parent->name ();
-
-      has_concrete_parent = 1;
-    }
-
-  if (has_concrete_parent == 0)
-    {
-      // We don't inherit from another user defined object, hence our
-      // base class is the ServantBase class.
-      *os << "public virtual PortableServer::ServantBase";
-    }
-
-  *os << be_uidt << be_uidt_nl
-      << "{" << be_nl
-      << "protected:" << be_idt_nl;
-
-  // Default constructor.
-  *os << class_name.c_str () << " (void);" << be_uidt_nl << be_nl
-      << "public:" << be_idt_nl;
-
-  // Some useful typedefs.
-  *os << "// Useful for template programming." << be_nl
-      << "typedef ::" << node->name () << " _stub_type;" << be_nl
-      << "typedef ::" << node->name () << "_ptr _stub_ptr_type;" << be_nl
-      << "typedef ::" << node->name () << "_var _stub_var_type;" 
-      << be_nl << be_nl;
-
-  // Copy constructor and destructor.
-  *os << class_name.c_str () << " (const " 
-      << class_name.c_str () << "& rhs);" << be_nl
-      << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_nl;
-
-  // _is_a
-  *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char* logical_type_id" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  // _downcast
-  *os << "virtual void* _downcast (" << be_idt << be_idt_nl
-      << "const char* logical_type_id" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  // Add a skeleton for our _is_a method.
-  *os << "static void _is_a_skel (" << be_idt << be_idt_nl
-      << "TAO_ServerRequest &req," << be_nl
-      << "void *servant," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  // Add a skeleton for our _non_existent method.
-  *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
-      << "TAO_ServerRequest &req," << be_nl
-      << "void *servant," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  // Add a skeleton for our _interface method.
-  *os << "static void _interface_skel (" << be_idt << be_idt_nl
-      << "TAO_ServerRequest &req," << be_nl
-      << "void *servant," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  // Add a skeleton for our _component method.
-  *os << "static void _component_skel (" << be_idt << be_idt_nl
-      << "TAO_ServerRequest &req," << be_nl
-      << "void *obj," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  // Add the dispatch method.
-  *os << "virtual void _dispatch (" << be_idt << be_idt_nl
-      << "TAO_ServerRequest &req," << be_nl
-      << "void *_servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  this->this_method (node);
-
-  // The _interface_repository_id method.
-  *os << be_nl
-      << "virtual const char* _interface_repository_id "
-      << "(void) const;";
-
-  // Generate code for elements in the scope (e.g., operations).
-  if (this->visit_scope (node) ==  -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_visitor_interface_sh::"
-                          "visit_interface - "
-                          "codegen for scope failed\n"),
-                        -1);
-    }
-
-  // Generate skeletons for operations of our base classes. These
-  // skeletons just cast the pointer to the appropriate type
-  // before invoking the call.
-  int status = 
-    node->traverse_inheritance_graph (
-              be_interface::gen_skel_helper, 
-              os
-            );
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_visitor_interface_sh::"
-                          "visit_interface - "
-                          "inheritance graph traversal failed\n"),
-                        -1);
-    }
-
-  *os << be_uidt_nl << "};";
+    // If this node is a AMH-RH node, then generate code for it
+    if (node->is_local ())
+      {
+        if (this->is_amh_rh_node (node))
+          {
+            // Create amh_rh_visitors.
+            be_visitor_amh_rh_interface_sh amh_rh_intf (this->ctx_);
+            amh_rh_intf.visit_interface (node);
+          }
+
+        return 0;
+      }
+
+    if (this->generate_amh_classes (node) == -1)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "be_visitor_interface_sh::"
+                           "visit_interface - "
+                           "codegen for AMH classes failed\n"),
+                          -1);
+      }
+
+    TAO_OutStream *os  = this->ctx_->stream ();
+    ACE_CString class_name;
+
+    // We shall have a POA_ prefix only if we are at the topmost level.
+    if (!node->is_nested ())
+      {
+        // We are outermost.
+        class_name += "POA_";
+        class_name += node->local_name ();
+      }
+    else
+      {
+        class_name +=  node->local_name ();
+      }
+
+    *os << be_nl << be_nl
+        << "// TAO_IDL - Generated from" << be_nl
+        << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+    // Generate the skeleton class name.
+    *os << "class " << class_name.c_str () << ";" << be_nl;
+
+    // Generate the _ptr declaration.
+    *os << "typedef " << class_name.c_str () << " *" << class_name.c_str ()
+        << "_ptr;" << be_nl << be_nl;
+
+    // Forward class declarations.
+    if (be_global->gen_thru_poa_collocation ())
+      {
+        *os << "class " << node->thru_poa_proxy_impl_name () << ";" << be_nl;
+      }
+
+    if (be_global->gen_direct_collocation ())
+      {
+        *os << "class " << node->direct_proxy_impl_name () << ";" << be_nl;
+      }
+
+    if (be_global->gen_thru_poa_collocation ()
+        || be_global->gen_direct_collocation ())
+      {
+        *os << "class " << node->strategized_proxy_broker_name ()
+            << ";" << be_nl;
+      }
+
+    *os << be_nl;
+
+    // Now generate the class definition.
+    *os << "class " << be_global->skel_export_macro ()
+        << " " << class_name.c_str () << be_idt_nl << ": " << be_idt;
+
+    long n_parents = node->n_inherits ();
+    AST_Interface *parent = 0;
+    int has_concrete_parent = 0;
+
+    for (int i = 0; i < n_parents; ++i)
+      {
+        parent = node->inherits ()[i];
+      
+        if (parent->is_abstract ())
+          {
+            continue;
+          }
+
+        if (has_concrete_parent == 1)
+          {
+            *os << "," << be_nl;
+          }
+
+        *os << "public virtual " << "POA_"
+            << parent->name ();
+
+        has_concrete_parent = 1;
+      }
+
+    if (has_concrete_parent == 0)
+      {
+        // We don't inherit from another user defined object, hence our
+        // base class is the ServantBase class.
+        *os << "public virtual PortableServer::ServantBase";
+      }
+
+    *os << be_uidt << be_uidt_nl
+        << "{" << be_nl
+        << "protected:" << be_idt_nl;
+
+    // Default constructor.
+    *os << class_name.c_str () << " (void);" << be_uidt_nl << be_nl
+        << "public:" << be_idt_nl;
+
+    // Some useful typedefs.
+    *os << "// Useful for template programming." << be_nl
+        << "typedef ::" << node->name () << " _stub_type;" << be_nl
+        << "typedef ::" << node->name () << "_ptr _stub_ptr_type;" << be_nl
+        << "typedef ::" << node->name () << "_var _stub_var_type;" 
+        << be_nl << be_nl;
+
+    // Copy constructor and destructor.
+    *os << class_name.c_str () << " (const " 
+        << class_name.c_str () << "& rhs);" << be_nl
+        << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_nl;
+
+    // _is_a
+    *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+        << "const char* logical_type_id" << be_nl
+        << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+        << ");" << be_uidt_nl << be_nl;
+
+    // _downcast
+    *os << "virtual void* _downcast (" << be_idt << be_idt_nl
+        << "const char* logical_type_id" << be_uidt_nl
+        << ");" << be_uidt_nl << be_nl;
+
+    // Add a skeleton for our _is_a method.
+    *os << "static void _is_a_skel (" << be_idt << be_idt_nl
+        << "TAO_ServerRequest &req," << be_nl
+        << "void *servant," << be_nl
+        << "void *servant_upcall" << be_nl
+        << "ACE_ENV_ARG_DECL" << be_uidt_nl
+        << ");" << be_uidt_nl << be_nl;
+
+    // Add a skeleton for our _non_existent method.
+    *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
+        << "TAO_ServerRequest &req," << be_nl
+        << "void *servant," << be_nl
+        << "void *servant_upcall" << be_nl
+        << "ACE_ENV_ARG_DECL" << be_uidt_nl
+        << ");" << be_uidt_nl << be_nl;
+
+    // Add a skeleton for our _interface method.
+    *os << "static void _interface_skel (" << be_idt << be_idt_nl
+        << "TAO_ServerRequest &req," << be_nl
+        << "void *servant," << be_nl
+        << "void *servant_upcall" << be_nl
+        << "ACE_ENV_ARG_DECL" << be_uidt_nl
+        << ");" << be_uidt_nl << be_nl;
+
+    // Add a skeleton for our _component method.
+    *os << "static void _component_skel (" << be_idt << be_idt_nl
+        << "TAO_ServerRequest &req," << be_nl
+        << "void *obj," << be_nl
+        << "void *servant_upcall" << be_nl
+        << "ACE_ENV_ARG_DECL" << be_uidt_nl
+        << ");" << be_uidt_nl << be_nl;
+
+    // Add the dispatch method.
+    *os << "virtual void _dispatch (" << be_idt << be_idt_nl
+        << "TAO_ServerRequest &req," << be_nl
+        << "void *_servant_upcall" << be_nl
+        << "ACE_ENV_ARG_DECL" << be_uidt_nl
+        << ");" << be_uidt_nl << be_nl;
+
+    this->this_method (node);
+
+    // The _interface_repository_id method.
+    *os << be_nl
+        << "virtual const char* _interface_repository_id "
+        << "(void) const;";
+
+    // Generate code for elements in the scope (e.g., operations).
+    if (this->visit_scope (node) ==  -1)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "be_visitor_interface_sh::"
+                           "visit_interface - "
+                           "codegen for scope failed\n"),
+                          -1);
+      }
+
+    // Generate skeletons for operations of our base classes. These
+    // skeletons just cast the pointer to the appropriate type
+    // before invoking the call.
+    int status = 
+      node->traverse_inheritance_graph (
+                be_interface::gen_skel_helper, 
+                os
+              );
+
+    if (status == -1)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "be_visitor_interface_sh::"
+                           "visit_interface - "
+                           "inheritance graph traversal failed\n"),
+                          -1);
+      }
+
+    *os << be_uidt_nl << "};";
+  } // if ! node->is_abstract ()
 
   be_visitor_context ctx (*this->ctx_);
 
@@ -327,7 +331,7 @@ be_visitor_interface_sh::gen_abstract_ops_helper (
     TAO_OutStream *os
   )
 {
-  if (!base->is_abstract ())
+  if (node == base)
     {
       return 0;
     }
@@ -347,7 +351,7 @@ be_visitor_interface_sh::gen_abstract_ops_helper (
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_sh::"
-                             "gen_abstract_ops_helper - "
+                             "abstract_base_ops_helper - "
                              "bad node in this scope\n"),
                             -1);
         }
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 4945b3676f5..aca20597312 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -443,7 +443,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
                                                   be_interface *base,
                                                   TAO_OutStream *os)
 {
-  if (!base->is_abstract ())
+  if (node == base)
     {
       return 0;
     }
@@ -463,7 +463,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_ss::"
-                             "gen_abstract_ops_helper - "
+                             "abstract_base_ops_helper - "
                              "bad node in this scope\n"),
                             -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
index 2224b0189af..18ac8f0907a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
@@ -133,7 +133,7 @@ be_visitor_interface_thru_poa_proxy_impl_sh::gen_abstract_ops_helper (
     TAO_OutStream *os
   )
 {
-  if (!base->is_abstract ())
+  if (node == base)
     {
       return 0;
     }
@@ -153,7 +153,7 @@ be_visitor_interface_thru_poa_proxy_impl_sh::gen_abstract_ops_helper (
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_thru_poa_proxy_"
-                             "impl_sh::gen_abstract_ops_helper - "
+                             "impl_sh::abstract_base_ops_helper - "
                              "bad node in this scope\n"),
                             -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp
index a37f93b2d50..255e4b12a32 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp
@@ -70,7 +70,7 @@ be_visitor_interface_thru_poa_proxy_impl_ss::gen_abstract_ops_helper (
     TAO_OutStream *os
   )
 {
-  if (!base->is_abstract ())
+  if (node == base)
     {
       return 0;
     }
@@ -90,7 +90,7 @@ be_visitor_interface_thru_poa_proxy_impl_ss::gen_abstract_ops_helper (
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_thru_poa_proxy"
-                             "_impl_ss::gen_abstract_ops_helper - "
+                             "_impl_ss::abstract_base_ops_helper - "
                              "bad node in this scope\n"),
                             -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
index 7505969be27..d7427e01555 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
@@ -715,8 +715,6 @@ be_visitor_module::visit_component (be_component *node)
     case TAO_CodeGen::TAO_ROOT_CH:
       {
         be_visitor_component_ch visitor (&ctx);
-        // So we can pick up the abstract ops helpers.
-        ctx.state (TAO_CodeGen::TAO_INTERFACE_CH);
         status = node->accept (&visitor);
         break;
       }
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index ea8ac913eea..9ed75f883b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -400,6 +400,10 @@ int be_visitor_root::visit_root (be_root *node)
     case TAO_CodeGen::TAO_ROOT_CH:
       (void) tao_cg->end_client_header ();
       break;
+    case TAO_CodeGen::TAO_ROOT_CI:
+    case TAO_CodeGen::TAO_ROOT_CS:
+      *os << "\n\n";
+      break;
     case TAO_CodeGen::TAO_ROOT_SH:
       (void) tao_cg->end_server_header ();
       break;
@@ -436,9 +440,6 @@ int be_visitor_root::visit_root (be_root *node)
       break;
     }
 
-  // Make sure each file ends with a newline.
-  *os << "\n";
-
   return 0;
 }
 
@@ -1104,8 +1105,6 @@ be_visitor_root::visit_component (be_component *node)
     case TAO_CodeGen::TAO_ROOT_CH:
       {
         be_visitor_component_ch visitor (&ctx);
-        // This is the only context state involved in strategies.
-        ctx.state (TAO_CodeGen::TAO_INTERFACE_CH);
         status = node->accept (&visitor);
         break;
       }
@@ -1669,8 +1668,6 @@ be_visitor_root::gen_explicit_tmplinst (be_root *node,
       if (be_global->gen_anyop_files ())
         {
           tao_cg->anyop_source ()->gen_endif_AHETI ();
-          
-          *tao_cg->anyop_source () << "\n";
         }
     }
   else if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS)
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 3a27523ade3..3a35cfdb386 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -838,7 +838,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
             }
           else
             {
-              *os << "TAO::Objref_Traits<" << bt->name () << ">::marshal ("
+              *os << "TAO::Objref_Traits<" << bt->name () << ">::tao_marshal ("
                   << be_idt << be_idt_nl
                   << "_tao_sequence[i].in (), strm" << be_uidt_nl
                   << ");" << be_uidt << be_uidt;
diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp
index 159e95ef9bd..30db4880b9c 100644
--- a/TAO/TAO_IDL/be/be_visitor_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp
@@ -116,15 +116,15 @@ be_visitor_traits::visit_interface (be_interface *node)
           << "struct " << be_global->stub_export_macro () << " Objref_Traits<"
           << " ::" << node->name () << ">" << be_nl
           << "{" << be_idt_nl
-          << "static ::" << node->name () << "_ptr duplicate ("
+          << "static ::" << node->name () << "_ptr tao_duplicate ("
           << be_idt << be_idt_nl
           << "::" << node->name () << "_ptr" << be_uidt_nl
           << ");" << be_uidt_nl
-          << "static void release (" << be_idt << be_idt_nl
+          << "static void tao_release (" << be_idt << be_idt_nl
           << "::" << node->name () << "_ptr" << be_uidt_nl
           << ");" << be_uidt_nl
-          << "static ::" << node->name () << "_ptr nil (void);" << be_nl
-          << "static CORBA::Boolean marshal (" << be_idt << be_idt_nl
+          << "static ::" << node->name () << "_ptr tao_nil (void);" << be_nl
+          << "static CORBA::Boolean tao_marshal (" << be_idt << be_idt_nl
           << "::" << node->name () << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
@@ -191,10 +191,10 @@ be_visitor_traits::visit_valuetype (be_valuetype *node)
           << "struct " << be_global->stub_export_macro () << " Value_Traits<"
           << node->name () << ">" << be_nl
           << "{" << be_idt_nl
-          << "static void add_ref (" << node->name () << " *);" << be_nl
-          << "static void remove_ref (" << node->name () << " *);"
+          << "static void tao_add_ref (" << node->name () << " *);" << be_nl
+          << "static void tao_remove_ref (" << node->name () << " *);"
           << be_nl
-          << "static void release (" << node->name () << " *);"
+          << "static void tao_release (" << node->name () << " *);"
           << be_uidt_nl
           << "};";
 
@@ -388,6 +388,39 @@ be_visitor_traits::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
+  // Generate the array traits specialization definitions,
+  // guarded by #ifdef on unaliased array element type and length.
+
+  ACE_CString unique;
+  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  AST_Decl::NodeType nt = bt->node_type ();
+
+  if (nt == AST_Decl::NT_typedef)
+    {
+      be_typedef *td = be_typedef::narrow_from_decl (bt);
+      unique = td->primitive_base_type ()->flat_name ();
+    }
+  else
+    {
+      unique = bt->flat_name ();
+    }
+
+  char buf[NAMEBUFSIZE];
+
+  for (unsigned long i = 0; i < node->n_dims (); ++i)
+    {
+      ACE_OS::memset (buf,
+                      '\0',
+                      NAMEBUFSIZE);
+      ACE_OS::sprintf (buf,
+                       "_%ld",
+                       node->dims ()[i]->ev ()->u.ulval);
+      unique += buf;
+    }
+
+  unique += "_traits";
+//  os->gen_ifdef_macro (unique.fast_rep ());
+
   *os << be_nl << be_nl
       << "ACE_TEMPLATE_SPECIALIZATION" << be_nl
       << "struct " << be_global->stub_export_macro () << " Array_Traits<"
@@ -397,20 +430,20 @@ be_visitor_traits::visit_array (be_array *node)
       << name << "_tag" << be_uidt_nl
       << ">" << be_uidt_nl
       << "{" << be_idt_nl
-      << "static void free (" << be_idt << be_idt_nl
+      << "static void tao_free (" << be_idt << be_idt_nl
       << name << "_slice * _tao_slice" << be_uidt_nl
       << ");" << be_uidt_nl
-      << "static " << name << "_slice * dup ("
+      << "static " << name << "_slice * tao_dup ("
       << be_idt << be_idt_nl
       << "const " << name << "_slice * _tao_slice"
       << be_uidt_nl
       << ");" << be_uidt_nl
-      << "static void copy (" << be_idt << be_idt_nl
+      << "static void tao_copy (" << be_idt << be_idt_nl
       << name << "_slice * _tao_to," << be_nl
       << "const " << name << "_slice * _tao_from"
       << be_uidt_nl
       << ");" << be_uidt_nl
-      << "static " << name << "_slice * alloc (void);"
+      << "static " << name << "_slice * tao_alloc (void);"
       << be_uidt_nl
       << "};";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
index f9574060652..664e9a660f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
@@ -145,7 +145,7 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node)
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << fname << " _tao_union_tmp;" << be_nl
-          << fname << "_forany _tao_union_helper ("
+          << fname << "_forany _tao_union_helper (" 
           << be_idt << be_idt_nl
           << "_tao_union_tmp" << be_uidt_nl
           << ");" << be_uidt_nl
@@ -301,7 +301,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
         {
           if (f->is_abstract ())
             {
-              *os << "(strm << _tao_union."
+              *os << "(strm << _tao_union." 
                   << f->local_name () << " ());";
             }
           else
@@ -315,7 +315,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
       else
         {
           *os << "result =" << be_idt_nl
-              << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
+              << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal ("
               << be_idt << be_idt_nl
               << "_tao_union." << f->local_name () << " ()," << be_nl
               << "strm" << be_uidt_nl
@@ -698,7 +698,7 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node)
                             -1);
         }
     }
-
+    
   // Now generate the CDR stream operators for the sequence as a
   // union branch.
 
@@ -849,7 +849,7 @@ be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node)
                             -1);
         }
     }
-
+    
   // How generate the CDR stream operators for the structure as
   // a union branch.
 
@@ -945,7 +945,7 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node)
                             -1);
         }
     }
-
+    
   // Now generate the CDR stream operators for the union as
   // a union branch.
 
@@ -1040,3 +1040,4 @@ be_visitor_union_branch_cdr_op_cs::explicit_default (void)
 
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index 1b5a9f15141..0a94b45ac15 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -47,7 +47,7 @@ be_visitor_union_branch_public_assign_cs::visit_union_branch (
   )
 {
   TAO_OutStream *os = this->ctx_->stream ();
-
+  
   *os << be_nl;
 
   // This visitor is used when we are generating the copy ctor and
@@ -257,15 +257,15 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
       if (bt_is_defined)
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << bt->name () << "::_";
+              << bt->name () << "::";
         }
       else
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << "TAO::Objref_Traits<" << node->name () << ">::";
+              << "TAO::Objref_Traits<" << node->name () << ">::tao";
         }
 
-      *os << "duplicate (" << be_idt << be_idt_nl
+      *os << "_duplicate (" << be_idt << be_idt_nl
           << "u.u_." << ub->local_name () << "_->ptr ()" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl << ")" << be_uidt << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
@@ -279,17 +279,17 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
       if (bt_is_defined)
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << bt->name () << "::_";
+              << bt->name () << "::";
         }
       else
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << "TAO::Objref_Traits<" << node->name () << ">::";
+              << "TAO::Objref_Traits<" << node->name () << ">::tao";
         }
 
-      *os << "duplicate (" << be_idt << be_idt_nl
+      *os << "_duplicate (" << be_idt << be_idt_nl
           << "u.u_." << ub->local_name ()
-          << "_->ptr ()" << be_uidt_nl
+          << "_->ptr ()" << be_uidt_nl 
           << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl
           << "*this" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
@@ -354,15 +354,15 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
       if (bt_is_defined)
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << bt->name () << "::_";
+              << bt->name () << "::";
         }
       else
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << "TAO::Objref_Traits<" << node->name () << ">::";
+              << "TAO::Objref_Traits<" << node->name () << ">::tao";
         }
 
-      *os << "duplicate (" << be_idt << be_idt_nl
+      *os << "_duplicate (" << be_idt << be_idt_nl
           << "u.u_." << ub->local_name () << "_->ptr ()" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl << ")" << be_uidt << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
@@ -376,17 +376,17 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
       if (bt_is_defined)
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << bt->name () << "::_";
+              << bt->name () << "::";
         }
       else
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << "TAO::Objref_Traits<" << node->name () << ">::";
+              << "TAO::Objref_Traits<" << node->name () << ">::tao";
         }
 
-      *os << "duplicate (" << be_idt << be_idt_nl
+      *os << "_duplicate (" << be_idt << be_idt_nl
           << "u.u_." << ub->local_name ()
-          << "_->ptr ()" << be_uidt_nl
+          << "_->ptr ()" << be_uidt_nl 
           << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl
           << "*this" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index 24909678547..5b45fd9505d 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -363,15 +363,15 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
       if (bt_is_defined)
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << bt->name () << "::_";
+              << bt->name () << "::";
         }
       else
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << "TAO::Objref_Traits<" << node->name () << ">::";
+              << "TAO::Objref_Traits<" << node->name () << ">::tao";
         }
 
-  *os << "duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl
+  *os << "_duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -460,15 +460,15 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
       if (bt_is_defined)
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << bt->name () << "::_";
+              << bt->name () << "::";
         }
       else
         {
           *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
-              << "TAO::Objref_Traits<" << node->name () << ">::";
+              << "TAO::Objref_Traits<" << node->name () << ">::tao";
         }
 
-  *os << "duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl
+  *os << "_duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -690,7 +690,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << bu->name () << "::" << ub->local_name () << " (";
-
+  
 
   AST_PredefinedType::PredefinedType pt = node->pt ();
 
@@ -712,7 +712,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
           << bt->name ()
           << " &";
     }
-  else
+  else 
     {
       *os << bt->name ();
     }
@@ -762,7 +762,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
         break;
       case AST_PredefinedType::PT_value:
         *os << "CORBA::add_ref (val);" << be_nl
-            << "this->u_." << ub->local_name ()
+            << "this->u_." << ub->local_name () 
             << "_ = val;" << be_uidt_nl;
 
         break;
@@ -900,7 +900,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
 
   // (1) Set from a const.
   *os << "// Accessor to set the member." << be_nl
-      << "ACE_INLINE" << be_nl
+      << "ACE_INLINE" << be_nl 
       << "void" << be_nl
       << bu->name () << "::" << ub->local_name ()
       << " (const " << bt->name () << " &val)" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
index 461a6b53a4c..dd078a1390a 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -432,11 +432,11 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
       // Get method (read-only).
       *os << pre_op () << "const " << bt->name () << " &"
           << ub->local_name () << " (void) const"
-          << post_op () << be_nl;
+          << post_op ();
       // Get method (read/write).
       *os << pre_op () << bt->name () << " &"
           << ub->local_name () << " (void)"
-          << post_op ();
+          << post_op () << be_nl << be_nl;
       break;
     case AST_PredefinedType::PT_void:
       break;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index 6292d08fa71..6f04adbbb06 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -160,13 +160,25 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
 
       *os << "public virtual CORBA::ValueBase";
     }
-    
-  // Generate the supported interfaces.  
-  for (i = 0; i < node->n_supports (); ++i)
+
+  if (node->supports_abstract ())
     {
-      *os << "," << be_nl
-          << "public virtual "
-          << node->supports ()[i]->name ();
+      status =
+        node->traverse_supports_list_graphs (
+            be_valuetype::abstract_supports_helper,
+            os,
+            I_TRUE,
+            I_FALSE
+          );    
+
+      if (status == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_ch::"
+                             "visit_valuetype - "
+                             "traversal of supported interfaces failed\n"),
+                            -1);
+        }
     }
 
   // Generate the body.
@@ -237,10 +249,9 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  // If we inherit from CORBA::Object and/or CORBA::AbstractBase
-  // (in addition to CORBA::ValueBase) we have to add these 
-  // to avoid ambiguity.
-  if (node->n_supports () > 0)
+  // If we inherit from both CORBA::ValueBase and CORBA::AbstractBase,
+  // we have to add this to avoid ambiguity.
+  if (node->supports_abstract ())
     {
       *os << be_uidt_nl << be_nl << "public:" << be_idt_nl;
       *os << be_nl << "virtual void _add_ref (void) = 0;" << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
index 2ee88358c20..3b86f08e4b1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -56,8 +56,35 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "ACE_INLINE" << be_nl;
-  *os << node->name () << "::" << node->local_name () << " (void)" << be_nl
-      << "{}" << be_nl << be_nl;
+  *os << node->name () << "::" << node->local_name () << " (void)" << be_nl;
+
+  if (node->supports_abstract ())
+    {
+      *os << "{" << be_idt;
+
+      int status =
+        node->traverse_supports_list_graphs (
+            be_valuetype::gen_abstract_init_helper,
+            os,
+            I_TRUE,
+            I_FALSE
+          );
+
+      if (status == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_ci::"
+                             "visit_valuetype - "
+                             "traversal of supported interfaces failed\n"),
+                            -1);
+        }
+
+      *os << be_uidt_nl << "}" << be_nl << be_nl;
+    }
+  else
+    {
+      *os << "{}" << be_nl << be_nl;
+    }
 
   *os << "ACE_INLINE" << be_nl;
   *os << node->name () << "::~" << node->local_name () << " (void)" << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 869e85a1e6b..daa6e078b36 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -70,7 +70,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl
           << "void" << be_nl
-          << "TAO::Value_Traits<" << node->name  () << ">::add_ref ("
+          << "TAO::Value_Traits<" << node->name  () << ">::tao_add_ref ("
           << be_idt << be_idt_nl
           << node->name () << " * p" << be_uidt_nl
           << ")" << be_uidt_nl
@@ -81,7 +81,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl
           << "void" << be_nl
-          << "TAO::Value_Traits<" << node->name () << ">::remove_ref ("
+          << "TAO::Value_Traits<" << node->name () << ">::tao_remove_ref ("
           << be_idt << be_idt_nl
           << node->name () << " * p" << be_uidt_nl
           << ")" << be_uidt_nl
@@ -92,7 +92,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       *os << be_nl << be_nl
           << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl
           << "void" << be_nl
-          << "TAO::Value_Traits<" << node->name () << ">::release ("
+          << "TAO::Value_Traits<" << node->name () << ">::tao_release ("
           << be_idt << be_idt_nl
           << node->name () << " * p" << be_uidt_nl
           << ")" << be_uidt_nl
@@ -232,10 +232,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "return retval;" << be_uidt_nl
       << "}";
 
-  // If we inherit from CORBA::Object and/or CORBA::AbstractBase
-  // (in addition to CORBA::ValueBase) we have to add these
-  // to avoid ambiguity.
-  if (node->n_supports () > 0)
+  if (node->supports_abstract ())
     {
       *os << be_nl << be_nl
           << "CORBA::ValueBase *" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
index 0d89ded2a01..0d5d5836734 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -180,10 +180,9 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
                             -1);
         }
 
-      // If we inherit from CORBA::Object and/or CORBA::AbstractBase
-      // (in addition to CORBA::ValueBase) we have to add these 
-      // to avoid ambiguity.
-      if (node->n_supports () > 0)
+      // If we inherit from both CORBA::ValueBase and CORBA::AbstractBase,
+      // we have to add this to avoid ambiguity.
+      if (node->supports_abstract ())
         {
           *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
               << "// " << __FILE__ << ":" << __LINE__ ;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
index fc0202f10a6..e415120ef58 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -107,10 +107,9 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
                             -1);
         }
 
-      // If we inherit from CORBA::Object and/or CORBA::AbstractBase
-      // (in addition to CORBA::ValueBase) we have to add these 
-      // to avoid ambiguity.
-      if (node->n_supports () > 0)
+      // If we inherit from both CORBA::ValueBase and CORBA::AbstractBase,
+      // we have to add this to avoid ambiguity.
+      if (node->supports_abstract ())
         {
           *os << be_nl << be_nl << "void" << be_nl
               << node->full_obv_skel_name () 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
index e3f63a051a7..f7db8a0ca0f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
@@ -98,7 +98,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
 
   *os << be_idt_nl
       << ": TAO_Abstract_ServantBase (rhs)," << be_nl
-      << "  TAO_ServantBase (rhs)," << be_idt_nl;
+      << "  TAO_ServantBase (rhs)," << be_nl;
 
   if (concrete->is_nested ())
     {
@@ -113,8 +113,22 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
       *os << bd->full_skel_name () << " (rhs)," << be_nl;
     }
 
-  *os << "ValueBase (rhs)" << be_uidt << be_uidt_nl
-      << "{}" << be_nl << be_nl;
+  *os << "  ValueBase (rhs)," << be_nl;
+    
+  if (node->is_nested ())
+    {
+      AST_Decl *scope = ScopeAsDecl (node->defined_in ());
+
+      *os << "  ACE_NESTED_CLASS (" << scope->name () << ", "
+          << node->local_name () << ") ()";
+    }
+  else
+    {
+      be_interface *bd = be_interface::narrow_from_decl (node);
+      *os << bd->full_skel_name () << " ()";
+    }
+
+  *os << be_uidt_nl << "{}" << be_nl << be_nl;
 
   *os << full_skel_name << "::~"
       << local_name_prefix << node_local_name
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 532b0eea9e8..f104767418e 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -428,10 +428,6 @@ public:
   void gen_anyop_files (idl_bool val);
   // Accessors for the member.
   
-  idl_bool do_ccm_preproc (void) const;
-  void do_ccm_preproc (idl_bool val);
-  // Accessors for the member do_ccm_preproc_.
-  
   ACE_CString spawn_options (void);
   // Command line passed to ACE_Process::spawn. Different
   // implementations in IDL and IFR backends.
@@ -586,10 +582,7 @@ private:
   // Reference holder for component skeleton visitors.
 
   idl_bool gen_anyop_files_;
-  // Separate files for generated Any operators?
-  
-  idl_bool do_ccm_preproc_;
-  // Do the IDL3 to IDL2 preprocessing?
+  // @@@ (TAO TEAM ONLY) Separate files for generated Any operators?
 };
 
 #endif /* _BE_GLOBAL_H */
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
index b3c81fa052f..37c9c2df060 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -134,6 +134,12 @@ public:
   // Helper method passed to the template method to generate code for
   // adding abstract supported interfaces to the inheritance list.
 
+  static int gen_abstract_init_helper (be_interface *node,
+                                       be_interface *base,
+                                       TAO_OutStream *os);
+  // Helper method to initialize the val_ member of the generated
+  // C++ class for each abstract interface that we support.
+
   static int gen_skel_helper (be_interface *node,
                               be_interface *base,
                               TAO_OutStream *os);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
index e362eb94d23..a17e821e674 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
@@ -49,6 +49,9 @@ public:
 
   virtual int visit_operation (be_operation *node);
 
+  // @@@ (JP) I don't think this has to be overridden.
+  virtual int visit_scope (be_scope *node);
+
 private:
   /// Create the reponse handler interface
   be_interface *create_response_handler (be_interface *node,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
index f62257fcf3b..a1e5f0c6af8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
@@ -126,13 +126,6 @@ private:
                             const char *name,
                             be_exception *&result);
 
-  int create_uses_multiple_stuff (be_component *node,
-                                  AST_Component::port_description *pd);
-  int create_uses_multiple_struct (be_component *node,
-                                   AST_Component::port_description *pd);
-  int create_uses_multiple_sequence (be_component *node,
-                                     AST_Component::port_description *pd);
-
   int create_event_consumer (be_eventtype *node);
   AST_Interface *lookup_consumer (AST_Component::port_description *pd);
   AST_Interface *create_explicit (be_home *node);
@@ -149,8 +142,6 @@ private:
 private:
   // These are created for operations implied by 'uses multiple' declarations.
   Identifier module_id_;
-  be_structure *connection_;
-  be_sequence *connections_;
   be_valuetype *cookie_;
 
   // Exceptions thrown by implied CCM operations.
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index bf9c2d1bd76..9c231e8997c 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -423,32 +423,14 @@ DRV_check_for_include (const char* buf)
 
   // Terminate this string.
   file_name [i] = '\0';
-  
-  size_t len = ACE_OS::strlen (file_name);
 
-  // Some backends pass this file through, others don't.
+  // Store in the idl_global, unless it's "orb.idl" -
+  // we don't want to generate header includes for that.
   if (ACE_OS::strcmp (file_name, "orb.idl") == 0)
     {
-      if (idl_global->pass_orb_idl ())
-        {
-          idl_global->add_to_included_idl_files (file_name);
-        }
-      else
-        {
-          DRV_get_orb_idl_includes ();
-        }
-    }
-  // We have special lookup for orb.idl (TAO_ROOT/tao) that
-  // also kicks in for .pidl files. If one of the latter is
-  // included as a local name only, we add the 'tao/' prefix
-  // so the generated C++ include files will be correct.
-  else if (ACE_OS::strcmp (file_name + len - 5, ".pidl") == 0
-           && ACE_OS::strchr (file_name, '/') == 0
-           && ACE_OS::strchr (file_name, '\\') == 0)
-    {
-      ACE_CString fixed_name ("tao/");
-      fixed_name += file_name;
-      idl_global->add_to_included_idl_files (fixed_name.rep ());
+      // However, we do want to generate includes for the
+      // .pidl files that it contains.
+      DRV_get_orb_idl_includes ();
     }
   else
     {
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index f6d54db537a..7df853b91aa 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -950,6 +950,14 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
           continue;
         }
 
+      // Abstract interface? (illegal for components to support).
+      if (i->is_abstract ())
+        {
+          idl_global->err ()->concrete_interface_expected (this->name (),
+                                                           i->name ());
+          continue;
+        }
+
       // Local interface? (illegal for components to support).
       if (i->is_local ())
         {
diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp
index 93ffbe3019e..e155f034043 100644
--- a/TAO/TAO_IDL/fe/fe_lookup.cpp
+++ b/TAO/TAO_IDL/fe/fe_lookup.cpp
@@ -181,13 +181,10 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
 
       if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
         {
-          if (len == static_cast<unsigned int> (ACE_OS::strlen (wordlist[key].keyword_)))
-            {
-              const char *s = wordlist[key].keyword_;
+          const char *s = wordlist[key].keyword_;
 
-              if (*str == *s && !ACE_OS::strncmp (str + 1, s + 1, len - 1))
-                return &wordlist[key];
-            }
+          if (*str == *s && !ACE_OS::strncmp (str + 1, s + 1, len - 1))
+            return &wordlist[key];
         }
     }
   return 0;
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index a7cb460ae90..fd2d95715e3 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -279,7 +279,7 @@ oneway		return IDL_ONEWAY;
                                   IDL_STRING_LITERAL);
 		  return IDL_STRING_LITERAL;
 	      	}
-(L\"([^\\\"]*|\\u([0-9a-fA-F]{1,4}))*\"[ \t]*)+	{
+L\"([^\\\"]*|\\u([0-9a-fA-F]{1,4}))*\"	{
 		  /* Skip the bookends */
 		  char *tmp = ACE_OS::strdup (ace_yytext);
 		  tmp[strlen (tmp) - 1] = '\0';
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index c4a400ffbfa..92e542619b2 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -4516,6 +4516,14 @@ uses_decl :
                   ud.impl = interface_type;
                   ud.is_multiple = $2;
                   c->uses ().enqueue_tail (ud);
+                  
+                  if (ud.is_multiple == I_TRUE)
+                    {
+                      // These datatypes must be created in the
+                      // front end so they can be looked up
+                      // when compiling the generated executor IDL.
+                      idl_global->create_uses_multiple_stuff (c, ud);
+                    }
                 }
             }
         }
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 38ac79e950e..be461db9bd3 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -284,7 +284,7 @@ static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] ));
 
 #define TAO_YY_NUM_RULES 104
 #define TAO_YY_END_OF_BUFFER 105
-static tao_yyconst short int tao_yy_accept[551] =
+static tao_yyconst short int tao_yy_accept[549] =
     {   0,
       101,  101,  105,  103,  101,  102,  102,  103,  103,  103,
       103,  103,   76,   72,  103,  103,  103,   68,   68,   68,
@@ -310,42 +310,42 @@ static tao_yyconst short int tao_yy_accept[551] =
 
        68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
         0,    0,    0,    0,    0,    0,    0,   82,   80,    0,
-        0,   73,    0,   69,   70,   68,   78,    0,    0,   83,
-        0,   68,   59,   68,   68,   68,   20,   27,   68,   68,
-       68,   68,   68,   68,   68,   13,   68,   68,   68,   68,
-       68,   68,   68,   48,   68,   68,   68,   68,   24,   68,
+        0,   73,    0,   69,   70,   68,    0,   83,    0,   68,
+       59,   68,   68,   68,   20,   27,   68,   68,   68,   68,
+       68,   68,   68,   13,   68,   68,   68,   68,   68,   68,
+       68,   48,   68,   68,   68,   68,   24,   68,   68,   68,
        68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
        68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-       68,   68,   57,   68,   31,   68,   68,    0,    0,    0,
-        0,    0,    0,    0,   96,    0,    0,    0,    0,    0,
-
-        0,   80,    0,   81,    0,   60,    0,    0,   68,   68,
-       68,   68,   68,   10,   68,   68,   68,   68,   68,   44,
-       68,   68,   68,   68,   18,   22,   68,   68,   61,   68,
-       33,   68,   68,   68,   68,   30,   68,   68,   68,   68,
-       68,   68,   68,   68,   68,   25,   68,   68,   68,   68,
-       68,   68,   68,   68,   17,   68,   68,   28,   68,   91,
+       57,   68,   31,   68,   68,    0,    0,    0,    0,    0,
+        0,    0,   96,    0,    0,    0,    0,    0,    0,   80,
+
+        0,   81,    0,   60,    0,    0,   68,   68,   68,   68,
+       68,   10,   68,   68,   68,   68,   68,   44,   68,   68,
+       68,   68,   18,   22,   68,   68,   61,   68,   33,   68,
+       68,   68,   68,   30,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   25,   68,   68,   68,   68,   68,   68,
+       68,   68,   17,   68,   68,   28,   68,   91,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   84,    0,    2,   68,   68,   68,   68,   68,
-       68,   35,   68,   23,   68,   68,   68,   46,   68,   49,
-       68,   68,    3,   68,   32,   64,   68,   68,   68,   38,
+       84,    0,    2,   68,   68,   68,   68,   68,   68,   35,
+       68,   23,   68,   68,   68,   46,   68,   49,   68,   68,
+        3,   68,   32,   64,   68,   68,   68,   38,   68,    4,
 
-       68,    4,   68,   68,   68,   14,   12,   68,   19,   68,
-       68,   55,   68,   68,   68,   68,    0,   89,    0,    0,
+       68,   68,   68,   14,   12,   68,   19,   68,   68,   55,
+       68,   68,   68,   68,    0,   89,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   68,   68,   29,   68,   68,    8,   21,   68,
-       68,   36,   68,   68,   58,   68,   68,   37,   68,   68,
-       68,   68,   68,   68,   68,   11,   68,   68,   68,   15,
-        0,    0,   87,   87,    0,    0,   93,    0,    0,   92,
-        0,    0,    0,    0,    0,    0,    0,   34,   68,   68,
-       43,   68,   68,   68,   68,   50,   68,   52,   68,    5,
-       16,   68,   39,   68,   68,   26,   68,    0,   97,   97,
-
-        0,    0,    0,    0,   90,    0,    0,    0,    0,    0,
-        0,    0,    6,   42,   45,    7,   47,    9,   68,   53,
-       54,   68,   68,   41,    0,   85,   85,    0,    0,   88,
-       88,    0,    0,    0,    0,   51,   68,   56,    0,   98,
-       98,    0,    0,    0,   40,   94,    0,   86,   86,    0
+       68,   68,   29,   68,   68,    8,   21,   68,   68,   36,
+       68,   68,   58,   68,   68,   37,   68,   68,   68,   68,
+       68,   68,   68,   11,   68,   68,   68,   15,    0,    0,
+       87,   87,    0,    0,   93,    0,    0,   92,    0,    0,
+        0,    0,    0,    0,    0,   34,   68,   68,   43,   68,
+       68,   68,   68,   50,   68,   52,   68,    5,   16,   68,
+       39,   68,   68,   26,   68,    0,   97,   97,    0,    0,
+
+        0,    0,   90,    0,    0,    0,    0,    0,    0,    0,
+        6,   42,   45,    7,   47,    9,   68,   53,   54,   68,
+       68,   41,    0,   85,   85,    0,    0,   88,   88,    0,
+        0,    0,    0,   51,   68,   56,    0,   98,   98,    0,
+        0,    0,   40,   94,    0,   86,   86,    0
     } ;
 
 static tao_yyconst int tao_yy_ec[256] =
@@ -390,141 +390,141 @@ static tao_yyconst int tao_yy_meta[60] =
         6,    8,    6,    8,    6,    8,    6,    8,    6
     } ;
 
-static tao_yyconst short int tao_yy_base[578] =
+static tao_yyconst short int tao_yy_base[576] =
     {   0,
-        0,   58, 1044, 1045,   59, 1045, 1045,   56, 1009,   54,
-       57,   65,   68,   73, 1025, 1023, 1020,    0, 1017,   69,
-     1002, 1008,   45,  987,   56,   37,   48,   67,  996,  985,
-       61,  984,   65,  997,   79,   63,   82,   83,   71,   71,
-       93,   92,  134,  144, 1010,  130,   97,  148,    0, 1022,
-      147,  152,  158,  184,  210, 1045,  148,  161,  197,  203,
-      229,    0,  239, 1045, 1045, 1045,    0, 1002,  137,  994,
-      983,  994,  972,  965,  969,  973,  968,  985,  109,  966,
-      978,  962,  973,  960,  975,  976,  975,  130,  962,  956,
-      962,  958,  132,   96,  959,  968,  959,  950,  949,  963,
-
-      947,  136,  964,  956,  963,  138,  948,  944,  945,  951,
-      938,  942,  140,  952,  944,  946,  946,  933,  199,    0,
-      174, 1045,  980,  243,  942,  946,  940,  930,  962,  226,
-      196,  204, 1045,  972,  971,  252,  970,  256,    0,  261,
-      272, 1045,  258, 1045,  286,    0,  277,  283,    0,  947,
-      235,  279,  921,  967,  257,  935,  949,  918,    0,  919,
-      924,  930,  916,  917,  110,  912,  930,  928,  909,  915,
-      913,  921,  905,  920,  918,  921,  903,  915,  904,  897,
-      912,  915,  908,  913,  892,  892,  902,  905,  886,    0,
-      247,  886,  895,  887,  901,  883,  885,  884,  152,  885,
-
-      880,  885,  893,  882,  887,  876,  873,  889,  891,  873,
-      918,  917,  876,  882,  872,  884,  328, 1045, 1045,  301,
-      910,    0,  303,  310, 1045,  893,  300,  910,    0, 1045,
-        0,  878,    0,  862,  870,  873,    0,    0,  862,  259,
-      871,  860,  853,  861,  853,    0,  851,  854,  854,  863,
-      863,  846,  864,    0,  846,  843,  844,  849,    0,  853,
-      847,  849,  835,  836,  854,  853,  852,  843,  842,  845,
-      834,  843,  846,  826,  831,  841,  828,  839,  838,  296,
-      826,  832,    0,  833,    0,  819,  827,  863,  317,  829,
-      819,  827,  824,  818, 1045,  290,  348,  820,  824,  818,
-
-      808, 1045,  851, 1045,  850,    0,  373,  849,  802,  820,
-      818,  818,  804,    0,  804,  792,  802,  802,  808,    0,
-      792,  791,  792,  791,    0,    0,  799,  787,    0,  800,
-        0,  800,  799,  787,  797,    0,  776,  782,  779,  794,
-      304,  778,  782,  781,  785,    0,  786,  772,  773,  782,
-      788,  783,  783,  768,    0,  771,  764,    0,  769, 1045,
-      378,  299,  762,  370,  768,  808,  807,  766,  772,  762,
-      774,  400, 1045,  800,    0,  770,  751,  757,  765,  764,
-      748,    0,  747,    0,  741,  756,  739,    0,  744,    0,
-      761,  685,    0,  680,    0,    0,  655,  671,  668,    0,
-
-      662,    0,  646,  652,  627,    0,    0,  615,    0,  599,
-      609,    0,  609,  596,  565,  582,  427, 1045,  442,  344,
-      353,  450,  465,  586,  613,  356,  579,  569,  577,  573,
-      473,  605,  558,  557,    0,  562,  556,    0,    0,  550,
-      546,    0,  554,  554,    0,  529,  519,    0,  505,  515,
-      493,  508,  489,  474,  484,    0,  459,  456,  442,    0,
-      469,  397, 1045,  399,  430,  472, 1045,  485,  365, 1045,
-      500,  371,  428,  515,  414,  385,  452,    0,  415,  395,
-        0,  382,  358,  352,  365,    0,  351,    0,  313,    0,
-        0,  301,    0,  309,  297,    0,  289,  497, 1045,  503,
-
-      305,  519,  522,  530, 1045,  534,  538,  448,  551,  555,
-      412,  239,    0,    0,    0,    0,    0,    0,  193,    0,
-        0,  187,  171,    0,  559, 1045,  569,  571,  573, 1045,
-      575,  578,  216,  197,  457,    0,   55,    0,  580, 1045,
-      585,   61,  594,  599,    0, 1045,  601, 1045,  604, 1045,
-      625,  633,  637,  643,  651,  659,  663,  670,  678,  683,
-      686,  693,  698,  701,  704,  708,  715,  720,  727,  732,
-      739,  747,  755,  763,  771,  779,  787
+        0,   58, 1037, 1038,   59, 1038, 1038,   56, 1002,   54,
+       57,   65,   68,   73, 1018, 1016, 1013,    0, 1010,   69,
+      995, 1001,   45,  980,   56,   37,   48,   67,  989,  978,
+       61,  977,   65,  990,   79,   63,   82,   83,   71,   71,
+       93,   92,  134,  144, 1003,  130,   97,  148,    0, 1015,
+      147,  152,  158,  184,  210, 1038,  148,  161,  197,  203,
+      229,    0,  239, 1038, 1038, 1038,    0,  995,  137,  987,
+      976,  987,  965,  958,  962,  966,  961,  978,  109,  959,
+      971,  955,  966,  953,  968,  969,  968,  130,  955,  949,
+      955,  951,  132,   96,  952,  961,  952,  943,  942,  956,
+
+      940,  136,  957,  949,  956,  138,  941,  937,  938,  944,
+      931,  935,  140,  945,  937,  939,  939,  926,  199,    0,
+      174, 1038,  973,  243,  935,  939,  933,  923,  955,  226,
+      196,  204, 1038,  965,  964,  252,  963,  256,    0,  261,
+      272, 1038,  258, 1038,  286,    0,  277,  283,    0,  940,
+      235, 1038,  914,  960,  257,  928,  942,  911,    0,  912,
+      917,  923,  909,  910,  110,  905,  923,  921,  902,  908,
+      906,  914,  898,  913,  911,  914,  896,  908,  897,  890,
+      905,  908,  901,  906,  885,  885,  895,  898,  879,    0,
+      247,  879,  888,  880,  894,  876,  878,  877,  152,  878,
+
+      873,  878,  886,  875,  880,  869,  866,  882,  884,  866,
+      911,  910,  869,  875,  865,  877,  328, 1038, 1038,  301,
+      903,    0,  290,  310, 1038,  886,    0, 1038,    0,  872,
+        0,  856,  864,  867,    0,    0,  856,  247,  865,  854,
+      847,  855,  847,    0,  845,  848,  848,  857,  857,  840,
+      858,    0,  840,  837,  838,  843,    0,  847,  841,  843,
+      829,  830,  848,  847,  846,  837,  836,  839,  828,  837,
+      840,  820,  825,  835,  822,  833,  832,  284,  820,  826,
+        0,  827,    0,  813,  821,  857,  315,  823,  813,  821,
+      818,  812, 1038,  268,  343,  814,  818,  812,  802, 1038,
+
+      845, 1038,  844,    0,  373,  843,  796,  814,  812,  812,
+      798,    0,  798,  786,  796,  796,  802,    0,  786,  785,
+      786,  785,    0,    0,  793,  781,    0,  794,    0,  794,
+      793,  781,  791,    0,  770,  776,  773,  788,  301,  772,
+      776,  775,  779,    0,  780,  766,  767,  776,  782,  777,
+      777,  762,    0,  765,  758,    0,  763, 1038,  378,  279,
+      756,  361,  762,  802,  801,  760,  766,  756,  768,  400,
+     1038,  794,    0,  764,  745,  751,  759,  701,  674,    0,
+      662,    0,  653,  666,  647,    0,  641,    0,  656,  629,
+        0,  625,    0,    0,  596,  612,  611,    0,  595,    0,
+
+      580,  587,  569,    0,    0,  566,    0,  565,  578,    0,
+      578,  577,  556,  573,  427, 1038,  442,  348,  360,  450,
+      465,  578,  605,  381,  562,  551,  558,  551,  473,  579,
+      523,  510,    0,  510,  502,    0,    0,  504,  501,    0,
+      510,  506,    0,  493,  474,    0,  446,  455,  433,  452,
+      443,  408,  425,    0,  414,  411,  378,    0,  469,  369,
+     1038,  397,  400,  472, 1038,  421,  365, 1038,  500,  415,
+      372,  515,  372,  305,  398,    0,  366,  337,    0,  322,
+      312,  302,  314,    0,  306,    0,  288,    0,    0,  287,
+        0,  292,  278,    0,  278,  430, 1038,  497,  307,  503,
+
+      519,  523, 1038,  531,  538,  448,  546,  551,  558,  261,
+        0,    0,    0,    0,    0,    0,  193,    0,    0,  187,
+      171,    0,  565, 1038,  567,  575,  572, 1038,  577,  579,
+      216,  197,  457,    0,   55,    0,  581, 1038,  591,   61,
+      600,  602,    0, 1038,  604, 1038,  606, 1038,  627,  635,
+      639,  645,  653,  661,  665,  672,  680,  685,  688,  695,
+      700,  703,  706,  710,  717,  722,  729,  734,  741,  749,
+      757,  765,  773,  781,  789
     } ;
 
-static tao_yyconst short int tao_yy_def[578] =
+static tao_yyconst short int tao_yy_def[576] =
     {   0,
-      550,    1,  550,  550,  550,  550,  550,  551,  552,  550,
-      550,  550,  550,  550,  550,  550,  550,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  550,  550,  550,  550,  551,  550,  554,  550,
-      555,  550,  550,  550,  550,  550,  556,   55,  550,  550,
-      550,  557,  550,  550,  550,  550,  553,  553,  558,  559,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  550,   44,
-       44,  550,  121,  550,  550,  550,  550,  550,  550,  550,
-      551,  551,  550,  550,  550,  550,  560,  550,  561,  550,
-      550,  550,  556,  550,  556,   58,  550,  550,  557,  553,
-      558,  550,  550,  550,  550,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      562,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      563,  561,  550,  550,  550,  553,  550,  550,  564,  550,
-      565,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  562,  550,  550,
-      550,  550,  550,  217,  550,  217,  550,  550,  550,  550,
-
-      550,  550,  550,  550,  550,  553,  558,  566,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  550,
-      550,  550,  550,  550,  550,  567,  550,  550,  550,  550,
-      550,  307,  550,  568,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  550,  550,  550,  569,
-      550,  550,  550,  550,  567,  550,  550,  550,  550,  550,
-      307,  570,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      550,  569,  550,  569,  571,  550,  550,  572,  550,  550,
-      550,  550,  550,  550,  550,  558,  550,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  571,  550,  571,
-
-      572,  550,  573,  550,  550,  550,  574,  550,  550,  550,
-      550,  550,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  573,  550,  573,  550,  574,  550,
-      574,  575,  576,  550,  550,  553,  553,  553,  575,  550,
-      575,  576,  550,  577,  553,  550,  577,  550,  577,    0,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550
+      548,    1,  548,  548,  548,  548,  548,  549,  550,  548,
+      548,  548,  548,  548,  548,  548,  548,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  548,  548,  548,  548,  549,  548,  552,  548,
+      553,  548,  548,  548,  548,  548,  554,   55,  548,  548,
+      548,  555,  548,  548,  548,  548,  551,  551,  556,  557,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  548,   44,
+       44,  548,  121,  548,  548,  548,  548,  548,  548,  548,
+      549,  549,  548,  548,  548,  548,  558,  548,  559,  548,
+      548,  548,  554,  548,  554,   58,  548,  548,  555,  551,
+      556,  548,  548,  548,  548,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      560,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      561,  559,  548,  548,  548,  551,  562,  548,  563,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  560,  548,  548,  548,  548,
+      548,  217,  548,  217,  548,  548,  548,  548,  548,  548,
+
+      548,  548,  548,  551,  556,  564,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  548,  548,  548,
+      548,  548,  548,  565,  548,  548,  548,  548,  548,  305,
+      548,  566,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  548,  548,  548,  567,  548,  548,
+      548,  548,  565,  548,  548,  548,  548,  548,  305,  568,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  548,  567,
+      548,  567,  569,  548,  548,  570,  548,  548,  548,  548,
+      548,  548,  548,  556,  548,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  569,  548,  569,  570,  548,
+
+      571,  548,  548,  548,  572,  548,  548,  548,  548,  548,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  571,  548,  571,  548,  572,  548,  572,  573,
+      574,  548,  548,  551,  551,  551,  573,  548,  573,  574,
+      548,  575,  551,  548,  575,  548,  575,    0,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548
     } ;
 
-static tao_yyconst short int tao_yy_nxt[1105] =
+static tao_yyconst short int tao_yy_nxt[1098] =
     {   0,
         4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
        10,   11,   12,   13,   14,   14,   15,   16,    4,   17,
@@ -532,10 +532,10 @@ static tao_yyconst short int tao_yy_nxt[1105] =
        22,   18,   18,    4,   23,   24,   25,   26,   27,   28,
        29,   30,   31,   18,   18,   32,   33,   34,   35,   36,
        18,   37,   38,   39,   40,   41,   42,   18,   18,   43,
-       46,   48,   43,   46,   44,   52,  543,   53,   54,   54,
+       46,   48,   43,   46,   44,   52,  541,   53,   54,   54,
        55,   55,   55,   56,   69,   81,   70,   57,   45,   58,
        73,   59,   59,   60,   58,   82,   63,   63,   63,   49,
-       77,   61,   74,  545,   83,   84,   61,   78,   75,   95,
+       77,   61,   74,  543,   83,   84,   61,   78,   75,   95,
 
        62,   87,   48,   85,   79,   86,   61,   92,   93,   88,
        80,   61,   89,   96,  102,   99,  104,  103,  113,   97,
@@ -543,115 +543,113 @@ static tao_yyconst short int tao_yy_nxt[1105] =
        49,   46,  182,  101,   46,  119,  108,  109,  119,  110,
       120,  116,  152,  183,  118,  121,  122,  122,  123,  130,
       144,  145,  130,  131,  135,  164,  165,  124,  124,  124,
-      136,  136,  240,  241,  122,   55,   55,   55,  145,   58,
+      136,  136,  238,  239,  122,   55,   55,   55,  145,   58,
       153,  138,  138,   60,  146,  146,  146,  174,  191,  137,
       180,   61,  204,  125,  192,  181,  126,  175,  196,  127,
-      139,  197,  205,  128,  275,   58,   61,  140,  140,  140,
+      139,  197,  205,  128,  273,   58,   61,  140,  140,  140,
 
-      119,   48,  533,  119,  137,  120,  276,   61,   58,   48,
-       59,   59,   60,  550,   58,  139,   60,   60,   60,  550,
-       61,  543,   61,   55,   55,   55,   61,  130,  538,   49,
-      130,  131,  537,  141,  142,   61,  142,   49,  147,  147,
+      119,   48,  531,  119,  137,  120,  274,   61,   58,   48,
+       59,   59,   60,  548,   58,  139,   60,   60,   60,  548,
+       61,  541,   61,   55,   55,   55,   61,  130,  536,   49,
+      130,  131,  535,  141,  142,   61,  142,   49,  147,  147,
       152,   61,  148,  148,  148,  122,  122,  212,  141,  142,
-       58,  536,   63,   63,   63,  142,  124,  124,  124,  219,
-      144,  145,   61,  122,  230,  220,  220,   58,  153,  138,
-      138,   60,   58,  535,  140,  140,  140,   61,  145,   61,
-      227,  223,  223,  227,   61,  224,  224,  224,  144,  145,
-      148,  148,  148,  266,   61,  366,  148,  148,  148,   61,
-
-      420,  227,  267,  420,  227,  228,  145,  225,  302,  225,
-      502,  231,  314,  315,  303,  303,  224,  224,  224,  360,
-      360,  361,  225,  224,  224,  224,  228,  524,  225,  294,
-      295,  295,  296,  352,  142,  550,  142,  360,  353,  523,
-      400,  297,  297,  297,  522,  354,  463,  464,  295,  142,
-      295,  295,  367,  521,  465,  142,  401,  465,  470,  470,
-      471,  297,  297,  297,  464,  520,  503,  298,  295,  503,
-      299,  422,  507,  300,  422,  507,  470,  301,  152,  417,
-      418,  418,  417,  423,  423,  423,  372,  372,  372,  519,
-      152,  419,  419,  419,  372,  372,  372,  372,  418,  463,
-
-      464,  463,  464,  518,  517,  516,  153,  372,  372,  372,
-      372,  372,  372,  431,  431,  431,  534,  464,  153,  464,
-      515,  431,  431,  431,  431,  511,  511,  511,  417,  418,
-      418,  417,  499,  500,  431,  431,  431,  431,  431,  431,
-      461,  461,  461,  417,  418,  418,  417,  418,  514,  532,
-      500,  422,  532,  513,  422,  419,  419,  419,  544,  373,
-      512,  544,  418,  423,  423,  423,  466,  467,  467,  466,
-      468,  418,  418,  466,  467,  467,  466,  468,  423,  423,
-      423,  508,  461,  461,  461,  467,  476,  476,  476,  418,
-      502,  497,  467,  496,  476,  476,  476,  476,  495,  499,
-
-      500,  504,  505,  505,  504,  499,  500,  476,  476,  476,
-      476,  476,  476,  506,  506,  506,  509,  500,  494,  510,
-      505,  467,  467,  500,  526,  527,  493,  492,  511,  511,
-      511,  504,  505,  505,  504,  504,  505,  505,  504,  467,
-      530,  531,  527,  528,  528,  528,  491,  506,  506,  506,
-      505,  490,  509,  489,  505,  510,  509,  488,  531,  510,
-      533,  526,  527,  487,  511,  511,  511,  486,  511,  511,
-      511,  526,  527,  505,  505,  530,  531,  530,  531,  527,
-      540,  541,  540,  541,  528,  528,  528,  540,  541,  527,
-      485,  505,  484,  531,  483,  531,  546,  546,  541,  482,
-
-      541,  548,  549,  548,  549,  541,  548,  549,  481,  480,
-      479,  478,  373,  475,  546,  474,  473,  472,  426,  549,
-      469,  549,  460,  459,  549,   47,   47,   47,   47,   47,
-       47,   47,   47,   50,  458,   50,   50,   50,   50,   50,
-       50,   67,   67,   67,   67,  132,  132,  457,  456,  132,
-      132,  134,  455,  134,  134,  134,  134,  134,  134,  143,
-      143,  143,  143,  143,  143,  143,  143,  149,  454,  149,
-      151,  151,  151,  151,  151,  151,  151,  151,  154,  453,
-      154,  154,  154,  154,  154,  154,  221,  221,  452,  221,
-      222,  451,  222,  288,  288,  288,  288,  288,  288,  288,
-
-      288,  305,  305,  450,  305,  307,  449,  307,  308,  448,
-      308,  374,  374,  447,  374,  425,  425,  425,  425,  425,
-      425,  425,  425,  432,  432,  446,  432,  462,  462,  462,
-      462,  462,  462,  462,  462,  477,  477,  445,  477,  498,
-      498,  498,  498,  498,  498,  498,  498,  501,  501,  501,
-      501,  501,  501,  501,  501,  525,  525,  525,  525,  525,
-      525,  525,  525,  529,  529,  529,  529,  529,  529,  529,
-      529,  539,  539,  539,  539,  539,  539,  539,  539,  542,
-      542,  542,  542,  542,  542,  542,  542,  547,  547,  547,
-      547,  547,  547,  547,  547,  444,  443,  442,  441,  440,
-
-      439,  438,  437,  436,  435,  434,  433,  373,  430,  429,
-      428,  427,  366,  426,  424,  421,  416,  415,  414,  413,
-      412,  411,  410,  409,  408,  407,  406,  405,  404,  403,
-      402,  399,  398,  397,  396,  395,  394,  393,  392,  391,
-      390,  389,  388,  387,  386,  385,  384,  383,  382,  381,
-      380,  379,  378,  377,  376,  375,  373,  304,  302,  371,
-      370,  369,  368,  550,  365,  364,  363,  362,  289,  359,
-      358,  357,  356,  355,  351,  350,  349,  348,  347,  346,
-      345,  344,  343,  342,  341,  340,  339,  338,  337,  336,
-      335,  334,  333,  332,  331,  330,  329,  328,  327,  326,
-
-      325,  324,  323,  322,  321,  320,  319,  318,  317,  316,
-      313,  312,  311,  310,  309,   69,  306,  304,  293,  292,
-      291,  290,  211,  289,  287,  286,  285,  284,  283,  282,
-      281,  280,  279,  278,  277,  274,  273,  272,  271,  270,
-      269,  268,  265,  264,  263,  262,  261,  260,  259,  258,
-      257,  256,  255,  254,  253,  252,  251,  250,  249,  248,
-      247,  246,  245,  244,  243,  242,  239,  238,  237,  236,
-      235,  234,  233,  232,  230,  229,  226,  218,  218,  218,
-      217,  216,  215,  214,  213,  211,  210,  209,  208,  207,
-      206,  203,  202,  201,  200,  199,  198,  195,  194,  193,
-
-      190,  189,  188,  187,  186,  185,  184,  179,  178,  177,
-      176,  173,  172,  171,  170,  169,  168,  167,  166,  163,
-      162,  161,  160,  159,  158,  157,  156,  155,  150,  133,
-      129,   98,   94,   91,   90,   76,   72,   71,   68,   66,
-       65,   64,   51,  550,    3,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-
-      550,  550,  550,  550
+       58,  534,   63,   63,   63,  142,  124,  124,  124,  219,
+      144,  145,   61,  122,  228,  220,  220,   58,  153,  138,
+      138,   60,   58,  364,  140,  140,  140,   61,  145,   61,
+      418,  223,  223,  418,   61,  224,  224,  224,  144,  145,
+      148,  148,  148,  264,   61,  533,  148,  148,  148,   61,
+
+      312,  313,  265,  224,  224,  224,  145,  225,  300,  225,
+      152,  229,  500,  548,  301,  301,  522,  358,  358,  359,
+      521,  350,  225,  224,  224,  224,  351,  520,  225,  292,
+      293,  293,  294,  352,  142,  358,  142,  398,  153,  519,
+      518,  295,  295,  295,  517,  293,  293,  365,  293,  142,
+      461,  462,  516,  399,  515,  142,  295,  295,  295,  514,
+      513,  463,  420,  293,  463,  420,  501,  296,  462,  501,
+      297,  461,  462,  298,  421,  421,  421,  299,  152,  415,
+      416,  416,  415,  468,  468,  469,  370,  370,  370,  462,
+      512,  417,  417,  417,  370,  370,  370,  370,  416,  461,
+
+      462,  468,  497,  498,  511,  371,  153,  370,  370,  370,
+      370,  370,  370,  429,  429,  429,  505,  462,  510,  505,
+      498,  429,  429,  429,  429,  506,  500,  495,  415,  416,
+      416,  415,  497,  498,  429,  429,  429,  429,  429,  429,
+      459,  459,  459,  415,  416,  416,  415,  416,  494,  530,
+      498,  420,  530,  493,  420,  417,  417,  417,  542,  492,
+      491,  542,  416,  421,  421,  421,  464,  465,  465,  464,
+      466,  416,  416,  464,  465,  465,  464,  466,  421,  421,
+      421,  490,  459,  459,  459,  465,  474,  474,  474,  416,
+      489,  488,  465,  487,  474,  474,  474,  474,  486,  497,
+
+      498,  502,  503,  503,  502,  465,  465,  474,  474,  474,
+      474,  474,  474,  504,  504,  504,  507,  498,  485,  508,
+      503,  524,  525,  465,  502,  503,  503,  502,  509,  509,
+      509,  484,  502,  503,  503,  502,  526,  526,  526,  525,
+      528,  529,  483,  503,  504,  504,  504,  507,  482,  481,
+      508,  503,  507,  480,  479,  508,  531,  478,  529,  509,
+      509,  509,  532,  477,  509,  509,  509,  524,  525,  524,
+      525,  509,  509,  509,  528,  529,  476,  503,  503,  528,
+      529,  538,  539,  538,  539,  525,  371,  525,  526,  526,
+      526,  473,  529,  538,  539,  503,  472,  529,  471,  539,
+
+      470,  539,  544,  544,  546,  547,  546,  547,  546,  547,
+      424,  539,  467,  458,  457,  456,  455,  454,  453,  452,
+      544,  451,  547,  450,  547,  449,  547,   47,   47,   47,
+       47,   47,   47,   47,   47,   50,  448,   50,   50,   50,
+       50,   50,   50,   67,   67,   67,   67,  132,  132,  447,
+      446,  132,  132,  134,  445,  134,  134,  134,  134,  134,
+      134,  143,  143,  143,  143,  143,  143,  143,  143,  149,
+      444,  149,  151,  151,  151,  151,  151,  151,  151,  151,
+      154,  443,  154,  154,  154,  154,  154,  154,  221,  221,
+      442,  221,  222,  441,  222,  286,  286,  286,  286,  286,
+
+      286,  286,  286,  303,  303,  440,  303,  305,  439,  305,
+      306,  438,  306,  372,  372,  437,  372,  423,  423,  423,
+      423,  423,  423,  423,  423,  430,  430,  436,  430,  460,
+      460,  460,  460,  460,  460,  460,  460,  475,  475,  435,
+      475,  496,  496,  496,  496,  496,  496,  496,  496,  499,
+      499,  499,  499,  499,  499,  499,  499,  523,  523,  523,
+      523,  523,  523,  523,  523,  527,  527,  527,  527,  527,
+      527,  527,  527,  537,  537,  537,  537,  537,  537,  537,
+      537,  540,  540,  540,  540,  540,  540,  540,  540,  545,
+      545,  545,  545,  545,  545,  545,  545,  434,  433,  432,
+
+      431,  371,  428,  427,  426,  425,  364,  424,  422,  419,
+      414,  413,  412,  411,  410,  409,  408,  407,  406,  405,
+      404,  403,  402,  401,  400,  397,  396,  395,  394,  393,
+      392,  391,  390,  389,  388,  387,  386,  385,  384,  383,
+      382,  381,  380,  379,  378,  377,  376,  375,  374,  373,
+      371,  302,  300,  369,  368,  367,  366,  548,  363,  362,
+      361,  360,  287,  357,  356,  355,  354,  353,  349,  348,
+      347,  346,  345,  344,  343,  342,  341,  340,  339,  338,
+      337,  336,  335,  334,  333,  332,  331,  330,  329,  328,
+      327,  326,  325,  324,  323,  322,  321,  320,  319,  318,
+
+      317,  316,  315,  314,  311,  310,  309,  308,  307,  304,
+      302,  291,  290,  289,  288,  211,  287,  285,  284,  283,
+      282,  281,  280,  279,  278,  277,  276,  275,  272,  271,
+      270,  269,  268,  267,  266,  263,  262,  261,  260,  259,
+      258,  257,  256,  255,  254,  253,  252,  251,  250,  249,
+      248,  247,  246,  245,  244,  243,  242,  241,  240,  237,
+      236,  235,  234,  233,  232,  231,  230,  228,  227,  226,
+      218,  218,  218,  217,  216,  215,  214,  213,  211,  210,
+      209,  208,  207,  206,  203,  202,  201,  200,  199,  198,
+      195,  194,  193,  190,  189,  188,  187,  186,  185,  184,
+
+      179,  178,  177,  176,  173,  172,  171,  170,  169,  168,
+      167,  166,  163,  162,  161,  160,  159,  158,  157,  156,
+      155,  150,  133,  129,   98,   94,   91,   90,   76,   72,
+       71,   68,   66,   65,   64,   51,  548,    3,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548
 
     } ;
 
-static tao_yyconst short int tao_yy_chk[1105] =
+static tao_yyconst short int tao_yy_chk[1098] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -659,10 +657,10 @@ static tao_yyconst short int tao_yy_chk[1105] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-        5,    8,    2,    5,    2,   10,  542,   10,   10,   10,
+        5,    8,    2,    5,    2,   10,  540,   10,   10,   10,
        11,   11,   11,   12,   20,   26,   20,   12,    2,   13,
        23,   13,   13,   13,   14,   26,   14,   14,   14,    8,
-       25,   13,   23,  537,   27,   27,   14,   25,   23,   33,
+       25,   13,   23,  535,   27,   27,   14,   25,   23,   33,
 
        13,   28,   47,   27,   25,   27,   13,   31,   31,   28,
        25,   14,   28,   33,   36,   35,   37,   36,   40,   33,
@@ -675,106 +673,104 @@ static tao_yyconst short int tao_yy_chk[1105] =
        93,   53,  113,   44,  102,   93,   44,   88,  106,   44,
        53,  106,  113,   44,  199,   54,   53,   54,   54,   54,
 
-      119,  131,  534,  119,   51,  119,  199,   54,   59,  132,
+      119,  131,  532,  119,   51,  119,  199,   54,   59,  132,
        59,   59,   59,  121,   60,   53,   60,   60,   60,  121,
-       59,  533,   54,   55,   55,   55,   60,  130,  523,  131,
-      130,  130,  522,   55,   55,   59,   55,  132,   61,   61,
+       59,  531,   54,   55,   55,   55,   60,  130,  521,  131,
+      130,  130,  520,   55,   55,   59,   55,  132,   61,   61,
       151,   60,   61,   61,   61,  124,  124,  124,   55,   55,
-       63,  519,   63,   63,   63,   55,  124,  124,  124,  136,
+       63,  517,   63,   63,   63,   55,  124,  124,  124,  136,
       143,  143,   63,  124,  155,  136,  136,  138,  151,  138,
-      138,  138,  140,  512,  140,  140,  140,   63,  143,  138,
-      152,  141,  141,  152,  140,  141,  141,  141,  145,  145,
-      147,  147,  147,  191,  138,  296,  148,  148,  148,  140,
-
-      362,  227,  191,  362,  227,  152,  145,  148,  220,  148,
-      501,  155,  240,  240,  220,  220,  223,  223,  223,  289,
-      289,  289,  148,  224,  224,  224,  227,  497,  148,  217,
-      217,  217,  217,  280,  224,  296,  224,  289,  280,  495,
-      341,  217,  217,  217,  494,  280,  420,  420,  217,  224,
-      297,  297,  297,  492,  421,  224,  341,  421,  426,  426,
-      426,  297,  297,  297,  420,  489,  469,  217,  297,  469,
-      217,  364,  472,  217,  364,  472,  426,  217,  307,  361,
-      361,  361,  361,  364,  364,  364,  307,  307,  307,  487,
-      476,  361,  361,  361,  307,  307,  307,  307,  361,  462,
-
-      462,  464,  464,  485,  484,  483,  307,  307,  307,  307,
-      307,  307,  307,  372,  372,  372,  511,  462,  476,  464,
-      482,  372,  372,  372,  372,  511,  511,  511,  417,  417,
-      417,  417,  465,  465,  372,  372,  372,  372,  372,  372,
-      417,  417,  417,  419,  419,  419,  419,  417,  480,  508,
-      465,  422,  508,  479,  422,  419,  419,  419,  535,  477,
-      475,  535,  419,  422,  422,  422,  423,  423,  423,  423,
-      423,  461,  461,  466,  466,  466,  466,  466,  423,  423,
-      423,  473,  461,  461,  461,  423,  431,  431,  431,  461,
-      468,  459,  466,  458,  431,  431,  431,  431,  457,  498,
-
-      498,  471,  471,  471,  471,  500,  500,  431,  431,  431,
-      431,  431,  431,  471,  471,  471,  474,  498,  455,  474,
-      471,  502,  502,  500,  503,  503,  454,  453,  474,  474,
-      474,  504,  504,  504,  504,  506,  506,  506,  506,  502,
-      507,  507,  503,  504,  504,  504,  452,  506,  506,  506,
-      504,  451,  509,  450,  506,  509,  510,  449,  507,  510,
-      510,  525,  525,  447,  509,  509,  509,  446,  510,  510,
-      510,  527,  527,  528,  528,  529,  529,  531,  531,  525,
-      532,  532,  539,  539,  528,  528,  528,  541,  541,  527,
-      444,  528,  443,  529,  441,  531,  543,  543,  532,  440,
-
-      539,  544,  544,  547,  547,  541,  549,  549,  437,  436,
-      434,  433,  432,  430,  543,  429,  428,  427,  425,  544,
-      424,  547,  416,  415,  549,  551,  551,  551,  551,  551,
-      551,  551,  551,  552,  414,  552,  552,  552,  552,  552,
-      552,  553,  553,  553,  553,  554,  554,  413,  411,  554,
-      554,  555,  410,  555,  555,  555,  555,  555,  555,  556,
-      556,  556,  556,  556,  556,  556,  556,  557,  408,  557,
-      558,  558,  558,  558,  558,  558,  558,  558,  559,  405,
-      559,  559,  559,  559,  559,  559,  560,  560,  404,  560,
-      561,  403,  561,  562,  562,  562,  562,  562,  562,  562,
-
-      562,  563,  563,  401,  563,  564,  399,  564,  565,  398,
-      565,  566,  566,  397,  566,  567,  567,  567,  567,  567,
-      567,  567,  567,  568,  568,  394,  568,  569,  569,  569,
-      569,  569,  569,  569,  569,  570,  570,  392,  570,  571,
-      571,  571,  571,  571,  571,  571,  571,  572,  572,  572,
-      572,  572,  572,  572,  572,  573,  573,  573,  573,  573,
-      573,  573,  573,  574,  574,  574,  574,  574,  574,  574,
-      574,  575,  575,  575,  575,  575,  575,  575,  575,  576,
-      576,  576,  576,  576,  576,  576,  576,  577,  577,  577,
-      577,  577,  577,  577,  577,  391,  389,  387,  386,  385,
-
-      383,  381,  380,  379,  378,  377,  376,  374,  371,  370,
-      369,  368,  367,  366,  365,  363,  359,  357,  356,  354,
-      353,  352,  351,  350,  349,  348,  347,  345,  344,  343,
-      342,  340,  339,  338,  337,  335,  334,  333,  332,  330,
-      328,  327,  324,  323,  322,  321,  319,  318,  317,  316,
-      315,  313,  312,  311,  310,  309,  308,  305,  303,  301,
-      300,  299,  298,  294,  293,  292,  291,  290,  288,  287,
-      286,  284,  282,  281,  279,  278,  277,  276,  275,  274,
-      273,  272,  271,  270,  269,  268,  267,  266,  265,  264,
-      263,  262,  261,  260,  258,  257,  256,  255,  253,  252,
-
-      251,  250,  249,  248,  247,  245,  244,  243,  242,  241,
-      239,  236,  235,  234,  232,  228,  226,  221,  216,  215,
-      214,  213,  212,  211,  210,  209,  208,  207,  206,  205,
-      204,  203,  202,  201,  200,  198,  197,  196,  195,  194,
-      193,  192,  189,  188,  187,  186,  185,  184,  183,  182,
-      181,  180,  179,  178,  177,  176,  175,  174,  173,  172,
-      171,  170,  169,  168,  167,  166,  164,  163,  162,  161,
-      160,  158,  157,  156,  154,  153,  150,  137,  135,  134,
-      129,  128,  127,  126,  125,  123,  118,  117,  116,  115,
-      114,  112,  111,  110,  109,  108,  107,  105,  104,  103,
-
-      101,  100,   99,   98,   97,   96,   95,   92,   91,   90,
-       89,   87,   86,   85,   84,   83,   82,   81,   80,   78,
-       77,   76,   75,   74,   73,   72,   71,   70,   68,   50,
-       45,   34,   32,   30,   29,   24,   22,   21,   19,   17,
-       16,   15,    9,    3,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-      550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
-
-      550,  550,  550,  550
+      138,  138,  140,  294,  140,  140,  140,   63,  143,  138,
+      360,  141,  141,  360,  140,  141,  141,  141,  145,  145,
+      147,  147,  147,  191,  138,  510,  148,  148,  148,  140,
+
+      238,  238,  191,  223,  223,  223,  145,  148,  220,  148,
+      474,  155,  499,  294,  220,  220,  495,  287,  287,  287,
+      493,  278,  148,  224,  224,  224,  278,  492,  148,  217,
+      217,  217,  217,  278,  224,  287,  224,  339,  474,  490,
+      487,  217,  217,  217,  485,  295,  295,  295,  217,  224,
+      418,  418,  483,  339,  482,  224,  295,  295,  295,  481,
+      480,  419,  362,  295,  419,  362,  467,  217,  418,  467,
+      217,  460,  460,  217,  362,  362,  362,  217,  305,  359,
+      359,  359,  359,  424,  424,  424,  305,  305,  305,  460,
+      478,  359,  359,  359,  305,  305,  305,  305,  359,  462,
+
+      462,  424,  463,  463,  477,  475,  305,  305,  305,  305,
+      305,  305,  305,  370,  370,  370,  470,  462,  473,  470,
+      463,  370,  370,  370,  370,  471,  466,  457,  415,  415,
+      415,  415,  496,  496,  370,  370,  370,  370,  370,  370,
+      415,  415,  415,  417,  417,  417,  417,  415,  456,  506,
+      496,  420,  506,  455,  420,  417,  417,  417,  533,  453,
+      452,  533,  417,  420,  420,  420,  421,  421,  421,  421,
+      421,  459,  459,  464,  464,  464,  464,  464,  421,  421,
+      421,  451,  459,  459,  459,  421,  429,  429,  429,  459,
+      450,  449,  464,  448,  429,  429,  429,  429,  447,  498,
+
+      498,  469,  469,  469,  469,  500,  500,  429,  429,  429,
+      429,  429,  429,  469,  469,  469,  472,  498,  445,  472,
+      469,  501,  501,  500,  502,  502,  502,  502,  472,  472,
+      472,  444,  504,  504,  504,  504,  502,  502,  502,  501,
+      505,  505,  442,  502,  504,  504,  504,  507,  441,  439,
+      507,  504,  508,  438,  435,  508,  508,  434,  505,  507,
+      507,  507,  509,  432,  508,  508,  508,  523,  523,  525,
+      525,  509,  509,  509,  527,  527,  431,  526,  526,  529,
+      529,  530,  530,  537,  537,  523,  430,  525,  526,  526,
+      526,  428,  527,  539,  539,  526,  427,  529,  426,  530,
+
+      425,  537,  541,  541,  542,  542,  545,  545,  547,  547,
+      423,  539,  422,  414,  413,  412,  411,  409,  408,  406,
+      541,  403,  542,  402,  545,  401,  547,  549,  549,  549,
+      549,  549,  549,  549,  549,  550,  399,  550,  550,  550,
+      550,  550,  550,  551,  551,  551,  551,  552,  552,  397,
+      396,  552,  552,  553,  395,  553,  553,  553,  553,  553,
+      553,  554,  554,  554,  554,  554,  554,  554,  554,  555,
+      392,  555,  556,  556,  556,  556,  556,  556,  556,  556,
+      557,  390,  557,  557,  557,  557,  557,  557,  558,  558,
+      389,  558,  559,  387,  559,  560,  560,  560,  560,  560,
+
+      560,  560,  560,  561,  561,  385,  561,  562,  384,  562,
+      563,  383,  563,  564,  564,  381,  564,  565,  565,  565,
+      565,  565,  565,  565,  565,  566,  566,  379,  566,  567,
+      567,  567,  567,  567,  567,  567,  567,  568,  568,  378,
+      568,  569,  569,  569,  569,  569,  569,  569,  569,  570,
+      570,  570,  570,  570,  570,  570,  570,  571,  571,  571,
+      571,  571,  571,  571,  571,  572,  572,  572,  572,  572,
+      572,  572,  572,  573,  573,  573,  573,  573,  573,  573,
+      573,  574,  574,  574,  574,  574,  574,  574,  574,  575,
+      575,  575,  575,  575,  575,  575,  575,  377,  376,  375,
+
+      374,  372,  369,  368,  367,  366,  365,  364,  363,  361,
+      357,  355,  354,  352,  351,  350,  349,  348,  347,  346,
+      345,  343,  342,  341,  340,  338,  337,  336,  335,  333,
+      332,  331,  330,  328,  326,  325,  322,  321,  320,  319,
+      317,  316,  315,  314,  313,  311,  310,  309,  308,  307,
+      306,  303,  301,  299,  298,  297,  296,  292,  291,  290,
+      289,  288,  286,  285,  284,  282,  280,  279,  277,  276,
+      275,  274,  273,  272,  271,  270,  269,  268,  267,  266,
+      265,  264,  263,  262,  261,  260,  259,  258,  256,  255,
+      254,  253,  251,  250,  249,  248,  247,  246,  245,  243,
+
+      242,  241,  240,  239,  237,  234,  233,  232,  230,  226,
+      221,  216,  215,  214,  213,  212,  211,  210,  209,  208,
+      207,  206,  205,  204,  203,  202,  201,  200,  198,  197,
+      196,  195,  194,  193,  192,  189,  188,  187,  186,  185,
+      184,  183,  182,  181,  180,  179,  178,  177,  176,  175,
+      174,  173,  172,  171,  170,  169,  168,  167,  166,  164,
+      163,  162,  161,  160,  158,  157,  156,  154,  153,  150,
+      137,  135,  134,  129,  128,  127,  126,  125,  123,  118,
+      117,  116,  115,  114,  112,  111,  110,  109,  108,  107,
+      105,  104,  103,  101,  100,   99,   98,   97,   96,   95,
+
+       92,   91,   90,   89,   87,   86,   85,   84,   83,   82,
+       81,   80,   78,   77,   76,   75,   74,   73,   72,   71,
+       70,   68,   50,   45,   34,   32,   30,   29,   24,   22,
+       21,   19,   17,   16,   15,    9,    3,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  548,  548,  548,  548,  548
 
     } ;
 
@@ -1116,13 +1112,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 >= 551 )
+                                if ( tao_yy_current_state >= 549 )
                                         tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
                                 }
                         tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
                         ++tao_yy_cp;
                         }
-                while ( tao_yy_current_state != 550 );
+                while ( tao_yy_base[tao_yy_current_state] != 1038 );
 
 tao_yy_find_action:
                 tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -1972,7 +1968,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 >= 551 )
+                        if ( tao_yy_current_state >= 549 )
                                 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];
@@ -2007,11 +2003,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 >= 551 )
+                if ( tao_yy_current_state >= 549 )
                         tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
                 }
         tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-        tao_yy_is_jam = (tao_yy_current_state == 550);
+        tao_yy_is_jam = (tao_yy_current_state == 548);
 
         return tao_yy_is_jam ? 0 : tao_yy_current_state;
         }
@@ -3052,72 +3048,72 @@ idl_escape_reader(
 {
   if (str[0] != '\\')
     {
-            return str[0];
+	    return str[0];
     }
 
   switch (str[1])
   {
     case 'n':
-            return '\n';
+	    return '\n';
     case 't':
-            return '\t';
+	    return '\t';
     case 'v':
-            return '\v';
+	    return '\v';
     case 'b':
-            return '\b';
+	    return '\b';
     case 'r':
-            return '\r';
+	    return '\r';
     case 'f':
-            return '\f';
+	    return '\f';
     case 'a':
-            return '\a';
+	    return '\a';
     case '\\':
-            return '\\';
+	    return '\\';
     case '\?':
-            return '?';
+	    return '?';
     case '\'':
-            return '\'';
+	    return '\'';
     case '"':
-            return '"';
+	    return '"';
     case 'x':
-            {
-              int i;
+	    {
+	      int i;
 
-              // hex value
-              for (i = 2; str[i] != '\0' && isxdigit(str[i]); ++i)
+	      // hex value
+	      for (i = 2; str[i] != '\0' && isxdigit(str[i]); ++i)
           {
-                        continue;
-                }
-
-              char save = str[i];
-              str[i] = '\0';
-              char out = (char)idl_atoui(&str[2], 16);
-              str[i] = save;
-              return out;
-            }
-            ACE_NOTREACHED (break;)
+		        continue;
+	        }
+
+	      char save = str[i];
+	      str[i] = '\0';
+	      char out = (char)idl_atoui(&str[2], 16);
+	      str[i] = save;
+	      return out;
+	    }
+	    ACE_NOTREACHED (break;)
     default:
-            // check for octal value
-            if (str[1] >= '0' && str[1] <= '7')
+	    // check for octal value
+	    if (str[1] >= '0' && str[1] <= '7')
         {
-                int i;
+ 	        int i;
 
-                for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i)
+	        for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i)
             {
-                          continue;
-                  }
-
-                char save = str[i];
-                str[i] = '\0';
-                char out = (char)idl_atoui(&str[1], 8);
-                str[i] = save;
-                return out;
-              }
+		          continue;
+	          }
+
+	        char save = str[i];
+	        str[i] = '\0';
+	        char out = (char)idl_atoui(&str[1], 8);
+	        str[i] = save;
+	        return out;
+	      }
       else
         {
-                return str[1] - 'a';
-              }
-            ACE_NOTREACHED  (break;)
+	        return str[1] - 'a';
+	      }
+	    ACE_NOTREACHED  (break;)
   }
 }
 /*
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
index 652a0a770c8..a15d85b93f6 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
@@ -1,3989 +1,140 @@
---- lex.yy.cpp.new	2004-08-27 21:34:13.000000000 -0500
-+++ lex.yy.cpp	2004-08-27 21:53:40.000000000 -0500
-@@ -1,369 +1,290 @@
--lex -L -t fe/idl.ll
--
--#line 3 "<stdout>"
--
--#define  YY_INT_ALIGNED short int
--
- /* A lexical scanner generated by flex */
- 
-+/* Scanner skeleton version:
-+ * $Id$
-+ */
-+
- #define FLEX_SCANNER
--#define YY_FLEX_MAJOR_VERSION 2
--#define YY_FLEX_MINOR_VERSION 5
--#define YY_FLEX_SUBMINOR_VERSION 31
--#if YY_FLEX_SUBMINOR_VERSION > 0
--#define FLEX_BETA
--#endif
-+#define TAO_YY_FLEX_MAJOR_VERSION 2
-+#define TAO_YY_FLEX_MINOR_VERSION 5
- 
--/* First, we deal with  platform-specific or compiler-specific issues. */
- 
--/* begin standard C headers. */
--#include <stdio.h>
--#include <string.h>
--#include <errno.h>
--#include <stdlib.h>
- 
--/* end standard C headers. */
-+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-+#ifdef c_plusplus
-+#ifndef __cplusplus
-+#define __cplusplus
-+#endif
-+#endif
- 
--/* flex integer type definitions */
- 
--#ifndef FLEXINT_H
--#define FLEXINT_H
-+#ifdef __cplusplus
- 
--/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-+#include "ace/os_include/os_stdio.h"
-+#include "ace/os_include/os_ctype.h"
- 
--#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
--#include <inttypes.h>
--typedef int8_t flex_int8_t;
--typedef uint8_t flex_uint8_t;
--typedef int16_t flex_int16_t;
--typedef uint16_t flex_uint16_t;
--typedef int32_t flex_int32_t;
--typedef uint32_t flex_uint32_t;
--#else
--typedef signed char flex_int8_t;
--typedef short int flex_int16_t;
--typedef int flex_int32_t;
--typedef unsigned char flex_uint8_t; 
--typedef unsigned short int flex_uint16_t;
--typedef unsigned int flex_uint32_t;
--#endif /* ! C99 */
-+/* Use prototypes in function declarations. */
-+#define TAO_YY_USE_PROTOS
- 
--/* Limits of integral types. */
--#ifndef INT8_MIN
--#define INT8_MIN               (-128)
--#endif
--#ifndef INT16_MIN
--#define INT16_MIN              (-32767-1)
--#endif
--#ifndef INT32_MIN
--#define INT32_MIN              (-2147483647-1)
--#endif
--#ifndef INT8_MAX
--#define INT8_MAX               (127)
--#endif
--#ifndef INT16_MAX
--#define INT16_MAX              (32767)
--#endif
--#ifndef INT32_MAX
--#define INT32_MAX              (2147483647)
--#endif
--#ifndef UINT8_MAX
--#define UINT8_MAX              (255U)
--#endif
--#ifndef UINT16_MAX
--#define UINT16_MAX             (65535U)
--#endif
--#ifndef UINT32_MAX
--#define UINT32_MAX             (4294967295U)
--#endif
-+/* The "const" storage-class-modifier is valid. */
-+#define TAO_YY_USE_CONST
- 
--#endif /* ! FLEXINT_H */
-+#else   /* ! __cplusplus */
- 
--#ifdef __cplusplus
-+#ifdef __STDC__
- 
--/* The "const" storage-class-modifier is valid. */
--#define YY_USE_CONST
-+#define TAO_YY_USE_PROTOS
-+#define TAO_YY_USE_CONST
- 
--#else	/* ! __cplusplus */
-+#endif  /* __STDC__ */
-+#endif  /* ! __cplusplus */
+--- lex.yy.cpp	Sat Jul 27 17:02:23 2002
++++ lex.yy.cpp.new	Sat Jul 27 17:02:00 2002
+@@ -31,5 +28,5 @@
+ #else	/* ! __cplusplus */
  
 -#if __STDC__
-+#ifdef __TURBOC__
-+ #pragma warn -rch
-+ #pragma warn -use
-+#define TAO_YY_USE_CONST
-+#define TAO_YY_USE_PROTOS
-+#endif
- 
--#define YY_USE_CONST
-+#ifdef TAO_YY_USE_CONST
-+#define tao_yyconst const
-+#else
-+#define tao_yyconst
-+#endif
- 
--#endif	/* __STDC__ */
--#endif	/* ! __cplusplus */
- 
--#ifdef YY_USE_CONST
--#define yyconst const
-+#ifdef TAO_YY_USE_PROTOS
-+#define TAO_YY_PROTO(proto) proto
- #else
--#define yyconst
-+#define TAO_YY_PROTO(proto) ()
- #endif
- 
- /* Returned upon end-of-file. */
--#define YY_NULL 0
-+#define TAO_YY_NULL 0
- 
- /* Promotes a possibly negative, possibly signed char to an unsigned
-  * integer for use as an array index.  If the signed char is negative,
-  * we want to instead treat it as an 8-bit unsigned char, hence the
-  * double cast.
-  */
--#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-+#define TAO_YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
- 
- /* Enter a start condition.  This macro really ought to take a parameter,
-  * but we do it the disgusting crufty way forced on us by the ()-less
-  * definition of BEGIN.
-  */
--#define BEGIN (yy_start) = 1 + 2 *
-+#define BEGIN tao_yy_start = 1 + 2 *
- 
- /* Translate the current start state into a value that can be later handed
-- * to BEGIN to return to the state.  The YYSTATE alias is for lex
-+ * to BEGIN to return to the state.  The TAO_YYSTATE alias is for lex
-  * compatibility.
-  */
--#define YY_START (((yy_start) - 1) / 2)
--#define YYSTATE YY_START
-+#define TAO_YY_START ((tao_yy_start - 1) / 2)
-+#define TAO_YYSTATE TAO_YY_START
- 
- /* Action number for EOF rule of a given start state. */
--#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-+#define TAO_YY_STATE_EOF(state) (TAO_YY_END_OF_BUFFER + state + 1)
- 
- /* Special action meaning "start processing a new file". */
--#define YY_NEW_FILE yyrestart(yyin  )
-+#define TAO_YY_NEW_FILE tao_yyrestart( tao_yyin )
- 
--#define YY_END_OF_BUFFER_CHAR 0
-+#define TAO_YY_END_OF_BUFFER_CHAR 0
- 
- /* Size of default input buffer. */
--#ifndef YY_BUF_SIZE
--#define YY_BUF_SIZE 16384
--#endif
--
--#ifndef YY_TYPEDEF_YY_BUFFER_STATE
--#define YY_TYPEDEF_YY_BUFFER_STATE
--typedef struct yy_buffer_state *YY_BUFFER_STATE;
--#endif
-+#define TAO_YY_BUF_SIZE 16384
- 
--extern int yyleng;
-+typedef struct tao_yy_buffer_state *TAO_YY_BUFFER_STATE;
- 
--extern FILE *yyin, *yyout;
-+extern int tao_yyleng;
-+extern FILE *tao_yyin, *tao_yyout;
- 
- #define EOB_ACT_CONTINUE_SCAN 0
- #define EOB_ACT_END_OF_FILE 1
- #define EOB_ACT_LAST_MATCH 2
- 
--    #define YY_LESS_LINENO(n)
--    
--/* Return all but the first "n" matched characters back to the input stream. */
--#define yyless(n) \
--	do \
--		{ \
--		/* Undo effects of setting up yytext. */ \
--        int yyless_macro_arg = (n); \
--        YY_LESS_LINENO(yyless_macro_arg);\
--		*yy_cp = (yy_hold_char); \
--		YY_RESTORE_YY_MORE_OFFSET \
--		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
--		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
--		} \
--	while ( 0 )
-+/* The funky do-while in the following #define is used to turn the definition
-+ * int a single C statement (which needs a semi-colon terminator).  This
-+ * avoids problems with code like:
-+ *
-+ *      if ( condition_holds )
-+ *              tao_yyless( 5 );
-+ *      else
-+ *              do_something_else();
-+ *
-+ * Prior to using the do-while the compiler would get upset at the
-+ * "else" because it interpreted the "if" statement as being all
-+ * done when it reached the ';' after the tao_yyless() call.
-+ */
-+
-+/* Return all but the first 'n' matched characters back to the input stream. */
-+
-+#define tao_yyless(n) \
-+        do \
-+                { \
-+                /* Undo effects of setting up tao_yytext. */ \
-+                *tao_yy_cp = tao_yy_hold_char; \
-+                TAO_YY_RESTORE_TAO_YY_MORE_OFFSET \
-+                tao_yy_c_buf_p = tao_yy_cp = tao_yy_bp + n - TAO_YY_MORE_ADJ; \
-+                TAO_YY_DO_BEFORE_ACTION; /* set up tao_yytext again */ \
-+                } \
-+        while ( 0 )
- 
--#define unput(c) yyunput( c, (yytext_ptr)  )
-+#define unput(c) tao_yyunput( c, tao_yytext_ptr )
- 
- /* The following is because we cannot portably get our hands on size_t
-  * (without autoconf's help, which isn't available because we want
-  * flex-generated scanners to compile on their own).
-  */
-+typedef unsigned int tao_yy_size_t;
- 
--#ifndef YY_TYPEDEF_YY_SIZE_T
--#define YY_TYPEDEF_YY_SIZE_T
--typedef unsigned int yy_size_t;
--#endif
--
--#ifndef YY_STRUCT_YY_BUFFER_STATE
--#define YY_STRUCT_YY_BUFFER_STATE
--struct yy_buffer_state
--	{
--	FILE *yy_input_file;
--
--	char *yy_ch_buf;		/* input buffer */
--	char *yy_buf_pos;		/* current position in input buffer */
--
--	/* Size of input buffer in bytes, not including room for EOB
--	 * characters.
--	 */
--	yy_size_t yy_buf_size;
--
--	/* Number of characters read into yy_ch_buf, not including EOB
--	 * characters.
--	 */
--	int yy_n_chars;
--
--	/* Whether we "own" the buffer - i.e., we know we created it,
--	 * and can realloc() it to grow it, and should free() it to
--	 * delete it.
--	 */
--	int yy_is_our_buffer;
--
--	/* Whether this is an "interactive" input source; if so, and
--	 * if we're using stdio for input, then we want to use getc()
--	 * instead of fread(), to make sure we stop fetching input after
--	 * each newline.
--	 */
--	int yy_is_interactive;
--
--	/* Whether we're considered to be at the beginning of a line.
--	 * If so, '^' rules will be active on the next match, otherwise
--	 * not.
--	 */
--	int yy_at_bol;
--
--    int yy_bs_lineno; /**< The line count. */
--    int yy_bs_column; /**< The column count. */
--    
--	/* Whether to try to fill the input buffer when we reach the
--	 * end of it.
--	 */
--	int yy_fill_buffer;
--
--	int yy_buffer_status;
--
--#define YY_BUFFER_NEW 0
--#define YY_BUFFER_NORMAL 1
--	/* When an EOF's been seen but there's still some text to process
--	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
--	 * shouldn't try reading from the input source any more.  We might
--	 * still have a bunch of tokens to match, though, because of
--	 * possible backing-up.
--	 *
--	 * When we actually see the EOF, we change the status to "new"
--	 * (via yyrestart()), so that the user can continue scanning by
--	 * just pointing yyin at a new input file.
--	 */
--#define YY_BUFFER_EOF_PENDING 2
--
--	};
--#endif /* !YY_STRUCT_YY_BUFFER_STATE */
--
--/* Stack of input buffers. */
--static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
--static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
--static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
- 
--/* We provide macros for accessing buffer states in case in the
-- * future we want to put the buffer states in a more general
-- * "scanner state".
-- *
-- * Returns the top of the stack, or NULL.
-- */
--#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
--                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
--                          : NULL)
-+struct tao_yy_buffer_state
-+        {
-+        FILE *tao_yy_input_file;
- 
--/* Same as previous macro, but useful when we know that the buffer stack is not
-- * NULL or when we need an lvalue. For internal use only.
-- */
--#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-+        char *tao_yy_ch_buf;            /* input buffer */
-+        char *tao_yy_buf_pos;           /* current position in input buffer */
- 
--/* yy_hold_char holds the character lost when yytext is formed. */
--static char yy_hold_char;
--static int yy_n_chars;		/* number of characters read into yy_ch_buf */
--int yyleng;
-+        /* Size of input buffer in bytes, not including room for EOB
-+         * characters.
-+         */
-+        tao_yy_size_t tao_yy_buf_size;
- 
--/* Points to current character in buffer. */
--static char *yy_c_buf_p = (char *) 0;
--static int yy_init = 1;		/* whether we need to initialize */
--static int yy_start = 0;	/* start state number */
-+        /* Number of characters read into tao_yy_ch_buf, not including EOB
-+         * characters.
-+         */
-+        int tao_yy_n_chars;
-+
-+        /* Whether we "own" the buffer - i.e., we know we created it,
-+         * and can realloc() it to grow it, and should free() it to
-+         * delete it.
-+         */
-+        int tao_yy_is_our_buffer;
-+
-+        /* Whether this is an "interactive" input source; if so, and
-+         * if we're using stdio for input, then we want to use getc()
-+         * instead of fread(), to make sure we stop fetching input after
-+         * each newline.
-+         */
-+        int tao_yy_is_interactive;
-+
-+        /* Whether we're considered to be at the beginning of a line.
-+         * If so, '^' rules will be active on the next match, otherwise
-+         * not.
-+         */
-+        int tao_yy_at_bol;
-+
-+        /* Whether to try to fill the input buffer when we reach the
-+         * end of it.
-+         */
-+        int tao_yy_fill_buffer;
-+
-+        int tao_yy_buffer_status;
-+#define TAO_YY_BUFFER_NEW 0
-+#define TAO_YY_BUFFER_NORMAL 1
-+        /* When an EOF's been seen but there's still some text to process
-+         * then we mark the buffer as TAO_YY_EOF_PENDING, to indicate that we
-+         * shouldn't try reading from the input source any more.  We might
-+         * still have a bunch of tokens to match, though, because of
-+         * possible backing-up.
-+         *
-+         * When we actually see the EOF, we change the status to "new"
-+         * (via tao_yyrestart()), so that the user can continue scanning by
-+         * just pointing tao_yyin at a new input file.
-+         */
-+#define TAO_YY_BUFFER_EOF_PENDING 2
-+        };
- 
--/* Flag which is used to allow yywrap()'s to do buffer switches
-- * instead of setting up a fresh yyin.  A bit of a hack ...
-+static TAO_YY_BUFFER_STATE tao_yy_current_buffer = 0;
-+
-+/* We provide macros for accessing buffer states in case in the
-+ * future we want to put the buffer states in a more general
-+ * "scanner state".
-  */
--static int yy_did_buffer_switch_on_eof;
-+#define TAO_YY_CURRENT_BUFFER tao_yy_current_buffer
- 
--void yyrestart (FILE *input_file  );
--void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
--YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
--void yy_delete_buffer (YY_BUFFER_STATE b  );
--void yy_flush_buffer (YY_BUFFER_STATE b  );
--void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
--void yypop_buffer_state (void );
- 
--static void yyensure_buffer_stack (void );
--static void yy_load_buffer_state (void );
--static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-+/* tao_yy_hold_char holds the character lost when tao_yytext is formed. */
-+static char tao_yy_hold_char;
- 
--#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-+static int tao_yy_n_chars;              /* number of characters read into tao_yy_ch_buf */
- 
--YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
--YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
--YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
- 
--void *yyalloc (yy_size_t  );
--void *yyrealloc (void *,yy_size_t  );
--void yyfree (void *  );
-+int tao_yyleng;
- 
--#define yy_new_buffer yy_create_buffer
-+/* Points to current character in buffer. */
-+static char *tao_yy_c_buf_p = (char *) 0;
-+static int tao_yy_init = 1;             /* whether we need to initialize */
-+static int tao_yy_start = 0;    /* start state number */
- 
--#define yy_set_interactive(is_interactive) \
--	{ \
--	if ( ! YY_CURRENT_BUFFER ){ \
--        yyensure_buffer_stack (); \
--		YY_CURRENT_BUFFER_LVALUE =    \
--            yy_create_buffer(yyin,YY_BUF_SIZE ); \
--	} \
--	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
--	}
-+/* Flag which is used to allow tao_yywrap()'s to do buffer switches
-+ * instead of setting up a fresh tao_yyin.  A bit of a hack ...
-+ */
-+static int tao_yy_did_buffer_switch_on_eof;
- 
--#define yy_set_bol(at_bol) \
--	{ \
--	if ( ! YY_CURRENT_BUFFER ){\
--        yyensure_buffer_stack (); \
--		YY_CURRENT_BUFFER_LVALUE =    \
--            yy_create_buffer(yyin,YY_BUF_SIZE ); \
--	} \
--	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
--	}
-+void tao_yyrestart TAO_YY_PROTO(( FILE *input_file ));
- 
--#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-+void tao_yy_switch_to_buffer TAO_YY_PROTO(( TAO_YY_BUFFER_STATE new_buffer ));
-+void tao_yy_load_buffer_state TAO_YY_PROTO(( void ));
-+TAO_YY_BUFFER_STATE tao_yy_create_buffer TAO_YY_PROTO(( FILE *file, int size ));
-+void tao_yy_delete_buffer TAO_YY_PROTO(( TAO_YY_BUFFER_STATE b ));
-+void tao_yy_init_buffer TAO_YY_PROTO(( TAO_YY_BUFFER_STATE b, FILE *file ));
-+void tao_yy_flush_buffer TAO_YY_PROTO(( TAO_YY_BUFFER_STATE b ));
-+#define TAO_YY_FLUSH_BUFFER tao_yy_flush_buffer( tao_yy_current_buffer )
- 
--/* Begin user sect3 */
-+TAO_YY_BUFFER_STATE tao_yy_scan_buffer TAO_YY_PROTO(( char *base, tao_yy_size_t size ));
-+TAO_YY_BUFFER_STATE tao_yy_scan_string TAO_YY_PROTO(( tao_yyconst char *tao_yy_str ));
-+TAO_YY_BUFFER_STATE tao_yy_scan_bytes TAO_YY_PROTO(( tao_yyconst char *bytes, int len ));
- 
--typedef unsigned char YY_CHAR;
-+static void *tao_yy_flex_alloc TAO_YY_PROTO(( tao_yy_size_t ));
-+static void *tao_yy_flex_realloc TAO_YY_PROTO(( void *, tao_yy_size_t ));
-+static void tao_yy_flex_free TAO_YY_PROTO(( void * ));
- 
--FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-+#define tao_yy_new_buffer tao_yy_create_buffer
- 
--typedef int yy_state_type;
-+#define tao_yy_set_interactive(is_interactive) \
-+        { \
-+        if ( ! tao_yy_current_buffer ) \
-+                tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE ); \
-+        tao_yy_current_buffer->tao_yy_is_interactive = is_interactive; \
-+        }
- 
--extern int yylineno;
-+#define tao_yy_set_bol(at_bol) \
-+        { \
-+        if ( ! tao_yy_current_buffer ) \
-+                tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE ); \
-+        tao_yy_current_buffer->tao_yy_at_bol = at_bol; \
-+        }
-+
-+#define TAO_YY_AT_BOL() (tao_yy_current_buffer->tao_yy_at_bol)
- 
--int yylineno = 1;
-+typedef unsigned char TAO_YY_CHAR;
-+FILE *tao_yyin = (FILE *) 0, *tao_yyout = (FILE *) 0;
-+typedef int tao_yy_state_type;
-+extern char tao_yytext[];
- 
--extern char yytext[];
- 
--static yy_state_type yy_get_previous_state (void );
--static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
--static int yy_get_next_buffer (void );
--static void yy_fatal_error (yyconst char msg[]  );
-+static tao_yy_state_type tao_yy_get_previous_state TAO_YY_PROTO(( void ));
-+static tao_yy_state_type tao_yy_try_NUL_trans TAO_YY_PROTO(( tao_yy_state_type current_state ));
-+static int tao_yy_get_next_buffer TAO_YY_PROTO(( void ));
-+static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] ));
- 
- /* Done after the current pattern has been matched and before the
-- * corresponding action - sets up yytext.
-+ * corresponding action - sets up tao_yytext.
-  */
--#define YY_DO_BEFORE_ACTION \
--	(yytext_ptr) = yy_bp; \
--	yyleng = (size_t) (yy_cp - yy_bp); \
--	(yy_hold_char) = *yy_cp; \
--	*yy_cp = '\0'; \
--	if ( yyleng >= YYLMAX ) \
--		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
--	yy_flex_strncpy( yytext, (yytext_ptr), yyleng + 1 ); \
--	(yy_c_buf_p) = yy_cp;
--
--#define YY_NUM_RULES 104
--#define YY_END_OF_BUFFER 105
--/* This struct is not used in this scanner,
--   but its presence is necessary. */
--struct yy_trans_info
--	{
--	flex_int32_t yy_verify;
--	flex_int32_t yy_nxt;
--	};
--static yyconst flex_int16_t yy_accept[551] =
-+#define TAO_YY_DO_BEFORE_ACTION \
-+        tao_yytext_ptr = tao_yy_bp; \
-+        tao_yyleng = (int) (tao_yy_cp - tao_yy_bp); \
-+        tao_yy_hold_char = *tao_yy_cp; \
-+        *tao_yy_cp = '\0'; \
-+        if ( tao_yyleng >= TAO_YYLMAX ) \
-+                TAO_YY_FATAL_ERROR( "token too large, exceeds TAO_YYLMAX" ); \
-+        tao_yy_flex_strncpy( tao_yytext, tao_yytext_ptr, tao_yyleng + 1 ); \
-+        tao_yy_c_buf_p = tao_yy_cp;
-+
-+#define TAO_YY_NUM_RULES 104
-+#define TAO_YY_END_OF_BUFFER 105
-+static tao_yyconst short int tao_yy_accept[551] =
-     {   0,
-       101,  101,  105,  103,  101,  102,  102,  103,  103,  103,
-       103,  103,   76,   72,  103,  103,  103,   68,   68,   68,
-@@ -427,7 +348,7 @@
-        98,    0,    0,    0,   40,   94,    0,   86,   86,    0
-     } ;
- 
--static yyconst flex_int32_t yy_ec[256] =
-+static tao_yyconst int tao_yy_ec[256] =
-     {   0,
-         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-         1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
-@@ -459,7 +380,7 @@
-         1,    1,    1,    1,    1
-     } ;
- 
--static yyconst flex_int32_t yy_meta[60] =
-+static tao_yyconst int tao_yy_meta[60] =
-     {   0,
-         1,    1,    2,    1,    1,    3,    1,    4,    1,    1,
-         1,    1,    1,    5,    5,    5,    1,    1,    1,    1,
-@@ -469,7 +390,7 @@
-         6,    8,    6,    8,    6,    8,    6,    8,    6
-     } ;
- 
--static yyconst flex_int16_t yy_base[578] =
-+static tao_yyconst short int tao_yy_base[578] =
-     {   0,
-         0,   58, 1044, 1045,   59, 1045, 1045,   56, 1009,   54,
-        57,   65,   68,   73, 1025, 1023, 1020,    0, 1017,   69,
-@@ -536,7 +457,7 @@
-       739,  747,  755,  763,  771,  779,  787
-     } ;
- 
--static yyconst flex_int16_t yy_def[578] =
-+static tao_yyconst short int tao_yy_def[578] =
-     {   0,
-       550,    1,  550,  550,  550,  550,  550,  551,  552,  550,
-       550,  550,  550,  550,  550,  550,  550,  553,  553,  553,
-@@ -603,7 +524,7 @@
-       550,  550,  550,  550,  550,  550,  550
-     } ;
- 
--static yyconst flex_int16_t yy_nxt[1105] =
-+static tao_yyconst short int tao_yy_nxt[1105] =
-     {   0,
-         4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
-        10,   11,   12,   13,   14,   14,   15,   16,    4,   17,
-@@ -727,9 +648,10 @@
-       550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
- 
-       550,  550,  550,  550
-+
-     } ;
- 
--static yyconst flex_int16_t yy_chk[1105] =
-+static tao_yyconst short int tao_yy_chk[1105] =
-     {   0,
-         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-@@ -853,28 +775,27 @@
-       550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
- 
-       550,  550,  550,  550
--    } ;
- 
--static yy_state_type yy_last_accepting_state;
--static char *yy_last_accepting_cpos;
-+    } ;
- 
--extern int yy_flex_debug;
--int yy_flex_debug = 0;
-+static tao_yy_state_type tao_yy_last_accepting_state;
-+static char *tao_yy_last_accepting_cpos;
- 
- /* The intent behind this definition is that it'll catch
-  * any uses of REJECT which flex missed.
-  */
- #define REJECT reject_used_but_not_detected
--#define yymore() yymore_used_but_not_detected
--#define YY_MORE_ADJ 0
--#define YY_RESTORE_YY_MORE_OFFSET
--#ifndef YYLMAX
--#define YYLMAX 8192
-+#define tao_yymore() tao_yymore_used_but_not_detected
-+#define TAO_YY_MORE_ADJ 0
-+#define TAO_YY_RESTORE_TAO_YY_MORE_OFFSET
-+#ifndef TAO_YYLMAX
-+#define TAO_YYLMAX 8192
- #endif
- 
--char yytext[YYLMAX];
--char *yytext_ptr;
--/*  $Id$
-+char tao_yytext[TAO_YYLMAX];
-+char *tao_yytext_ptr;
-+#define INITIAL 0
-+/*  $Id$
- 
- COPYRIGHT
- 
-@@ -953,6 +874,7 @@
- #include "ast_expression.h"
- #include "ast_argument.h"
- #include "ast_operation.h"
-+#include "ast_root.h"
- #include "fe_interface_header.h"
- #include "global_extern.h"
- #include "fe_private.h"
-@@ -964,533 +886,541 @@
- static char             idl_escape_reader (char *);
- static double           idl_atof (char *);
- static long             idl_atoi (char *, long);
--static ACE_UINT64	idl_atoui (char *, long);
--static void		idl_parse_line_and_file (char *);
--static void		idl_store_pragma (char *);
-+static ACE_UINT64       idl_atoui (char *, long);
-+static void             idl_parse_line_and_file (char *);
-+static void             idl_store_pragma (char *);
- static char *           idl_get_pragma_string (char *);
- static idl_bool         idl_valid_version (char *);
- static AST_Decl *       idl_find_node (char *);
- 
- #if 0 /* defined (HPUX) */
--// HPUX has yytext typed to unsigned char *. We make sure here that
--// we'll always use char * static char* __yytext = (char*) yytext;
--// NOTE: This will not work under flex(1) were yytext is not a fixed
-+// HPUX has tao_yytext typed to unsigned char *. We make sure here that
-+// we'll always use char * static char* __tao_yytext = (char*) tao_yytext;
-+// NOTE: This will not work under flex(1) were tao_yytext is not a fixed
- // buffer, but a dynamically allocated one. This function should do
- // the trick for us.
--inline char *__yytext()
-+inline char *__tao_yytext()
- {
--  return (char *) yytext;
-+  return (char *) tao_yytext;
- }
--#define ace_yytext __yytext()
-+#define ace_tao_yytext __tao_yytext()
- #else
--#define ace_yytext yytext
-+#define ace_tao_yytext tao_yytext
- #endif /* 0 */
- 
- /* SO we don't choke on files that use \r\n */
--
--#define INITIAL 0
--
--#ifndef YY_NO_UNISTD_H
--/* Special case for "unistd.h", since it is non-ANSI. We include it way
-- * down here because we want the user's section 1 to have been scanned first.
-- * The user has a chance to override it with an option.
-- */
--#include <unistd.h>
--#endif
--
--#ifndef YY_EXTRA_TYPE
--#define YY_EXTRA_TYPE void *
--#endif
-+#define TAO_YY_NEVER_INTERACTIVE 1
- 
- /* Macros after this point can all be overridden by user definitions in
-  * section 1.
-  */
- 
--#ifndef YY_SKIP_YYWRAP
-+#ifndef TAO_YY_SKIP_TAO_YYWRAP
- #ifdef __cplusplus
--extern "C" int yywrap (void );
-+extern "C" int tao_yywrap TAO_YY_PROTO(( void ));
- #else
--extern int yywrap (void );
-+extern int tao_yywrap TAO_YY_PROTO(( void ));
- #endif
- #endif
- 
--    static void yyunput (int c,char *buf_ptr  );
--    
--#ifndef yytext_ptr
--static void yy_flex_strncpy (char *,yyconst char *,int );
-+#ifndef TAO_YY_NO_UNPUT
-+static void tao_yyunput TAO_YY_PROTO(( int c, char *buf_ptr ));
- #endif
++#ifdef __STDC__
  
--#ifdef YY_NEED_STRLEN
--static int yy_flex_strlen (yyconst char * );
-+#ifndef tao_yytext_ptr
-+static void tao_yy_flex_strncpy TAO_YY_PROTO(( char *, tao_yyconst char *, int ));
- #endif
- 
--#ifndef YY_NO_INPUT
-+#ifdef TAO_YY_NEED_STRLEN
-+static int tao_yy_flex_strlen TAO_YY_PROTO(( tao_yyconst char * ));
-+#endif
- 
-+#ifndef TAO_YY_NO_INPUT
- #ifdef __cplusplus
--static int yyinput (void );
-+static int tao_yyinput TAO_YY_PROTO(( void ));
- #else
--static int input (void );
-+static int input TAO_YY_PROTO(( void ));
-+#endif
+ #define TAO_YY_USE_PROTOS
+@@ -968,5 +965,5 @@
  #endif
  
+-#if TAO_YY_STACK_USED
 +#ifdef TAO_YY_STACK_USED
-+static int tao_yy_start_stack_ptr = 0;
-+static int tao_yy_start_stack_depth = 0;
-+static int *tao_yy_start_stack = 0;
-+#ifndef TAO_YY_NO_PUSH_STATE
-+static void tao_yy_push_state TAO_YY_PROTO(( int new_state ));
-+#endif
-+#ifndef TAO_YY_NO_POP_STATE
-+static void tao_yy_pop_state TAO_YY_PROTO(( void ));
-+#endif
-+#ifndef TAO_YY_NO_TOP_STATE
-+static int tao_yy_top_state TAO_YY_PROTO(( void ));
-+#endif
-+
-+#else
-+#define TAO_YY_NO_PUSH_STATE 1
-+#define TAO_YY_NO_POP_STATE 1
-+#define TAO_YY_NO_TOP_STATE 1
-+#endif
-+
-+#ifdef TAO_YY_MALLOC_DECL
-+TAO_YY_MALLOC_DECL
-+#else
+ static int tao_yy_start_stack_ptr = 0;
+ static int tao_yy_start_stack_depth = 0;
+@@ -991,5 +988,5 @@
+ TAO_YY_MALLOC_DECL
+ #else
+-#if __STDC__
 +#ifdef __STDC__
-+#ifndef __cplusplus
-+#endif
-+#else
-+/* Just try to get by without declaring the routines.  This will fail
-+ * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
-+ * or sizeof(void*) != sizeof(int).
-+ */
-+#endif
- #endif
- 
- /* Amount of stuff to slurp up with each read. */
--#ifndef YY_READ_BUF_SIZE
--#define YY_READ_BUF_SIZE 8192
-+#ifndef TAO_YY_READ_BUF_SIZE
-+#define TAO_YY_READ_BUF_SIZE 8192
- #endif
- 
- /* Copy whatever the last rule matched to the standard output. */
--#ifndef ECHO
-+
-+#ifndef TAO_YY_ECHO
- /* This used to be an fputs(), but since the string might contain NUL's,
-  * we now use fwrite().
-  */
--#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-+#define TAO_YY_ECHO (void) fwrite( tao_yytext, tao_yyleng, 1, tao_yyout )
- #endif
- 
--/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
-+/* Gets input and stuffs it into "buf".  number of characters read, or TAO_YY_NULL,
-  * is returned in "result".
-  */
--#ifndef YY_INPUT
--#define YY_INPUT(buf,result,max_size) \
--	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
--		{ \
--		int c = '*'; \
--		size_t n; \
--		for ( n = 0; n < max_size && \
--			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
--			buf[n] = (char) c; \
--		if ( c == '\n' ) \
--			buf[n++] = (char) c; \
--		if ( c == EOF && ferror( yyin ) ) \
--			YY_FATAL_ERROR( "input in flex scanner failed" ); \
--		result = n; \
--		} \
--	else \
--		{ \
--		errno=0; \
--		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
--			{ \
--			if( errno != EINTR) \
--				{ \
--				YY_FATAL_ERROR( "input in flex scanner failed" ); \
--				break; \
--				} \
--			errno=0; \
--			clearerr(yyin); \
--			} \
--		}\
--\
--
-+#ifndef TAO_YY_INPUT
-+#define TAO_YY_INPUT(buf,result,max_size) \
-+        if ( tao_yy_current_buffer->tao_yy_is_interactive ) \
-+                { \
-+                int c = '*', n; \
-+                for ( n = 0; n < max_size && \
-+                             (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
-+                        buf[n] = (char) c; \
-+                if ( c == '\n' ) \
-+                        buf[n++] = (char) c; \
-+                if ( c == EOF && ferror( tao_yyin ) ) \
-+                        TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-+                result = n; \
-+                } \
-+        else if ( ((result = static_cast<int> ( \
-+                                  fread( buf, 1, max_size, tao_yyin ))) == 0) \
-+                  && ferror( tao_yyin ) ) \
-+                TAO_YY_FATAL_ERROR( "input in flex scanner failed" );
- #endif
- 
--/* No semi-colon after return; correct usage is to write "yyterminate();" -
-+/* No semi-colon after return; correct usage is to write "tao_yyterminate();" -
-  * we don't want an extra ';' after the "return" because that will cause
-  * some compilers to complain about unreachable statements.
-  */
--#ifndef yyterminate
--#define yyterminate() return YY_NULL
-+#ifndef tao_yyterminate
-+#define tao_yyterminate() return TAO_YY_NULL
- #endif
- 
- /* Number of entries by which start-condition stack grows. */
--#ifndef YY_START_STACK_INCR
--#define YY_START_STACK_INCR 25
-+#ifndef TAO_YY_START_STACK_INCR
-+#define TAO_YY_START_STACK_INCR 25
- #endif
- 
- /* Report a fatal error. */
--#ifndef YY_FATAL_ERROR
--#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-+#ifndef TAO_YY_FATAL_ERROR
-+#define TAO_YY_FATAL_ERROR(msg) tao_yy_fatal_error( msg )
- #endif
- 
--/* end tables serialization structures and prototypes */
--
- /* Default declaration of generated scanner - a define so the user can
-  * easily add parameters.
-  */
--#ifndef YY_DECL
--#define YY_DECL_IS_OURS 1
--
--extern int yylex (void);
--
--#define YY_DECL int yylex (void)
--#endif /* !YY_DECL */
-+#ifndef TAO_YY_DECL
-+#define TAO_YY_DECL int tao_yylex TAO_YY_PROTO(( void ))
-+#endif
- 
--/* Code executed at the beginning of each rule, after yytext and yyleng
-+/* Code executed at the beginning of each rule, after tao_yytext and tao_yyleng
-  * have been set up.
-  */
--#ifndef YY_USER_ACTION
--#define YY_USER_ACTION
-+#ifndef TAO_YY_USER_ACTION
-+#define TAO_YY_USER_ACTION
+ #ifndef __cplusplus
  #endif
- 
+@@ -1072,5 +1069,5 @@
  /* Code executed at the end of each rule. */
--#ifndef YY_BREAK
--#define YY_BREAK break;
-+#ifndef TAO_YY_BREAK
+ #ifndef TAO_YY_BREAK
+-#define TAO_YY_BREAK break;
 +#define TAO_YY_BREAK ACE_NOTREACHED (break;)
-+#endif
-+
-+#define TAO_YY_RULE_SETUP \
-+        if ( tao_yyleng > 0 ) \
-+                tao_yy_current_buffer->tao_yy_at_bol = \
-+                                (tao_yytext[tao_yyleng - 1] == '\n'); \
-+        TAO_YY_USER_ACTION
-+
-+TAO_YY_DECL
-+        {
-+        register tao_yy_state_type tao_yy_current_state;
-+        register char *tao_yy_cp = 0, *tao_yy_bp = 0;
-+        register int tao_yy_act;
-+
-+
-+
-+
-+        if ( tao_yy_init )
-+                {
-+                tao_yy_init = 0;
-+
-+#ifdef TAO_YY_USER_INIT
-+                TAO_YY_USER_INIT;
  #endif
  
--#define YY_RULE_SETUP \
--	if ( yyleng > 0 ) \
--		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
--				(yytext[yyleng - 1] == '\n'); \
--	YY_USER_ACTION
--
--/** The main scanner function which does all the work.
-- */
--YY_DECL
--{
--	register yy_state_type yy_current_state;
--	register char *yy_cp, *yy_bp;
--	register int yy_act;
--    
--	if ( (yy_init) )
--		{
--		(yy_init) = 0;
--
--#ifdef YY_USER_INIT
--		YY_USER_INIT;
--#endif
--
--		if ( ! (yy_start) )
--			(yy_start) = 1;	/* first start state */
--
--		if ( ! yyin )
--			yyin = stdin;
--
--		if ( ! yyout )
--			yyout = stdout;
--
--		if ( ! YY_CURRENT_BUFFER ) {
--			yyensure_buffer_stack ();
--			YY_CURRENT_BUFFER_LVALUE =
--				yy_create_buffer(yyin,YY_BUF_SIZE );
--		}
--
--		yy_load_buffer_state( );
--		}
--
--	while ( 1 )		/* loops until end-of-file is reached */
--		{
--		yy_cp = (yy_c_buf_p);
--
--		/* Support of yytext. */
--		*yy_cp = (yy_hold_char);
--
--		/* yy_bp points to the position in yy_ch_buf of the start of
--		 * the current run.
--		 */
--		yy_bp = yy_cp;
--
--		yy_current_state = (yy_start);
--		yy_current_state += YY_AT_BOL();
--yy_match:
--		do
--			{
--			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
--			if ( yy_accept[yy_current_state] )
--				{
--				(yy_last_accepting_state) = yy_current_state;
--				(yy_last_accepting_cpos) = yy_cp;
--				}
--			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
--				{
--				yy_current_state = (int) yy_def[yy_current_state];
--				if ( yy_current_state >= 551 )
--					yy_c = yy_meta[(unsigned int) yy_c];
--				}
--			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
--			++yy_cp;
--			}
--		while ( yy_current_state != 550 );
--		yy_cp = (yy_last_accepting_cpos);
--		yy_current_state = (yy_last_accepting_state);
--
--yy_find_action:
--		yy_act = yy_accept[yy_current_state];
--
--		YY_DO_BEFORE_ACTION;
--
--do_action:	/* This label is used only to access EOF actions. */
--
--		switch ( yy_act )
--	{ /* beginning of action switch */
--			case 0: /* must back up */
--			/* undo the effects of YY_DO_BEFORE_ACTION */
--			*yy_cp = (yy_hold_char);
--			yy_cp = (yy_last_accepting_cpos);
--			yy_current_state = (yy_last_accepting_state);
--			goto yy_find_action;
-+                if ( ! tao_yy_start )
-+                        tao_yy_start = 1;       /* first start state */
-+
-+                if ( ! tao_yyin )
-+                        tao_yyin = stdin;
-+
-+                if ( ! tao_yyout )
-+                        tao_yyout = stdout;
-+
-+                if ( ! tao_yy_current_buffer )
-+                        tao_yy_current_buffer =
-+                                tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE );
-+
-+                tao_yy_load_buffer_state();
-+                }
-+
-+        while ( 1 )             /* loops until end-of-file is reached */
-+                {
-+                tao_yy_cp = tao_yy_c_buf_p;
-+
-+                /* Support of tao_yytext. */
-+                *tao_yy_cp = tao_yy_hold_char;
-+
-+                /* tao_yy_bp points to the position in tao_yy_ch_buf of the start of
-+                 * the current run.
-+                 */
-+                tao_yy_bp = tao_yy_cp;
-+
-+                tao_yy_current_state = tao_yy_start;
-+                tao_yy_current_state += TAO_YY_AT_BOL();
-+tao_yy_match:
-+                do
-+                        {
-+                        register TAO_YY_CHAR tao_yy_c = tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)];
-+                        if ( tao_yy_accept[tao_yy_current_state] )
-+                                {
-+                                tao_yy_last_accepting_state = tao_yy_current_state;
-+                                tao_yy_last_accepting_cpos = tao_yy_cp;
-+                                }
-+                        while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-+                                {
-+                                tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-+                                if ( tao_yy_current_state >= 551 )
-+                                        tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-+                                }
-+                        tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-+                        ++tao_yy_cp;
-+                        }
-+                while ( tao_yy_current_state != 550 );
-+
-+tao_yy_find_action:
-+                tao_yy_act = tao_yy_accept[tao_yy_current_state];
-+                if ( tao_yy_act == 0 )
-+                        { /* have to back up */
-+                        tao_yy_cp = tao_yy_last_accepting_cpos;
-+                        tao_yy_current_state = tao_yy_last_accepting_state;
-+                        tao_yy_act = tao_yy_accept[tao_yy_current_state];
-+                        }
-+
-+                TAO_YY_DO_BEFORE_ACTION;
-+
-+
-+do_action:      /* This label is used only to access EOF actions. */
-+
-+
-+                switch ( tao_yy_act )
-+        { /* beginning of action switch */
-+                        case 0: /* must back up */
-+                        /* undo the effects of TAO_YY_DO_BEFORE_ACTION */
-+                        *tao_yy_cp = tao_yy_hold_char;
-+                        tao_yy_cp = tao_yy_last_accepting_cpos;
-+                        tao_yy_current_state = tao_yy_last_accepting_state;
-+                        goto tao_yy_find_action;
- 
- case 1:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ANY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 2:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_OBJECT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 3:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_MODULE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 4:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_RAISES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 5:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_READONLY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 6:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ATTRIBUTE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 7:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_EXCEPTION;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 8:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CONTEXT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 9:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_INTERFACE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 10:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CONST;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 11:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TYPEDEF;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 12:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_STRUCT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 13:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ENUM;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 14:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_STRING;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 15:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_WSTRING;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 16:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SEQUENCE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 17:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_UNION;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 18:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FIXED;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 19:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SWITCH;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 20:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CASE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 21:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_DEFAULT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 22:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FLOAT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 23:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_DOUBLE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 24:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_LONG;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 25:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SHORT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 26:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_UNSIGNED;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 27:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CHAR;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 28:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_WCHAR;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 29:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_BOOLEAN;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 30:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_OCTET;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 31:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_VOID;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 32:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_NATIVE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 33:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_LOCAL;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 34:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ABSTRACT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 35:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CUSTOM;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 36:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FACTORY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 37:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PRIVATE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 38:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PUBLIC;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 39:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SUPPORTS;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 40:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TRUNCATABLE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 41:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_VALUETYPE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 42:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_COMPONENT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 43:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CONSUMES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 44:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_EMITS;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 45:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_EVENTTYPE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 46:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FINDER;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 47:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_GETRAISES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 48:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_HOME;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 49:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_IMPORT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 50:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_MULTIPLE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 51:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PRIMARYKEY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 52:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PROVIDES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 53:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PUBLISHES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 54:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SETRAISES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 55:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TYPEID;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 56:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TYPEPREFIX;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 57:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_USES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 58:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_MANAGES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 59:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TRUETOK;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 60:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FALSETOK;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 61:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_INOUT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 62:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_IN;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 63:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_OUT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 64:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ONEWAY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 65:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_LEFT_SHIFT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 66:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_RIGHT_SHIFT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 67:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.strval = (char *) "::";
--		  return IDL_SCOPE_DELIMITOR;
--		}
--	YY_BREAK
-+                  tao_yylval.strval = (char *) "::";
-+                  return IDL_SCOPE_DELIMITOR;
-+                }
-+        TAO_YY_BREAK
- case 68:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
-   // Make sure that this identifier is not a C++ keyword. If it is,
-   // prepend it with a _cxx_. Lookup in the perfect hash table for C++
-@@ -1499,15 +1429,16 @@
- 
-   TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
-   const TAO_IDL_CPP_Keyword_Entry *entry = 0;
-+
-   if (!idl_global->preserve_cpp_keywords())
-     {
-       // This check will ensure that escaped C++ keywords will be
-       // caught and prepended with '_cxx' as non-escaped keywords
-       // are now prepended with '_cxx_'.
--      const char *tmp = 
-+      const char *tmp =
-         ace_tao_yytext[0] == '_' ? ace_tao_yytext + 1 : ace_tao_yytext;
+@@ -1084,5 +1081,5 @@
+ 	{
+ 	register tao_yy_state_type tao_yy_current_state;
+-	register char *tao_yy_cp, *tao_yy_bp;
++	register char *tao_yy_cp = 0, *tao_yy_bp = 0;
+ 	register int tao_yy_act;
  
--      entry = 
-+      entry =
-         cpp_key_tbl.lookup (tmp,
-                             static_cast<unsigned int> (ACE_OS::strlen (tmp)));
-     }
-@@ -1523,69 +1454,68 @@
- 
-   return IDENTIFIER;
- }
--	YY_BREAK
-+        TAO_YY_BREAK
- case 69:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--                  yylval.dval = idl_atof(ace_yytext);
-+                  tao_yylval.dval = idl_atof(ace_tao_yytext);
-                   return IDL_FLOATING_PT_LITERAL;
-                 }
--	YY_BREAK
-+        TAO_YY_BREAK
- case 70:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--                  yylval.dval = idl_atof(ace_yytext);
-+                  tao_yylval.dval = idl_atof(ace_tao_yytext);
-                   return IDL_FLOATING_PT_LITERAL;
-                 }
--	YY_BREAK
-+        TAO_YY_BREAK
- case 71:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.ival = idl_atoi(ace_yytext, 10);
--		  return IDL_INTEGER_LITERAL;
--	        }
--	YY_BREAK
-+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 10);
-+                  return IDL_INTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 72:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.uival = idl_atoui(ace_yytext, 10);
--		  return IDL_UINTEGER_LITERAL;
--		}
--	YY_BREAK
-+                  tao_yylval.uival = idl_atoui(ace_tao_yytext, 10);
-+                  return IDL_UINTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 73:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.ival = idl_atoi(ace_yytext, 16);
--		  return IDL_INTEGER_LITERAL;
--	        }
--	YY_BREAK
-+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 16);
-+                  return IDL_INTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 74:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--                  yylval.uival = idl_atoui(ace_yytext, 16);
--		  return IDL_UINTEGER_LITERAL;
--		}
--	YY_BREAK
-+                  tao_yylval.uival = idl_atoui(ace_tao_yytext, 16);
-+                  return IDL_UINTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 75:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.ival = idl_atoi(ace_yytext, 8);
--		  return IDL_INTEGER_LITERAL;
--	      	}
--	YY_BREAK
-+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 8);
-+                  return IDL_INTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 76:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.uival = idl_atoui(ace_yytext, 8);
--		  return IDL_UINTEGER_LITERAL;
--	      	}
--	YY_BREAK
-+                  tao_yylval.uival = idl_atoui(ace_tao_yytext, 8);
-+                  return IDL_UINTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 77:
--/* rule 77 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  /* Skip the quotes */
--		  char *tmp = ace_yytext;
-+                  /* Skip the quotes */
-+                  char *tmp = ace_tao_yytext;
-                   for(int i = strlen(tmp) - 1; i >= 0; --i) {
-                     if (isspace(tmp[i])) {
-                       tmp[i] = '\0';
-@@ -1594,1146 +1524,1051 @@
-                       break;
-                     }
-                   }
--		  tmp[strlen (tmp) - 1] = '\0';
--		  ACE_NEW_RETURN (yylval.sval,
-+                  tmp[strlen (tmp) - 1] = '\0';
-+                  ACE_NEW_RETURN (tao_yylval.sval,
-                                   UTL_String (tmp + 1),
-                                   IDL_STRING_LITERAL);
--		  return IDL_STRING_LITERAL;
--	      	}
--	YY_BREAK
-+                  return IDL_STRING_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 78:
--/* rule 78 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  /* Skip the bookends */
--		  char *tmp = ACE_OS::strdup (ace_yytext);
--		  tmp[strlen (tmp) - 1] = '\0';
--		  yylval.wsval = idl_wstring_escape_reader(tmp + 2);
--		  return IDL_WSTRING_LITERAL;
--		}
--	YY_BREAK
-+                  /* Skip the bookends */
-+                  char *tmp = ACE_OS::strdup (ace_tao_yytext);
-+                  tmp[strlen (tmp) - 1] = '\0';
-+                  tao_yylval.wsval = idl_wstring_escape_reader(tmp + 2);
-+                  return IDL_WSTRING_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 79:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.cval = ace_yytext [1];
--		  return IDL_CHARACTER_LITERAL;
--	      	}
--	YY_BREAK
-+                  tao_yylval.cval = ace_tao_yytext [1];
-+                  return IDL_CHARACTER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 80:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  // octal character constant
--		  yylval.cval = idl_escape_reader(ace_yytext + 1);
--		  return IDL_CHARACTER_LITERAL;
--		}
--	YY_BREAK
-+                  // octal character constant
-+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-+                  return IDL_CHARACTER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 81:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  // hexadecimal character constant
--		  yylval.cval = idl_escape_reader(ace_yytext + 1);
--		  return IDL_CHARACTER_LITERAL;
--		}
--	YY_BREAK
-+                  // hexadecimal character constant
-+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-+                  return IDL_CHARACTER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 82:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.cval = idl_escape_reader(ace_yytext + 1);
--		  return IDL_CHARACTER_LITERAL;
--		}
--	YY_BREAK
-+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-+                  return IDL_CHARACTER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 83:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  // wide character constant
--		  yylval.wcval = ace_yytext [2];
--		  return IDL_WCHAR_LITERAL;
--		}
--	YY_BREAK
-+                  // wide character constant
-+                  tao_yylval.wcval = ace_tao_yytext [2];
-+                  return IDL_WCHAR_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 84:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  // hexadecimal wide character constant
--		  yylval.wcval = idl_wchar_escape_reader(ace_yytext + 2);
--		  return IDL_WCHAR_LITERAL;
--		}
--	YY_BREAK
-+                  // hexadecimal wide character constant
-+                  tao_yylval.wcval = idl_wchar_escape_reader(ace_tao_yytext + 2);
-+                  return IDL_WCHAR_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 85:
--/* rule 85 can match eol */
- case 86:
--/* rule 86 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {/* remember pragma */
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		  idl_store_pragma(ace_yytext);
--		}
--	YY_BREAK
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                  idl_store_pragma(ace_tao_yytext);
-+                }
+@@ -1598,5 +1595,5 @@
+ 		  idl_store_pragma(ace_tao_yytext);
+ 		}
+-	TAO_YY_BREAK
 +        break;
  case 87:
--/* rule 87 can match eol */
  case 88:
--/* rule 88 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {/* ignore file */
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		}
--	YY_BREAK
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                }
-+        break;
+@@ -1605,5 +1602,5 @@
+   		  idl_global->set_lineno(idl_global->lineno() + 1);
+ 		}
+-	TAO_YY_BREAK
++	break;
  case 89:
--/* rule 89 can match eol */
  case 90:
--/* rule 90 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  idl_parse_line_and_file(ace_yytext);
--		}
--	YY_BREAK
-+                  idl_parse_line_and_file(ace_tao_yytext);
-+                }
-+        break;
+@@ -1612,5 +1609,5 @@
+ 		  idl_parse_line_and_file(ace_tao_yytext);
+ 		}
+-	TAO_YY_BREAK
++	break;
  case 91:
--/* rule 91 can match eol */
  case 92:
--/* rule 92 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  idl_parse_line_and_file(ace_yytext);
--		}
--	YY_BREAK
-+                  idl_parse_line_and_file(ace_tao_yytext);
-+                }
-+        break;
+@@ -1619,5 +1616,5 @@
+ 		  idl_parse_line_and_file(ace_tao_yytext);
+ 		}
+-	TAO_YY_BREAK
++	break;
  case 93:
--/* rule 93 can match eol */
  case 94:
--/* rule 94 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  idl_parse_line_and_file(ace_yytext);
--		}
--	YY_BREAK
-+                  idl_parse_line_and_file(ace_tao_yytext);
-+                }
-+        break;
+@@ -1626,5 +1623,5 @@
+ 		  idl_parse_line_and_file(ace_tao_yytext);
+ 		}
+-	TAO_YY_BREAK
++	break;
  case 95:
--/* rule 95 can match eol */
  case 96:
--/* rule 96 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  idl_parse_line_and_file(ace_yytext);
--	        }
--	YY_BREAK
-+                  idl_parse_line_and_file(ace_tao_yytext);
-+                }
-+        break;
+@@ -1633,5 +1630,5 @@
+ 		  idl_parse_line_and_file(ace_tao_yytext);
+ 	        }
+-	TAO_YY_BREAK
++	break;
  case 97:
--/* rule 97 can match eol */
  case 98:
--/* rule 98 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  /* ignore cpp ident */
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		}
--	YY_BREAK
-+                  /* ignore cpp ident */
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                }
-+        break;
+@@ -1641,5 +1638,5 @@
+   		  idl_global->set_lineno(idl_global->lineno() + 1);
+ 		}
+-	TAO_YY_BREAK
++	break;
  case 99:
--/* rule 99 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  /* ignore comments */
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		}
--	YY_BREAK
-+                  /* ignore comments */
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                }
+ TAO_YY_RULE_SETUP
+@@ -1648,5 +1645,5 @@
+   		  idl_global->set_lineno(idl_global->lineno() + 1);
+ 		}
+-	TAO_YY_BREAK
 +        break;
  case 100:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  for(;;) {
--		    char c = yyinput();
--		    if (c == '*') {
--		      char next = yyinput();
--		      if (next == '/')
--			break;
--		      else
--			yyunput(c, NULL);
--	              if (c == '\n')
--		        idl_global->set_lineno(idl_global->lineno() + 1);
--		    }
--	          }
--	        }
--	YY_BREAK
-+                  for(;;) {
-+                    char c = tao_yyinput();
-+                    if (c == '*') {
-+                      char next = tao_yyinput();
-+                      if (next == '/')
-+                        break;
-+                      else
-+                        tao_yyunput(c, NULL);
-+                      if (c == '\n')
-+                        idl_global->set_lineno(idl_global->lineno() + 1);
-+                    }
-+                  }
-+                }
-+        break;
+ TAO_YY_RULE_SETUP
+@@ -1665,9 +1662,9 @@
+ 	          }
+ 	        }
+-	TAO_YY_BREAK
++	break;
  case 101:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  ;
--	YY_BREAK
-+        break;
+-	TAO_YY_BREAK
++	break;
  case 102:
--/* rule 102 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		}
--	YY_BREAK
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                }
-+        break;
+ TAO_YY_RULE_SETUP
+@@ -1675,13 +1672,13 @@
+   		  idl_global->set_lineno(idl_global->lineno() + 1);
+ 		}
+-	TAO_YY_BREAK
++	break;
  case 103:
--YY_RULE_SETUP
--return ace_yytext [0];
--	YY_BREAK
-+TAO_YY_RULE_SETUP
-+return ace_tao_yytext [0];
-+        break;
+ TAO_YY_RULE_SETUP
+ return ace_tao_yytext [0];
+-	TAO_YY_BREAK
++	break;
  case 104:
--YY_RULE_SETUP
--ECHO;
--	YY_BREAK
--case YY_STATE_EOF(INITIAL):
--	yyterminate();
--
--	case YY_END_OF_BUFFER:
--		{
--		/* Amount of text matched not including the EOB char. */
--		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
--
--		/* Undo the effects of YY_DO_BEFORE_ACTION. */
--		*yy_cp = (yy_hold_char);
--		YY_RESTORE_YY_MORE_OFFSET
--
--		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
--			{
--			/* We're scanning a new file or input source.  It's
--			 * possible that this happened because the user
--			 * just pointed yyin at a new source and called
--			 * yylex().  If so, then we have to assure
--			 * consistency between YY_CURRENT_BUFFER and our
--			 * globals.  Here is the right place to do so, because
--			 * this is the first action (other than possibly a
--			 * back-up) that will match for the new input source.
--			 */
--			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
--			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
--			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
--			}
--
--		/* Note that here we test for yy_c_buf_p "<=" to the position
--		 * of the first EOB in the buffer, since yy_c_buf_p will
--		 * already have been incremented past the NUL character
--		 * (since all states make transitions on EOB to the
--		 * end-of-buffer state).  Contrast this with the test
--		 * in input().
--		 */
--		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
--			{ /* This was really a NUL. */
--			yy_state_type yy_next_state;
--
--			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
--
--			yy_current_state = yy_get_previous_state(  );
--
--			/* Okay, we're now positioned to make the NUL
--			 * transition.  We couldn't have
--			 * yy_get_previous_state() go ahead and do it
--			 * for us because it doesn't know how to deal
--			 * with the possibility of jamming (and we don't
--			 * want to build jamming into it because then it
--			 * will run more slowly).
--			 */
--
--			yy_next_state = yy_try_NUL_trans( yy_current_state );
--
--			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
--
--			if ( yy_next_state )
--				{
--				/* Consume the NUL. */
--				yy_cp = ++(yy_c_buf_p);
--				yy_current_state = yy_next_state;
--				goto yy_match;
--				}
--
--			else
--				{
--				yy_cp = (yy_last_accepting_cpos);
--				yy_current_state = (yy_last_accepting_state);
--				goto yy_find_action;
--				}
--			}
--
--		else switch ( yy_get_next_buffer(  ) )
--			{
--			case EOB_ACT_END_OF_FILE:
--				{
--				(yy_did_buffer_switch_on_eof) = 0;
--
--				if ( yywrap( ) )
--					{
--					/* Note: because we've taken care in
--					 * yy_get_next_buffer() to have set up
--					 * yytext, we can now set up
--					 * yy_c_buf_p so that if some total
--					 * hoser (like flex itself) wants to
--					 * call the scanner after we return the
--					 * YY_NULL, it'll still work - another
--					 * YY_NULL will get returned.
--					 */
--					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
--
--					yy_act = YY_STATE_EOF(YY_START);
--					goto do_action;
--					}
--
--				else
--					{
--					if ( ! (yy_did_buffer_switch_on_eof) )
--						YY_NEW_FILE;
--					}
--				break;
--				}
--
--			case EOB_ACT_CONTINUE_SCAN:
--				(yy_c_buf_p) =
--					(yytext_ptr) + yy_amount_of_matched_text;
--
--				yy_current_state = yy_get_previous_state(  );
--
--				yy_cp = (yy_c_buf_p);
--				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
--				goto yy_match;
--
--			case EOB_ACT_LAST_MATCH:
--				(yy_c_buf_p) =
--				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
--
--				yy_current_state = yy_get_previous_state(  );
--
--				yy_cp = (yy_c_buf_p);
--				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
--				goto yy_find_action;
--			}
--		break;
--		}
--
--	default:
--		YY_FATAL_ERROR(
--			"fatal flex scanner internal error--no action found" );
--	} /* end of action switch */
--		} /* end of scanning one token */
--} /* end of yylex */
-+TAO_YY_RULE_SETUP
-+TAO_YY_ECHO;
-+        break;
-+case TAO_YY_STATE_EOF(INITIAL):
-+        tao_yyterminate();
-+
-+        case TAO_YY_END_OF_BUFFER:
-+                {
-+                /* Amount of text matched not including the EOB char. */
-+                int tao_yy_amount_of_matched_text = (int) (tao_yy_cp - tao_yytext_ptr) - 1;
-+
-+                /* Undo the effects of TAO_YY_DO_BEFORE_ACTION. */
-+                *tao_yy_cp = tao_yy_hold_char;
-+                TAO_YY_RESTORE_TAO_YY_MORE_OFFSET
-+
-+                if ( tao_yy_current_buffer->tao_yy_buffer_status == TAO_YY_BUFFER_NEW )
-+                        {
-+                        /* We're scanning a new file or input source.  It's
-+                         * possible that this happened because the user
-+                         * just pointed tao_yyin at a new source and called
-+                         * tao_yylex().  If so, then we have to assure
-+                         * consistency between tao_yy_current_buffer and our
-+                         * globals.  Here is the right place to do so, because
-+                         * this is the first action (other than possibly a
-+                         * back-up) that will match for the new input source.
-+                         */
-+                        tao_yy_n_chars = tao_yy_current_buffer->tao_yy_n_chars;
-+                        tao_yy_current_buffer->tao_yy_input_file = tao_yyin;
-+                        tao_yy_current_buffer->tao_yy_buffer_status = TAO_YY_BUFFER_NORMAL;
-+                        }
-+
-+                /* Note that here we test for tao_yy_c_buf_p "<=" to the position
-+                 * of the first EOB in the buffer, since tao_yy_c_buf_p will
-+                 * already have been incremented past the NUL character
-+                 * (since all states make transitions on EOB to the
-+                 * end-of-buffer state).  Contrast this with the test
-+                 * in input().
-+                 */
-+                if ( tao_yy_c_buf_p <= &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] )
-+                        { /* This was really a NUL. */
-+                        tao_yy_state_type tao_yy_next_state;
-+
-+                        tao_yy_c_buf_p = tao_yytext_ptr + tao_yy_amount_of_matched_text;
-+
-+                        tao_yy_current_state = tao_yy_get_previous_state();
-+
-+                        /* Okay, we're now positioned to make the NUL
-+                         * transition.  We couldn't have
-+                         * tao_yy_get_previous_state() go ahead and do it
-+                         * for us because it doesn't know how to deal
-+                         * with the possibility of jamming (and we don't
-+                         * want to build jamming into it because then it
-+                         * will run more slowly).
-+                         */
-+
-+                        tao_yy_next_state = tao_yy_try_NUL_trans( tao_yy_current_state );
-+
-+                        tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-+
-+                        if ( tao_yy_next_state )
-+                                {
-+                                /* Consume the NUL. */
-+                                tao_yy_cp = ++tao_yy_c_buf_p;
-+                                tao_yy_current_state = tao_yy_next_state;
-+                                goto tao_yy_match;
-+                                }
-+
-+                        else
-+                                {
-+                                tao_yy_cp = tao_yy_c_buf_p;
-+                                goto tao_yy_find_action;
-+                                }
-+                        }
-+
-+                else switch ( tao_yy_get_next_buffer() )
-+                        {
-+                        case EOB_ACT_END_OF_FILE:
-+                                {
-+                                tao_yy_did_buffer_switch_on_eof = 0;
-+
-+                                if ( tao_yywrap() )
-+                                        {
-+                                        /* Note: because we've taken care in
-+                                         * tao_yy_get_next_buffer() to have set up
-+                                         * tao_yytext, we can now set up
-+                                         * tao_yy_c_buf_p so that if some total
-+                                         * hoser (like flex itself) wants to
-+                                         * call the scanner after we return the
-+                                         * TAO_YY_NULL, it'll still work - another
-+                                         * TAO_YY_NULL will get returned.
-+                                         */
-+                                        tao_yy_c_buf_p = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-+
-+                                        tao_yy_act = TAO_YY_STATE_EOF(TAO_YY_START);
-+                                        goto do_action;
-+                                        }
-+
-+                                else
-+                                        {
-+                                        if ( ! tao_yy_did_buffer_switch_on_eof )
-+                                                TAO_YY_NEW_FILE;
-+                                        }
-+                                break;
-+                                }
-+
-+                        case EOB_ACT_CONTINUE_SCAN:
-+                                tao_yy_c_buf_p =
-+                                        tao_yytext_ptr + tao_yy_amount_of_matched_text;
-+
-+                                tao_yy_current_state = tao_yy_get_previous_state();
-+
-+                                tao_yy_cp = tao_yy_c_buf_p;
-+                                tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-+                                goto tao_yy_match;
-+
-+                        case EOB_ACT_LAST_MATCH:
-+                                tao_yy_c_buf_p =
-+                                &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars];
-+
-+                                tao_yy_current_state = tao_yy_get_previous_state();
-+
-+                                tao_yy_cp = tao_yy_c_buf_p;
-+                                tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-+                                goto tao_yy_find_action;
-+                        }
-+                break;
-+                }
-+
-+        default:
-+                TAO_YY_FATAL_ERROR(
-+                        "fatal flex scanner internal error--no action found" );
-+        } /* end of action switch */
-+                } /* end of scanning one token */
-+        } /* end of tao_yylex */
-+
- 
--/* yy_get_next_buffer - try to read in a new buffer
-+/* tao_yy_get_next_buffer - try to read in a new buffer
-  *
-  * Returns a code representing an action:
-- *	EOB_ACT_LAST_MATCH -
-- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
-- *	EOB_ACT_END_OF_FILE - end of file
-- */
--static int yy_get_next_buffer (void)
--{
--    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
--	register char *source = (yytext_ptr);
--	register int number_to_move, i;
--	int ret_val;
--
--	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
--		YY_FATAL_ERROR(
--		"fatal flex scanner internal error--end of buffer missed" );
--
--	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
--		{ /* Don't try to fill the buffer, so this is an EOF. */
--		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
--			{
--			/* We matched a single character, the EOB, so
--			 * treat this as a final EOF.
--			 */
--			return EOB_ACT_END_OF_FILE;
--			}
--
--		else
--			{
--			/* We matched some text prior to the EOB, first
--			 * process it.
--			 */
--			return EOB_ACT_LAST_MATCH;
--			}
--		}
--
--	/* Try to read more data. */
--
--	/* First move last chars to start of buffer. */
--	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
--
--	for ( i = 0; i < number_to_move; ++i )
--		*(dest++) = *(source++);
--
--	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
--		/* don't do the read, it's not guaranteed to return an EOF,
--		 * just force an EOF
--		 */
--		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
--
--	else
--		{
--			size_t num_to_read =
--			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
--
--		while ( num_to_read <= 0 )
--			{ /* Not enough room in the buffer - grow it. */
--
--			/* just a shorter name for the current buffer */
--			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
--
--			int yy_c_buf_p_offset =
--				(int) ((yy_c_buf_p) - b->yy_ch_buf);
--
--			if ( b->yy_is_our_buffer )
--				{
--				int new_size = b->yy_buf_size * 2;
--
--				if ( new_size <= 0 )
--					b->yy_buf_size += b->yy_buf_size / 8;
--				else
--					b->yy_buf_size *= 2;
--
--				b->yy_ch_buf = (char *)
--					/* Include room in for 2 EOB chars. */
--					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
--				}
--			else
--				/* Can't grow it, we don't own it. */
--				b->yy_ch_buf = 0;
--
--			if ( ! b->yy_ch_buf )
--				YY_FATAL_ERROR(
--				"fatal error - scanner input buffer overflow" );
--
--			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
--
--			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
--						number_to_move - 1;
--
--			}
--
--		if ( num_to_read > YY_READ_BUF_SIZE )
--			num_to_read = YY_READ_BUF_SIZE;
--
--		/* Read in more data. */
--		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
--			(yy_n_chars), num_to_read );
--
--		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
--		}
--
--	if ( (yy_n_chars) == 0 )
--		{
--		if ( number_to_move == YY_MORE_ADJ )
--			{
--			ret_val = EOB_ACT_END_OF_FILE;
--			yyrestart(yyin  );
--			}
--
--		else
--			{
--			ret_val = EOB_ACT_LAST_MATCH;
--			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
--				YY_BUFFER_EOF_PENDING;
--			}
--		}
--
--	else
--		ret_val = EOB_ACT_CONTINUE_SCAN;
--
--	(yy_n_chars) += number_to_move;
--	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
--	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-+ *      EOB_ACT_LAST_MATCH -
-+ *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
-+ *      EOB_ACT_END_OF_FILE - end of file
-+ */
-+
-+static int tao_yy_get_next_buffer()
-+        {
-+        register char *dest = tao_yy_current_buffer->tao_yy_ch_buf;
-+        register char *source = tao_yytext_ptr;
-+        register int number_to_move, i;
-+        int ret_val;
-+
-+        if ( tao_yy_c_buf_p > &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars + 1] )
-+                TAO_YY_FATAL_ERROR(
-+                "fatal flex scanner internal error--end of buffer missed" );
-+
-+        if ( tao_yy_current_buffer->tao_yy_fill_buffer == 0 )
-+                { /* Don't try to fill the buffer, so this is an EOF. */
-+                if ( tao_yy_c_buf_p - tao_yytext_ptr - TAO_YY_MORE_ADJ == 1 )
-+                        {
-+                        /* We matched a single character, the EOB, so
-+                         * treat this as a final EOF.
-+                         */
-+                        return EOB_ACT_END_OF_FILE;
-+                        }
-+
-+                else
-+                        {
-+                        /* We matched some text prior to the EOB, first
-+                         * process it.
-+                         */
-+                        return EOB_ACT_LAST_MATCH;
-+                        }
-+                }
- 
--	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-+        /* Try to read more data. */
- 
--	return ret_val;
--}
-+        /* First move last chars to start of buffer. */
-+        number_to_move = (int) (tao_yy_c_buf_p - tao_yytext_ptr) - 1;
- 
--/* yy_get_previous_state - get the state just before the EOB char was reached */
-+        for ( i = 0; i < number_to_move; ++i )
-+                *(dest++) = *(source++);
- 
--    static yy_state_type yy_get_previous_state (void)
--{
--	register yy_state_type yy_current_state;
--	register char *yy_cp;
--    
--	yy_current_state = (yy_start);
--	yy_current_state += YY_AT_BOL();
--
--	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
--		{
--		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
--		if ( yy_accept[yy_current_state] )
--			{
--			(yy_last_accepting_state) = yy_current_state;
--			(yy_last_accepting_cpos) = yy_cp;
--			}
--		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
--			{
--			yy_current_state = (int) yy_def[yy_current_state];
--			if ( yy_current_state >= 551 )
--				yy_c = yy_meta[(unsigned int) yy_c];
--			}
--		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
--		}
-+        if ( tao_yy_current_buffer->tao_yy_buffer_status == TAO_YY_BUFFER_EOF_PENDING )
-+                /* don't do the read, it's not guaranteed to return an EOF,
-+                 * just force an EOF
-+                 */
-+                tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars = 0;
-+
-+        else
-+                {
-+                int num_to_read =
-+                        tao_yy_current_buffer->tao_yy_buf_size - number_to_move - 1;
-+
-+                while ( num_to_read <= 0 )
-+                        { /* Not enough room in the buffer - grow it. */
-+#ifdef TAO_YY_USES_REJECT
-+                        TAO_YY_FATAL_ERROR(
-+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-+#else
-+
-+                        /* just a shorter name for the current buffer */
-+                        TAO_YY_BUFFER_STATE b = tao_yy_current_buffer;
-+
-+                        int tao_yy_c_buf_p_offset =
-+                                (int) (tao_yy_c_buf_p - b->tao_yy_ch_buf);
-+
-+                        if ( b->tao_yy_is_our_buffer )
-+                                {
-+                                int new_size = b->tao_yy_buf_size * 2;
-+
-+                                if ( new_size <= 0 )
-+                                        b->tao_yy_buf_size += b->tao_yy_buf_size / 8;
-+                                else
-+                                        b->tao_yy_buf_size *= 2;
-+
-+                                b->tao_yy_ch_buf = (char *)
-+                                        /* Include room in for 2 EOB chars. */
-+                                        tao_yy_flex_realloc( (void *) b->tao_yy_ch_buf,
-+                                                         b->tao_yy_buf_size + 2 );
-+                                }
-+                        else
-+                                /* Can't grow it, we don't own it. */
-+                                b->tao_yy_ch_buf = 0;
-+
-+                        if ( ! b->tao_yy_ch_buf )
-+                                TAO_YY_FATAL_ERROR(
-+                                "fatal error - scanner input buffer overflow" );
-+
-+                        tao_yy_c_buf_p = &b->tao_yy_ch_buf[tao_yy_c_buf_p_offset];
-+
-+                        num_to_read = tao_yy_current_buffer->tao_yy_buf_size -
-+                                                number_to_move - 1;
-+#endif
-+                        }
-+
-+                if ( num_to_read > TAO_YY_READ_BUF_SIZE )
-+                        num_to_read = TAO_YY_READ_BUF_SIZE;
-+
-+                /* Read in more data. */
-+                TAO_YY_INPUT( (&tao_yy_current_buffer->tao_yy_ch_buf[number_to_move]),
-+                        tao_yy_n_chars, num_to_read );
-+
-+                tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars;
-+                }
-+
-+        if ( tao_yy_n_chars == 0 )
-+                {
-+                if ( number_to_move == TAO_YY_MORE_ADJ )
-+                        {
-+                        ret_val = EOB_ACT_END_OF_FILE;
-+                        tao_yyrestart( tao_yyin );
-+                        }
-+
-+                else
-+                        {
-+                        ret_val = EOB_ACT_LAST_MATCH;
-+                        tao_yy_current_buffer->tao_yy_buffer_status =
-+                                TAO_YY_BUFFER_EOF_PENDING;
-+                        }
-+                }
-+
-+        else
-+                ret_val = EOB_ACT_CONTINUE_SCAN;
-+
-+        tao_yy_n_chars += number_to_move;
-+        tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] = TAO_YY_END_OF_BUFFER_CHAR;
-+        tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars + 1] = TAO_YY_END_OF_BUFFER_CHAR;
-+
-+        tao_yytext_ptr = &tao_yy_current_buffer->tao_yy_ch_buf[0];
-+
-+        return ret_val;
-+        }
- 
--	return yy_current_state;
--}
- 
--/* yy_try_NUL_trans - try to make a transition on the NUL character
-+/* tao_yy_get_previous_state - get the state just before the EOB char was reached */
-+
-+static tao_yy_state_type tao_yy_get_previous_state()
-+        {
-+        register tao_yy_state_type tao_yy_current_state;
-+        register char *tao_yy_cp;
-+
-+        tao_yy_current_state = tao_yy_start;
-+        tao_yy_current_state += TAO_YY_AT_BOL();
-+
-+        for ( tao_yy_cp = tao_yytext_ptr + TAO_YY_MORE_ADJ; tao_yy_cp < tao_yy_c_buf_p; ++tao_yy_cp )
-+                {
-+                register TAO_YY_CHAR tao_yy_c = (*tao_yy_cp ? tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)] : 1);
-+                if ( tao_yy_accept[tao_yy_current_state] )
-+                        {
-+                        tao_yy_last_accepting_state = tao_yy_current_state;
-+                        tao_yy_last_accepting_cpos = tao_yy_cp;
-+                        }
-+                while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-+                        {
-+                        tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-+                        if ( tao_yy_current_state >= 551 )
-+                                tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-+                        }
-+                tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-+                }
-+
-+        return tao_yy_current_state;
-+        }
-+
-+
-+/* tao_yy_try_NUL_trans - try to make a transition on the NUL character
-  *
-  * synopsis
-- *	next_state = yy_try_NUL_trans( current_state );
-+ *      next_state = tao_yy_try_NUL_trans( current_state );
-  */
--    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
--{
--	register int yy_is_jam;
--    	register char *yy_cp = (yy_c_buf_p);
- 
--	register YY_CHAR yy_c = 1;
--	if ( yy_accept[yy_current_state] )
--		{
--		(yy_last_accepting_state) = yy_current_state;
--		(yy_last_accepting_cpos) = yy_cp;
--		}
--	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
--		{
--		yy_current_state = (int) yy_def[yy_current_state];
--		if ( yy_current_state >= 551 )
--			yy_c = yy_meta[(unsigned int) yy_c];
--		}
--	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
--	yy_is_jam = (yy_current_state == 550);
-+#ifdef TAO_YY_USE_PROTOS
-+static tao_yy_state_type tao_yy_try_NUL_trans( tao_yy_state_type tao_yy_current_state )
-+#else
-+static tao_yy_state_type tao_yy_try_NUL_trans( tao_yy_current_state )
-+tao_yy_state_type tao_yy_current_state;
-+#endif
-+        {
-+        register int tao_yy_is_jam;
-+        register char *tao_yy_cp = tao_yy_c_buf_p;
- 
--	return yy_is_jam ? 0 : yy_current_state;
--}
-+        register TAO_YY_CHAR tao_yy_c = 1;
-+        if ( tao_yy_accept[tao_yy_current_state] )
-+                {
-+                tao_yy_last_accepting_state = tao_yy_current_state;
-+                tao_yy_last_accepting_cpos = tao_yy_cp;
-+                }
-+        while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-+                {
-+                tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-+                if ( tao_yy_current_state >= 551 )
-+                        tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-+                }
-+        tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-+        tao_yy_is_jam = (tao_yy_current_state == 550);
-+
-+        return tao_yy_is_jam ? 0 : tao_yy_current_state;
-+        }
-+
-+
-+#ifndef TAO_YY_NO_UNPUT
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yyunput( int c, register char *tao_yy_bp )
-+#else
-+static void tao_yyunput( c, tao_yy_bp )
-+int c;
-+register char *tao_yy_bp;
-+#endif
-+        {
-+        register char *tao_yy_cp = tao_yy_c_buf_p;
-+
-+        /* undo effects of setting up tao_yytext */
-+        *tao_yy_cp = tao_yy_hold_char;
-+
-+        if ( tao_yy_cp < tao_yy_current_buffer->tao_yy_ch_buf + 2 )
-+                { /* need to shift things up to make room */
-+                /* +2 for EOB chars. */
-+                register int number_to_move = tao_yy_n_chars + 2;
-+                register char *dest = &tao_yy_current_buffer->tao_yy_ch_buf[
-+                                        tao_yy_current_buffer->tao_yy_buf_size + 2];
-+                register char *source =
-+                                &tao_yy_current_buffer->tao_yy_ch_buf[number_to_move];
-+
-+                while ( source > tao_yy_current_buffer->tao_yy_ch_buf )
-+                        *--dest = *--source;
-+
-+                tao_yy_cp += (int) (dest - source);
-+                tao_yy_bp += (int) (dest - source);
-+                tao_yy_current_buffer->tao_yy_n_chars =
-+                        tao_yy_n_chars = tao_yy_current_buffer->tao_yy_buf_size;
-+
-+                if ( tao_yy_cp < tao_yy_current_buffer->tao_yy_ch_buf + 2 )
-+                        TAO_YY_FATAL_ERROR( "flex scanner push-back overflow" );
-+                }
-+
-+        *--tao_yy_cp = (char) c;
-+
-+
-+        tao_yytext_ptr = tao_yy_bp;
-+        tao_yy_hold_char = *tao_yy_cp;
-+        tao_yy_c_buf_p = tao_yy_cp;
-+        }
-+#endif  /* ifndef TAO_YY_NO_UNPUT */
- 
--    static void yyunput (int c, register char * yy_bp )
--{
--	register char *yy_cp;
--    
--    yy_cp = (yy_c_buf_p);
--
--	/* undo effects of setting up yytext */
--	*yy_cp = (yy_hold_char);
--
--	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
--		{ /* need to shift things up to make room */
--		/* +2 for EOB chars. */
--		register int number_to_move = (yy_n_chars) + 2;
--		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
--					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
--		register char *source =
--				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
--
--		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
--			*--dest = *--source;
--
--		yy_cp += (int) (dest - source);
--		yy_bp += (int) (dest - source);
--		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
--			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
--
--		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
--			YY_FATAL_ERROR( "flex scanner push-back overflow" );
--		}
--
--	*--yy_cp = (char) c;
--
--	(yytext_ptr) = yy_bp;
--	(yy_hold_char) = *yy_cp;
--	(yy_c_buf_p) = yy_cp;
--}
- 
--#ifndef YY_NO_INPUT
- #ifdef __cplusplus
--    static int yyinput (void)
-+static int tao_yyinput()
- #else
--    static int input  (void)
-+static int input()
- #endif
-+        {
-+        int c;
- 
--{
--	int c;
--    
--	*(yy_c_buf_p) = (yy_hold_char);
--
--	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
--		{
--		/* yy_c_buf_p now points to the character we want to return.
--		 * If this occurs *before* the EOB characters, then it's a
--		 * valid NUL; if not, then we've hit the end of the buffer.
--		 */
--		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
--			/* This was really a NUL. */
--			*(yy_c_buf_p) = '\0';
--
--		else
--			{ /* need more input */
--			int offset = (yy_c_buf_p) - (yytext_ptr);
--			++(yy_c_buf_p);
--
--			switch ( yy_get_next_buffer(  ) )
--				{
--				case EOB_ACT_LAST_MATCH:
--					/* This happens because yy_g_n_b()
--					 * sees that we've accumulated a
--					 * token and flags that we need to
--					 * try matching the token before
--					 * proceeding.  But for input(),
--					 * there's no matching to consider.
--					 * So convert the EOB_ACT_LAST_MATCH
--					 * to EOB_ACT_END_OF_FILE.
--					 */
--
--					/* Reset buffer status. */
--					yyrestart(yyin );
--
--					/*FALLTHROUGH*/
--
--				case EOB_ACT_END_OF_FILE:
--					{
--					if ( yywrap( ) )
--						return EOF;
-+        *tao_yy_c_buf_p = tao_yy_hold_char;
-+
-+        if ( *tao_yy_c_buf_p == TAO_YY_END_OF_BUFFER_CHAR )
-+                {
-+                /* tao_yy_c_buf_p now points to the character we want to return.
-+                 * If this occurs *before* the EOB characters, then it's a
-+                 * valid NUL; if not, then we've hit the end of the buffer.
-+                 */
-+                if ( tao_yy_c_buf_p < &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] )
-+                        /* This was really a NUL. */
-+                        *tao_yy_c_buf_p = '\0';
-+
-+                else
-+                        { /* need more input */
-+                        int offset = tao_yy_c_buf_p - tao_yytext_ptr;
-+                        ++tao_yy_c_buf_p;
-+
-+                        switch ( tao_yy_get_next_buffer() )
-+                                {
-+                                case EOB_ACT_LAST_MATCH:
-+                                        /* This happens because tao_yy_g_n_b()
-+                                         * sees that we've accumulated a
-+                                         * token and flags that we need to
-+                                         * try matching the token before
-+                                         * proceeding.  But for input(),
-+                                         * there's no matching to consider.
-+                                         * So convert the EOB_ACT_LAST_MATCH
-+                                         * to EOB_ACT_END_OF_FILE.
-+                                         */
-+
-+                                        /* Reset buffer status. */
-+                                        tao_yyrestart( tao_yyin );
-+
-+                                        /* fall through */
-+
-+                                case EOB_ACT_END_OF_FILE:
-+                                        {
-+                                        if ( tao_yywrap() )
-+                                                return EOF;
- 
--					if ( ! (yy_did_buffer_switch_on_eof) )
--						YY_NEW_FILE;
-+                                        if ( ! tao_yy_did_buffer_switch_on_eof )
-+                                                TAO_YY_NEW_FILE;
- #ifdef __cplusplus
--					return yyinput();
-+                                        return tao_yyinput();
- #else
--					return input();
-+                                        return input();
- #endif
--					}
-+                                        }
- 
--				case EOB_ACT_CONTINUE_SCAN:
--					(yy_c_buf_p) = (yytext_ptr) + offset;
--					break;
--				}
--			}
--		}
-+                                case EOB_ACT_CONTINUE_SCAN:
-+                                        tao_yy_c_buf_p = tao_yytext_ptr + offset;
-+                                        break;
-+                                }
-+                        }
-+                }
- 
--	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
--	*(yy_c_buf_p) = '\0';	/* preserve yytext */
--	(yy_hold_char) = *++(yy_c_buf_p);
-+        c = *(unsigned char *) tao_yy_c_buf_p;  /* cast for 8-bit char's */
-+        *tao_yy_c_buf_p = '\0'; /* preserve tao_yytext */
-+        tao_yy_hold_char = *++tao_yy_c_buf_p;
- 
--	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
-+        tao_yy_current_buffer->tao_yy_at_bol = (c == '\n');
- 
--	return c;
--}
--#endif	/* ifndef YY_NO_INPUT */
-+        return c;
-+        }
- 
--/** Immediately switch to a different input stream.
-- * @param input_file A readable stream.
-- * 
-- * @note This function does not reset the start condition to @c INITIAL .
-- */
--    void yyrestart  (FILE * input_file )
--{
--    
--	if ( ! YY_CURRENT_BUFFER ){
--        yyensure_buffer_stack ();
--		YY_CURRENT_BUFFER_LVALUE =
--            yy_create_buffer(yyin,YY_BUF_SIZE );
--	}
- 
--	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
--	yy_load_buffer_state( );
--}
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yyrestart( FILE *input_file )
-+#else
-+void tao_yyrestart( input_file )
-+FILE *input_file;
-+#endif
-+        {
-+        if ( ! tao_yy_current_buffer )
-+                tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE );
- 
--/** Switch to a different input buffer.
-- * @param new_buffer The new input buffer.
-- * 
-- */
--    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
--{
--    
--	/* TODO. We should be able to replace this entire function body
--	 * with
--	 *		yypop_buffer_state();
--	 *		yypush_buffer_state(new_buffer);
--     */
--	yyensure_buffer_stack ();
--	if ( YY_CURRENT_BUFFER == new_buffer )
--		return;
--
--	if ( YY_CURRENT_BUFFER )
--		{
--		/* Flush out information for old buffer. */
--		*(yy_c_buf_p) = (yy_hold_char);
--		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
--		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
--		}
--
--	YY_CURRENT_BUFFER_LVALUE = new_buffer;
--	yy_load_buffer_state( );
--
--	/* We don't actually know whether we did this switch during
--	 * EOF (yywrap()) processing, but the only time this flag
--	 * is looked at is after yywrap() is called, so it's safe
--	 * to go ahead and always set it.
--	 */
--	(yy_did_buffer_switch_on_eof) = 1;
--}
-+        tao_yy_init_buffer( tao_yy_current_buffer, input_file );
-+        tao_yy_load_buffer_state();
-+        }
- 
--static void yy_load_buffer_state  (void)
--{
--    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
--	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
--	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
--	(yy_hold_char) = *(yy_c_buf_p);
--}
- 
--/** Allocate and initialize an input buffer state.
-- * @param file A readable stream.
-- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
-- * 
-- * @return the allocated buffer state.
-- */
--    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
--{
--	YY_BUFFER_STATE b;
--    
--	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
--	if ( ! b )
--		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
--
--	b->yy_buf_size = size;
--
--	/* yy_ch_buf has to be 2 characters longer than the size given because
--	 * we need to put in 2 end-of-buffer characters.
--	 */
--	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
--	if ( ! b->yy_ch_buf )
--		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_switch_to_buffer( TAO_YY_BUFFER_STATE new_buffer )
-+#else
-+void tao_yy_switch_to_buffer( new_buffer )
-+TAO_YY_BUFFER_STATE new_buffer;
-+#endif
-+        {
-+        if ( tao_yy_current_buffer == new_buffer )
-+                return;
- 
--	b->yy_is_our_buffer = 1;
-+        if ( tao_yy_current_buffer )
-+                {
-+                /* Flush out information for old buffer. */
-+                *tao_yy_c_buf_p = tao_yy_hold_char;
-+                tao_yy_current_buffer->tao_yy_buf_pos = tao_yy_c_buf_p;
-+                tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars;
-+                }
- 
--	yy_init_buffer(b,file );
-+        tao_yy_current_buffer = new_buffer;
-+        tao_yy_load_buffer_state();
- 
--	return b;
--}
-+        /* We don't actually know whether we did this switch during
-+         * EOF (tao_yywrap()) processing, but the only time this flag
-+         * is looked at is after tao_yywrap() is called, so it's safe
-+         * to go ahead and always set it.
-+         */
-+        tao_yy_did_buffer_switch_on_eof = 1;
-+        }
- 
--/** Destroy the buffer.
-- * @param b a buffer created with yy_create_buffer()
-- * 
-- */
--    void yy_delete_buffer (YY_BUFFER_STATE  b )
--{
--    
--	if ( ! b )
--		return;
- 
--	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
--		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_load_buffer_state( void )
-+#else
-+void tao_yy_load_buffer_state()
-+#endif
-+        {
-+        tao_yy_n_chars = tao_yy_current_buffer->tao_yy_n_chars;
-+        tao_yytext_ptr = tao_yy_c_buf_p = tao_yy_current_buffer->tao_yy_buf_pos;
-+        tao_yyin = tao_yy_current_buffer->tao_yy_input_file;
-+        tao_yy_hold_char = *tao_yy_c_buf_p;
-+        }
- 
--	if ( b->yy_is_our_buffer )
--		yyfree((void *) b->yy_ch_buf  );
- 
--	yyfree((void *) b  );
--}
-+#ifdef TAO_YY_USE_PROTOS
-+TAO_YY_BUFFER_STATE tao_yy_create_buffer( FILE *file, int size )
-+#else
-+TAO_YY_BUFFER_STATE tao_yy_create_buffer( file, size )
-+FILE *file;
-+int size;
-+#endif
-+        {
-+        TAO_YY_BUFFER_STATE b;
- 
--/* Initializes or reinitializes a buffer.
-- * This function is sometimes called more than once on the same buffer,
-- * such as during a yyrestart() or at EOF.
-- */
--    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-+        b = (TAO_YY_BUFFER_STATE) tao_yy_flex_alloc( sizeof( struct tao_yy_buffer_state ) );
-+        if ( ! b )
-+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
- 
--{
--	int oerrno = errno;
--    
--	yy_flush_buffer(b );
-+        b->tao_yy_buf_size = size;
- 
--	b->yy_input_file = file;
--	b->yy_fill_buffer = 1;
-+        /* tao_yy_ch_buf has to be 2 characters longer than the size given because
-+         * we need to put in 2 end-of-buffer characters.
-+         */
-+        b->tao_yy_ch_buf = (char *) tao_yy_flex_alloc( b->tao_yy_buf_size + 2 );
-+        if ( ! b->tao_yy_ch_buf )
-+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
- 
--    /* If b is the current buffer, then yy_init_buffer was _probably_
--     * called from yyrestart() or through yy_get_next_buffer.
--     * In that case, we don't want to reset the lineno or column.
--     */
--    if (b != YY_CURRENT_BUFFER){
--        b->yy_bs_lineno = 1;
--        b->yy_bs_column = 0;
--    }
-+        b->tao_yy_is_our_buffer = 1;
- 
--        b->yy_is_interactive = 0;
--    
--	errno = oerrno;
--}
-+        tao_yy_init_buffer( b, file );
- 
--/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
-- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
-- * 
-- */
--    void yy_flush_buffer (YY_BUFFER_STATE  b )
--{
--    	if ( ! b )
--		return;
-+        return b;
-+        }
- 
--	b->yy_n_chars = 0;
- 
--	/* We always need two end-of-buffer characters.  The first causes
--	 * a transition to the end-of-buffer state.  The second causes
--	 * a jam in that state.
--	 */
--	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
--	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_delete_buffer( TAO_YY_BUFFER_STATE b )
-+#else
-+void tao_yy_delete_buffer( b )
-+TAO_YY_BUFFER_STATE b;
-+#endif
-+        {
-+        if ( ! b )
-+                return;
- 
--	b->yy_buf_pos = &b->yy_ch_buf[0];
-+        if ( b == tao_yy_current_buffer )
-+                tao_yy_current_buffer = (TAO_YY_BUFFER_STATE) 0;
- 
--	b->yy_at_bol = 1;
--	b->yy_buffer_status = YY_BUFFER_NEW;
-+        if ( b->tao_yy_is_our_buffer )
-+                tao_yy_flex_free( (void *) b->tao_yy_ch_buf );
- 
--	if ( b == YY_CURRENT_BUFFER )
--		yy_load_buffer_state( );
--}
-+        tao_yy_flex_free( (void *) b );
-+        }
- 
--/** Pushes the new state onto the stack. The new state becomes
-- *  the current state. This function will allocate the stack
-- *  if necessary.
-- *  @param new_buffer The new state.
-- *  
-- */
--void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
--{
--    	if (new_buffer == NULL)
--		return;
--
--	yyensure_buffer_stack();
--
--	/* This block is copied from yy_switch_to_buffer. */
--	if ( YY_CURRENT_BUFFER )
--		{
--		/* Flush out information for old buffer. */
--		*(yy_c_buf_p) = (yy_hold_char);
--		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
--		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
--		}
--
--	/* Only push if top exists. Otherwise, replace top. */
--	if (YY_CURRENT_BUFFER)
--		(yy_buffer_stack_top)++;
--	YY_CURRENT_BUFFER_LVALUE = new_buffer;
--
--	/* copied from yy_switch_to_buffer. */
--	yy_load_buffer_state( );
--	(yy_did_buffer_switch_on_eof) = 1;
--}
- 
--/** Removes and deletes the top of the stack, if present.
-- *  The next element becomes the new top.
-- *  
-- */
--void yypop_buffer_state (void)
--{
--    	if (!YY_CURRENT_BUFFER)
--		return;
--
--	yy_delete_buffer(YY_CURRENT_BUFFER );
--	YY_CURRENT_BUFFER_LVALUE = NULL;
--	if ((yy_buffer_stack_top) > 0)
--		--(yy_buffer_stack_top);
--
--	if (YY_CURRENT_BUFFER) {
--		yy_load_buffer_state( );
--		(yy_did_buffer_switch_on_eof) = 1;
--	}
--}
-+#ifndef TAO_YY_ALWAYS_INTERACTIVE
-+#ifndef TAO_YY_NEVER_INTERACTIVE
-+extern int isatty TAO_YY_PROTO(( int ));
-+#endif
-+#endif
- 
--/* Allocates the stack if it does not exist.
-- *  Guarantees space for at least one push.
-- */
--static void yyensure_buffer_stack (void)
--{
--	int num_to_alloc;
--    
--	if (!(yy_buffer_stack)) {
--
--		/* First allocation is just for 2 elements, since we don't know if this
--		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
--		 * immediate realloc on the next call.
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_init_buffer( TAO_YY_BUFFER_STATE b, FILE *file )
-+#else
-+void tao_yy_init_buffer( b, file )
-+TAO_YY_BUFFER_STATE b;
-+FILE *file;
-+#endif
-+
-+
-+        {
-+        tao_yy_flush_buffer( b );
-+
-+        b->tao_yy_input_file = file;
-+        b->tao_yy_fill_buffer = 1;
-+
+ TAO_YY_RULE_SETUP
+ TAO_YY_ECHO;
+-	TAO_YY_BREAK
++	break;
+ case TAO_YY_STATE_EOF(INITIAL):
+ 	tao_yyterminate();
+@@ -2270,8 +2262,8 @@
+ 	b->tao_yy_fill_buffer = 1;
+ 
+-#if TAO_YY_ALWAYS_INTERACTIVE
 +#ifdef TAO_YY_ALWAYS_INTERACTIVE
-+        b->tao_yy_is_interactive = 1;
-+#else
+ 	b->tao_yy_is_interactive = 1;
+ #else
+-#if TAO_YY_NEVER_INTERACTIVE
 +#ifdef TAO_YY_NEVER_INTERACTIVE
-+        b->tao_yy_is_interactive = 0;
-+#else
-+        b->tao_yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-+#endif
-+#endif
-+        }
-+
-+
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_flush_buffer( TAO_YY_BUFFER_STATE b )
-+#else
-+void tao_yy_flush_buffer( b )
-+TAO_YY_BUFFER_STATE b;
-+#endif
-+
-+        {
-+        if ( ! b )
-+                return;
-+
-+        b->tao_yy_n_chars = 0;
-+
-+        /* We always need two end-of-buffer characters.  The first causes
-+         * a transition to the end-of-buffer state.  The second causes
-+         * a jam in that state.
-          */
--		num_to_alloc = 1;
--		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
--								(num_to_alloc * sizeof(struct yy_buffer_state*)
--								);
--		
--		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
--				
--		(yy_buffer_stack_max) = num_to_alloc;
--		(yy_buffer_stack_top) = 0;
--		return;
--	}
--
--	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
--
--		/* Increase the buffer to prepare for a possible push. */
--		int grow_size = 8 /* arbitrary grow size */;
--
--		num_to_alloc = (yy_buffer_stack_max) + grow_size;
--		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
--								((yy_buffer_stack),
--								num_to_alloc * sizeof(struct yy_buffer_state*)
--								);
--
--		/* zero only the new slots.*/
--		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
--		(yy_buffer_stack_max) = num_to_alloc;
--	}
--}
-+        b->tao_yy_ch_buf[0] = TAO_YY_END_OF_BUFFER_CHAR;
-+        b->tao_yy_ch_buf[1] = TAO_YY_END_OF_BUFFER_CHAR;
- 
--/** Setup the input buffer state to scan directly from a user-specified character buffer.
-- * @param base the character buffer
-- * @param size the size in bytes of the character buffer
-- * 
-- * @return the newly allocated buffer state object. 
-- */
--YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
--{
--	YY_BUFFER_STATE b;
--    
--	if ( size < 2 ||
--	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
--	     base[size-1] != YY_END_OF_BUFFER_CHAR )
--		/* They forgot to leave room for the EOB's. */
--		return 0;
--
--	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
--	if ( ! b )
--		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
--
--	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
--	b->yy_buf_pos = b->yy_ch_buf = base;
--	b->yy_is_our_buffer = 0;
--	b->yy_input_file = 0;
--	b->yy_n_chars = b->yy_buf_size;
--	b->yy_is_interactive = 0;
--	b->yy_at_bol = 1;
--	b->yy_fill_buffer = 0;
--	b->yy_buffer_status = YY_BUFFER_NEW;
-+        b->tao_yy_buf_pos = &b->tao_yy_ch_buf[0];
- 
--	yy_switch_to_buffer(b  );
-+        b->tao_yy_at_bol = 1;
-+        b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
- 
--	return b;
--}
-+        if ( b == tao_yy_current_buffer )
-+                tao_yy_load_buffer_state();
-+        }
- 
--/** Setup the input buffer state to scan a string. The next call to yylex() will
-- * scan from a @e copy of @a str.
-- * @param str a NUL-terminated string to scan
-- * 
-- * @return the newly allocated buffer state object.
-- * @note If you want to scan bytes that may contain NUL values, then use
-- *       yy_scan_bytes() instead.
-- */
--YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
--{
--    
--	return yy_scan_bytes(yy_str,strlen(yy_str) );
--}
- 
--/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
-- * scan from a @e copy of @a bytes.
-- * @param bytes the byte buffer to scan
-- * @param len the number of bytes in the buffer pointed to by @a bytes.
-- * 
-- * @return the newly allocated buffer state object.
-- */
--YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
--{
--	YY_BUFFER_STATE b;
--	char *buf;
--	yy_size_t n;
--	int i;
--    
--	/* Get memory for full buffer, including space for trailing EOB's. */
--	n = len + 2;
--	buf = (char *) yyalloc(n  );
--	if ( ! buf )
--		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
--
--	for ( i = 0; i < len; ++i )
--		buf[i] = bytes[i];
--
--	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
--
--	b = yy_scan_buffer(buf,n );
--	if ( ! b )
--		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
--
--	/* It's okay to grow etc. this buffer, and we should throw it
--	 * away when we're done.
--	 */
--	b->yy_is_our_buffer = 1;
-+#ifndef TAO_YY_NO_SCAN_BUFFER
-+#ifdef TAO_YY_USE_PROTOS
-+TAO_YY_BUFFER_STATE tao_yy_scan_buffer( char *base, tao_yy_size_t size )
-+#else
-+TAO_YY_BUFFER_STATE tao_yy_scan_buffer( base, size )
-+char *base;
-+tao_yy_size_t size;
-+#endif
-+        {
-+        TAO_YY_BUFFER_STATE b;
-+
-+        if ( size < 2 ||
-+             base[size-2] != TAO_YY_END_OF_BUFFER_CHAR ||
-+             base[size-1] != TAO_YY_END_OF_BUFFER_CHAR )
-+                /* They forgot to leave room for the EOB's. */
-+                return 0;
- 
--	return b;
--}
-+        b = (TAO_YY_BUFFER_STATE) tao_yy_flex_alloc( sizeof( struct tao_yy_buffer_state ) );
-+        if ( ! b )
-+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_buffer()" );
- 
--#ifndef YY_EXIT_FAILURE
--#define YY_EXIT_FAILURE 2
-+        b->tao_yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
-+        b->tao_yy_buf_pos = b->tao_yy_ch_buf = base;
-+        b->tao_yy_is_our_buffer = 0;
-+        b->tao_yy_input_file = 0;
-+        b->tao_yy_n_chars = b->tao_yy_buf_size;
-+        b->tao_yy_is_interactive = 0;
-+        b->tao_yy_at_bol = 1;
-+        b->tao_yy_fill_buffer = 0;
-+        b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
-+
-+        tao_yy_switch_to_buffer( b );
-+
-+        return b;
-+        }
- #endif
- 
--static void yy_fatal_error (yyconst char* msg )
--{
--    	(void) fprintf( stderr, "%s\n", msg );
--	exit( YY_EXIT_FAILURE );
--}
- 
--/* Redefine yyless() so it works in section 3 code. */
-+#ifndef TAO_YY_NO_SCAN_STRING
-+#ifdef TAO_YY_USE_PROTOS
-+TAO_YY_BUFFER_STATE tao_yy_scan_string( tao_yyconst char *tao_yy_str )
-+#else
-+TAO_YY_BUFFER_STATE tao_yy_scan_string( tao_yy_str )
-+tao_yyconst char *tao_yy_str;
-+#endif
-+        {
-+        int len;
-+        for ( len = 0; tao_yy_str[len]; ++len )
-+                ;
- 
--#undef yyless
--#define yyless(n) \
--	do \
--		{ \
--		/* Undo effects of setting up yytext. */ \
--        int yyless_macro_arg = (n); \
--        YY_LESS_LINENO(yyless_macro_arg);\
--		yytext[yyleng] = (yy_hold_char); \
--		(yy_c_buf_p) = yytext + yyless_macro_arg; \
--		(yy_hold_char) = *(yy_c_buf_p); \
--		*(yy_c_buf_p) = '\0'; \
--		yyleng = yyless_macro_arg; \
--		} \
--	while ( 0 )
--
--/* Accessor  methods (get/set functions) to struct members. */
-+        return tao_yy_scan_bytes( tao_yy_str, len );
-+        }
-+#endif
- 
--/** Get the current line number.
-- * 
-- */
--int yyget_lineno  (void)
--{
--        
--    return yylineno;
--}
- 
--/** Get the input stream.
-- * 
-- */
--FILE *yyget_in  (void)
--{
--        return yyin;
--}
-+#ifndef TAO_YY_NO_SCAN_BYTES
-+#ifdef TAO_YY_USE_PROTOS
-+TAO_YY_BUFFER_STATE tao_yy_scan_bytes( tao_yyconst char *bytes, int len )
-+#else
-+TAO_YY_BUFFER_STATE tao_yy_scan_bytes( bytes, len )
-+tao_yyconst char *bytes;
-+int len;
-+#endif
-+        {
-+        TAO_YY_BUFFER_STATE b;
-+        char *buf;
-+        tao_yy_size_t n;
-+        int i;
- 
--/** Get the output stream.
-- * 
-- */
--FILE *yyget_out  (void)
--{
--        return yyout;
--}
-+        /* Get memory for full buffer, including space for trailing EOB's. */
-+        n = len + 2;
-+        buf = (char *) tao_yy_flex_alloc( n );
-+        if ( ! buf )
-+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_bytes()" );
-+
-+        for ( i = 0; i < len; ++i )
-+                buf[i] = bytes[i];
-+
-+        buf[len] = buf[len+1] = TAO_YY_END_OF_BUFFER_CHAR;
-+
-+        b = tao_yy_scan_buffer( buf, n );
-+        if ( ! b )
-+                TAO_YY_FATAL_ERROR( "bad buffer in tao_yy_scan_bytes()" );
- 
--/** Get the length of the current token.
-- * 
-- */
--int yyget_leng  (void)
--{
--        return yyleng;
--}
-+        /* It's okay to grow etc. this buffer, and we should throw it
-+         * away when we're done.
-+         */
-+        b->tao_yy_is_our_buffer = 1;
- 
--/** Get the current token.
-- * 
-- */
-+        return b;
-+        }
-+#endif
- 
--char *yyget_text  (void)
--{
--        return yytext;
--}
- 
--/** Set the current line number.
-- * @param line_number
-- * 
-- */
--void yyset_lineno (int  line_number )
--{
--    
--    yylineno = line_number;
--}
-+#ifndef TAO_YY_NO_PUSH_STATE
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yy_push_state( int new_state )
-+#else
-+static void tao_yy_push_state( new_state )
-+int new_state;
-+#endif
-+        {
-+        if ( tao_yy_start_stack_ptr >= tao_yy_start_stack_depth )
-+                {
-+                tao_yy_size_t new_size;
- 
--/** Set the input stream. This does not discard the current
-- * input buffer.
-- * @param in_str A readable stream.
-- * 
-- * @see yy_switch_to_buffer
-- */
--void yyset_in (FILE *  in_str )
--{
--        yyin = in_str ;
--}
-+                tao_yy_start_stack_depth += TAO_YY_START_STACK_INCR;
-+                new_size = tao_yy_start_stack_depth * sizeof( int );
- 
--void yyset_out (FILE *  out_str )
--{
--        yyout = out_str ;
--}
-+                if ( ! tao_yy_start_stack )
-+                        tao_yy_start_stack = (int *) tao_yy_flex_alloc( new_size );
- 
--int yyget_debug  (void)
--{
--        return yy_flex_debug;
--}
-+                else
-+                        tao_yy_start_stack = (int *) tao_yy_flex_realloc(
-+                                        (void *) tao_yy_start_stack, new_size );
- 
--void yyset_debug (int  bdebug )
--{
--        yy_flex_debug = bdebug ;
--}
-+                if ( ! tao_yy_start_stack )
-+                        TAO_YY_FATAL_ERROR(
-+                        "out of memory expanding start-condition stack" );
-+                }
- 
--/* yylex_destroy is for both reentrant and non-reentrant scanners. */
--int yylex_destroy  (void)
--{
--    
--    /* Pop the buffer stack, destroying each element. */
--	while(YY_CURRENT_BUFFER){
--		yy_delete_buffer(YY_CURRENT_BUFFER  );
--		YY_CURRENT_BUFFER_LVALUE = NULL;
--		yypop_buffer_state();
--	}
--
--	/* Destroy the stack itself. */
--	yyfree((yy_buffer_stack) );
--	(yy_buffer_stack) = NULL;
-+        tao_yy_start_stack[tao_yy_start_stack_ptr++] = TAO_YY_START;
- 
--    return 0;
--}
-+        BEGIN(new_state);
-+        }
-+#endif
- 
--/*
-- * Internal utility routines.
-- */
- 
--#ifndef yytext_ptr
--static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
--{
--	register int i;
--    	for ( i = 0; i < n; ++i )
--		s1[i] = s2[i];
--}
-+#ifndef TAO_YY_NO_POP_STATE
-+static void tao_yy_pop_state()
-+        {
-+        if ( --tao_yy_start_stack_ptr < 0 )
-+                TAO_YY_FATAL_ERROR( "start-condition stack underflow" );
-+
-+        BEGIN(tao_yy_start_stack[tao_yy_start_stack_ptr]);
-+        }
- #endif
- 
--#ifdef YY_NEED_STRLEN
--static int yy_flex_strlen (yyconst char * s )
--{
--	register int n;
--    	for ( n = 0; s[n]; ++n )
--		;
- 
--	return n;
--}
-+#ifndef TAO_YY_NO_TOP_STATE
-+static int tao_yy_top_state()
-+        {
-+        return tao_yy_start_stack[tao_yy_start_stack_ptr - 1];
-+        }
- #endif
- 
--void *yyalloc (yy_size_t  size )
--{
--	return (void *) malloc( size );
--}
-+#ifndef TAO_YY_EXIT_FAILURE
-+#define TAO_YY_EXIT_FAILURE 2
-+#endif
- 
--void *yyrealloc  (void * ptr, yy_size_t  size )
--{
--	/* The cast to (char *) in the following accommodates both
--	 * implementations that use char* generic pointers, and those
--	 * that use void* generic pointers.  It works with the latter
--	 * because both ANSI C and C++ allow castless assignment from
--	 * any pointer type to void*, and deal with argument conversions
--	 * as though doing an assignment.
--	 */
--	return (void *) realloc( (char *) ptr, size );
--}
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yy_fatal_error( tao_yyconst char msg[] )
-+#else
-+static void tao_yy_fatal_error( msg )
-+char msg[];
-+#endif
-+        {
-+        (void) fprintf( stderr, "%s\n", msg );
-+        exit( TAO_YY_EXIT_FAILURE );
-+        }
- 
--void yyfree (void * ptr )
--{
--	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
--}
- 
--#define YYTABLES_NAME "yytables"
- 
--#undef YY_NEW_FILE
--#undef YY_FLUSH_BUFFER
--#undef yy_set_bol
--#undef yy_new_buffer
--#undef yy_set_interactive
--#undef yytext_ptr
--#undef YY_DO_BEFORE_ACTION
--
--#ifdef YY_DECL_IS_OURS
--#undef YY_DECL_IS_OURS
--#undef YY_DECL
-+/* Redefine tao_yyless() so it works in section 3 code. */
-+
-+#undef tao_yyless
-+#define tao_yyless(n) \
-+        do \
-+                { \
-+                /* Undo effects of setting up tao_yytext. */ \
-+                tao_yytext[tao_yyleng] = tao_yy_hold_char; \
-+                tao_yy_c_buf_p = tao_yytext + n; \
-+                tao_yy_hold_char = *tao_yy_c_buf_p; \
-+                *tao_yy_c_buf_p = '\0'; \
-+                tao_yyleng = n; \
-+                } \
-+        while ( 0 )
-+
-+
-+/* Internal utility routines. */
-+
-+#ifndef tao_yytext_ptr
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yy_flex_strncpy( char *s1, tao_yyconst char *s2, int n )
-+#else
-+static void tao_yy_flex_strncpy( s1, s2, n )
-+char *s1;
-+tao_yyconst char *s2;
-+int n;
-+#endif
-+        {
-+        register int i;
-+        for ( i = 0; i < n; ++i )
-+                s1[i] = s2[i];
-+        }
- #endif
+ 	b->tao_yy_is_interactive = 0;
+ #else
+@@ -2564,5 +2541,5 @@
+ 	}
  
--	/* subroutines */
-+#ifdef TAO_YY_NEED_STRLEN
-+#ifdef TAO_YY_USE_PROTOS
-+static int tao_yy_flex_strlen( tao_yyconst char *s )
-+#else
-+static int tao_yy_flex_strlen( s )
-+tao_yyconst char *s;
-+#endif
-+        {
-+        register int n;
-+        for ( n = 0; s[n]; ++n )
-+                ;
-+
-+        return n;
-+        }
-+#endif
-+
-+
-+#ifdef TAO_YY_USE_PROTOS
-+static void *tao_yy_flex_alloc( tao_yy_size_t size )
-+#else
-+static void *tao_yy_flex_alloc( size )
-+tao_yy_size_t size;
-+#endif
-+        {
-+        return (void *) malloc( size );
-+        }
-+
-+#ifdef TAO_YY_USE_PROTOS
-+static void *tao_yy_flex_realloc( void *ptr, tao_yy_size_t size )
-+#else
-+static void *tao_yy_flex_realloc( ptr, size )
-+void *ptr;
-+tao_yy_size_t size;
-+#endif
-+        {
-+        /* The cast to (char *) in the following accommodates both
-+         * implementations that use char* generic pointers, and those
-+         * that use void* generic pointers.  It works with the latter
-+         * because both ANSI C and C++ allow castless assignment from
-+         * any pointer type to void*, and deal with argument conversions
-+         * as though doing an assignment.
-+         */
-+        return (void *) realloc( (char *) ptr, size );
-+        }
-+
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yy_flex_free( void *ptr )
-+#else
-+static void tao_yy_flex_free( ptr )
-+void *ptr;
-+#endif
-+        {
-+        free( ptr );
-+        }
-+
+-#if TAO_YY_MAIN
 +#ifdef TAO_YY_MAIN
-+int main()
-+        {
-+        tao_yylex();
-+        return 0;
-+        }
-+#endif
-+
-+        /* subroutines */
- 
- // Parse a #line statement generated by the C preprocessor
- static void
-@@ -2813,10 +2648,10 @@
-         {
-           if (h[j] == '\\' && h[j + 1] == '\\')
-             {
--	            j++;
-+                    j++;
-             }
- 
--	        h[i] = h[j];
-+                h[i] = h[j];
-         }
- 
-       h[i] = '\0';
-@@ -2845,7 +2680,7 @@
- 
-   // Strip off any command line -I prefix that may have been added
-   // by the preprocessor.
--  if (!(idl_global->in_main_file ()) && idl_global->import ()) 
-+  if (!(idl_global->in_main_file ()) && idl_global->import ())
-     {
-       ACE_NEW (
-           nm,
-@@ -2957,7 +2792,7 @@
-           ext_id.set (idl_global->filename ()->get_string (),
-                       0);
-           char *int_id = ACE::strnew (new_prefix);
--          (void) idl_global->file_prefixes ().rebind (ext_id, 
-+          (void) idl_global->file_prefixes ().rebind (ext_id,
-                                                       int_id);
-         }
-     }
-@@ -2992,7 +2827,7 @@
-           len = ACE_OS::strlen (number);
-         }
- 
--      // This call adds a proper null terminator to tmp, so no need to 
-+      // This call adds a proper null terminator to tmp, so no need to
-       // do it here.
-       AST_Decl *d = idl_find_node (tmp);
- 
-@@ -3009,7 +2844,7 @@
- 
-       d->version (ACE::strnew (number));
-     }
--  else if (ACE_OS::strncmp (buf + 8, "ident", 5) == 0) 
-+  else if (ACE_OS::strncmp (buf + 8, "ident", 5) == 0)
-     {
-       idl_global->ident_string (buf + 8);
-     }
-@@ -3039,7 +2874,7 @@
-                                                   new_id);
-               return;
-             }
--            
-+
-           d->repoID (new_id);
-           d->typeid_set (I_TRUE);
-         }
-@@ -3137,24 +2972,24 @@
-   double e, k;
-   long neg = 0, negexp = 0;
- 
--  if (*s == '-') 
-+  if (*s == '-')
-     {
-       neg = 1;
-       s++;
-     }
- 
--  while (*s >= '0' && *s <= '9') 
-+  while (*s >= '0' && *s <= '9')
-     {
-       d = (d * 10) + *s - '0';
-       s++;
-     }
- 
--  if (*s == '.') 
-+  if (*s == '.')
-     {
-       s++;
-       e = 10;
- 
--      while (*s >= '0' && *s <= '9') 
-+      while (*s >= '0' && *s <= '9')
-         {
-           d += (*s - '0') / (e * 1.0);
-           e *= 10;
-@@ -3162,15 +2997,15 @@
-         }
-     }
- 
--  if (*s == 'e' || *s == 'E') 
-+  if (*s == 'e' || *s == 'E')
-     {
-       s++;
- 
--      if (*s == '-') 
-+      if (*s == '-')
-         {
-             negexp = 1;
-             s++;
--        } 
-+        }
-       else if (*s == '+')
-         {
-           s++;
-@@ -3178,13 +3013,13 @@
- 
-       e = 0;
- 
--      while (*s >= '0' && *s <= '9') 
-+      while (*s >= '0' && *s <= '9')
-         {
-           e = (e * 10) + *s - '0';
-           s++;
-         }
- 
--      if (e > 0) 
-+      if (e > 0)
-         {
-           for (k = 1; e > 0; k *= 10, e--);
- 
-@@ -3199,7 +3034,7 @@
-         }
-     }
- 
--  if (neg) 
-+  if (neg)
-     {
-       d *= -1.0;
-     }
-@@ -3215,74 +3050,74 @@
-     char *str
-   )
- {
--  if (str[0] != '\\') 
-+  if (str[0] != '\\')
-     {
--	    return str[0];
-+            return str[0];
-     }
- 
--  switch (str[1]) 
-+  switch (str[1])
-   {
-     case 'n':
--      return '\n';
-+            return '\n';
-     case 't':
--      return '\t';
-+            return '\t';
-     case 'v':
--      return '\v';
-+            return '\v';
-     case 'b':
--      return '\b';
-+            return '\b';
-     case 'r':
--      return '\r';
-+            return '\r';
-     case 'f':
--      return '\f';
-+            return '\f';
-     case 'a':
--      return '\a';
-+            return '\a';
-     case '\\':
--      return '\\';
-+            return '\\';
-     case '\?':
--      return '?';
-+            return '?';
-     case '\'':
--      return '\'';
-+            return '\'';
-     case '"':
--      return '"';
-+            return '"';
-     case 'x':
--      {
--        int i;
-+            {
-+              int i;
- 
--        // hex value
--        for (i = 2; str[i] != '\0' && isxdigit (str[i]); ++i) 
-+              // hex value
-+              for (i = 2; str[i] != '\0' && isxdigit(str[i]); ++i)
-           {
--	     continue;
--	  }
-+                        continue;
-+                }
- 
--        char save = str[i];
--        str[i] = '\0';
--        char out = (char)idl_atoui(&str[2], 16);
--        str[i] = save;
--        return out;
--      }
--      ACE_NOTREACHED (break;)
-+              char save = str[i];
-+              str[i] = '\0';
-+              char out = (char)idl_atoui(&str[2], 16);
-+              str[i] = save;
-+              return out;
-+            }
-+            ACE_NOTREACHED (break;)
-     default:
--      // check for octal value
--      if (str[1] >= '0' && str[1] <= '7') 
-+            // check for octal value
-+            if (str[1] >= '0' && str[1] <= '7')
-         {
-- 	  int i;
-+                int i;
- 
--	  for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i) 
-+                for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i)
-             {
--	      continue;
--	    }
-+                          continue;
-+                  }
- 
--	  char save = str[i];
--	  str[i] = '\0';
--	  char out = (char)idl_atoui(&str[1], 8);
--	  str[i] = save;
--	  return out;
--	} 
--      else 
--        {
--	  return str[1] - 'a';
--	}
--      ACE_NOTREACHED  (break;)
-+                char save = str[i];
-+                str[i] = '\0';
-+                char out = (char)idl_atoui(&str[1], 8);
-+                str[i] = save;
-+                return out;
-+              }
-+      else
-+        {
-+                return str[1] - 'a';
-+              }
-+            ACE_NOTREACHED  (break;)
-   }
- }
- /*
-@@ -3302,6 +3137,7 @@
-     {
-       continue;
-     }
-+
-   char save = str[i];
-   str[i] = '\0';
-   ACE_CDR::WChar out = (ACE_CDR::WChar) idl_atoui (&str[2], 16);
-@@ -3425,4 +3261,3 @@
- 
-   return d;
- }
--
+ int main()
+ 	{
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 493280ecb2b..11575f7573d 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -6769,6 +6769,14 @@ tao_yyreduce:
               ud.impl = interface_type;
               ud.is_multiple = tao_yyvsp[-2].bval;
               c->uses ().enqueue_tail (ud);
+              
+              if (ud.is_multiple == I_TRUE)
+                {
+                  // These datatypes must be created in the
+                  // front end so they can be looked up
+                  // when compiling the generated executor IDL.
+                  idl_global->create_uses_multiple_stuff (c, ud);
+                }
             }
         }
     break;
diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h
index 675d79f1815..87a09901031 100644
--- a/TAO/TAO_IDL/include/ast_component.h
+++ b/TAO/TAO_IDL/include/ast_component.h
@@ -24,14 +24,6 @@ public:
   // This also calls the base class version.
   virtual void redefine (AST_Interface *from);
 
-  // Extend lookup to the base component.
-  virtual AST_Decl *look_in_inherited (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
-                                       
-  // Extend lookup to the supported interfaces.
-  virtual AST_Decl *look_in_supported (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
-                                       
   // Utility data structure for port declarations.
   struct port_description
   {
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 2c0c017ee36..76b1dfaa804 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -110,7 +110,6 @@ public:
   // @@ (JP) I added these to get the ~ operator to work with all the
   // relevant aritmetic types, but eventually, we should get rid of
   // this whole enum.
-      , EK_bool
       , EK_short
       , EK_ushort
       , EK_long
@@ -286,7 +285,7 @@ public:
 
 protected:
   // Evaluate different sets of operators.
-  AST_ExprValue *eval_bin_op (void);
+  AST_ExprValue *eval_bin_op (EvalKind ek);
 
   AST_ExprValue *eval_bit_op (EvalKind ek);
 
diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h
index 1bf5818b68c..f68276c7adc 100644
--- a/TAO/TAO_IDL/include/ast_home.h
+++ b/TAO/TAO_IDL/include/ast_home.h
@@ -27,14 +27,6 @@ public:
 
   virtual ~AST_Home (void);
 
-  // Extend lookup to the base home.
-  virtual AST_Decl *look_in_inherited (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
-
-  // Extend lookup to the supported interfaces.
-  virtual AST_Decl *look_in_supported (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
-                                       
   // Accessors.
 
   AST_Home *base_home (void) const;
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index 8aeb582807e..5696d39a464 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -126,9 +126,6 @@ public:
   // and check if there is such a clash among the parents
   virtual idl_bool redef_clash (void);
 
-  // Look through inherited interfaces.
-  virtual AST_Decl *look_in_inherited (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
   // Cleanup function.
   virtual void destroy (void);
 
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index 88f33844aea..69d53f9df6e 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -108,11 +108,6 @@ public:
   int be_add_interface (AST_Interface *i,
                         AST_Interface *ix = 0);
 
-  // Has this node been referenced here already?
-  // Override of method in UTL_Scope.
-  virtual idl_bool referenced (AST_Decl *e,
-                               Identifier *id = 0);
-
   // Add decls from previous opening of this module to the
   // 'previous' set of this module, along with the argument's
   // own 'previous' set.
diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h
index 2aa0a8de653..4090d3d453d 100644
--- a/TAO/TAO_IDL/include/ast_valuetype.h
+++ b/TAO/TAO_IDL/include/ast_valuetype.h
@@ -43,10 +43,6 @@ public:
   virtual idl_bool will_have_factory (void);
   // Called from y.tab.cpp to set the factory decl seen bit.
 
-  // Look up a scoped name in the supported interface list.
-  virtual AST_Decl *look_in_supported (UTL_ScopedName *,
-                                       idl_bool treat_as_ref);
-                                       
   // Cleanup function.
   virtual void destroy (void);
 
diff --git a/TAO/TAO_IDL/include/idl_defines.h b/TAO/TAO_IDL/include/idl_defines.h
index ddc497d86a2..e6395d1f3e2 100644
--- a/TAO/TAO_IDL/include/idl_defines.h
+++ b/TAO/TAO_IDL/include/idl_defines.h
@@ -67,8 +67,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _IDL_DEFINES_IDL_DEFINES_HH
 #define _IDL_DEFINES_IDL_DEFINES_HH
 
-#include "ace/os_include/os_limits.h"
-
 /*
  * idl_defines.hh - Defines global compiler flags
  */
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index e0cb760293e..39ac2a0cb32 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -463,6 +463,12 @@ public:
   virtual const char *ident_string (void) const;
   // Get the value of the #ident string.
 
+  virtual void obv_support (idl_bool);
+  // set enable/disable OBV (Valuetype) support
+
+  virtual idl_bool obv_support (void);
+  // check if OBV (Valuetype) support is enabled
+
   virtual void case_diff_error (idl_bool);
   // report an error (1) for indentifiers in the same scope
   // that differ only by case, or report a warning (0).
@@ -529,11 +535,12 @@ public:
 
   ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> &
   file_prefixes (void);
-  // Accessor for the IDL file prefix container.
+  // Accessor for the IDL keyword container.
   
-  idl_bool pass_orb_idl (void) const;
-  void pass_orb_idl (idl_bool val);
-  // Accessor for the pass_orb_idl_ member.
+  void create_uses_multiple_stuff (AST_Component *c,
+                                   AST_Component::port_description &pd);
+  // We must do this in the front end since the executor
+  // mapping IDL will have these data types.
   
   int check_gperf (void);
   // Currently called only from IDL backend, but could be useful elsewhere.
@@ -593,6 +600,9 @@ private:
   // Holds a string that begins with #ident, to be passed from the IDL
   // file to the generated files.
 
+  idl_bool obv_support_;
+  // Do we support OBV (Valuetype)?
+
   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?
@@ -620,9 +630,6 @@ private:
 
   ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> file_prefixes_;
   // Associates a prefix with a file.
-  
-  idl_bool pass_orb_idl_;
-  // Treat orb.idl like any other included IDL file.
 };
 
 
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index 5983c4ce49e..03741e30463 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -134,7 +134,6 @@ public:
     EIDL_UNDERSCORE,            // More than one leading underscore
     EIDL_EMPTY_MODULE,          // Empty modules not allowed in IDL.
     EIDL_BACK_END,              // Back end error
-    EIDL_ILLEGAL_INFIX,         // Illegal infix operator in expression
     EIDL_OK                     // No error
   };
 
@@ -227,10 +226,16 @@ public:
   void abstract_inheritance_error (UTL_ScopedName *v,
                                    UTL_ScopedName *i);
 
-  // Report an attempt to support more then one concrete type.
+  // Report an attempt to support more then one abstract type.
   void abstract_support_error (UTL_ScopedName *v,
                                UTL_ScopedName *i);
 
+  // Report a situation where a concrete interface was expected but we got
+  // something else instead. This most likely is a case in a supports
+  // or inheritance list.
+  void concrete_interface_expected (UTL_ScopedName *c,
+                                    UTL_ScopedName *i);
+
   // Report a situation where a non-local interface was expected but we got
   // something else instead. This most likely is a case in a supports
   // or inheritance list.
@@ -320,10 +325,6 @@ public:
   // Report back-end error
   void back_end (long lineno,
                  UTL_String *s);
-                 
-  // Report illegal infix operator error (they can be used
-  // only with integer, floating point or fixed point expressions.
-  void illegal_infix (void);
 };
 
 #endif           // _UTL_ERR_UTL_ERR_HH
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index b9d990d2b36..f8d4c067b00 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -291,17 +291,13 @@ protected:
   void add_to_local_types (AST_Decl *e);
 
   // Has this node been referenced here already?
-  virtual idl_bool referenced (AST_Decl *e,
-                               Identifier *id = 0);
+  idl_bool referenced (AST_Decl *e,
+                       Identifier *id = 0);
 
-  // Look up a scoped name in the inherited list.
+  // Look up a scoped name in the inherited interfaces of an
+  // interface.
   virtual AST_Decl *look_in_inherited (UTL_ScopedName *,
                                        idl_bool treat_as_ref);
-                                       
-  // Look up a scoped name in the supported interface list.
-  virtual AST_Decl *look_in_supported (UTL_ScopedName *,
-                                       idl_bool treat_as_ref);
-                                       
   // Lookup based on the local name.
   AST_Decl *lookup_for_add (AST_Decl *d,
                             idl_bool treat_as_ref);
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 51b2afc7e7c..98a9f56c6ff 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -199,8 +199,6 @@ error_string (UTL_Error::ErrorCode c)
       return "module must contain at least one declaration: ";
     case UTL_Error::EIDL_BACK_END:
       return "back end: ";
-    case UTL_Error::EIDL_ILLEGAL_INFIX:
-      return "illegal infix operator in expression";
   }
 
   return 0;
@@ -945,7 +943,26 @@ UTL_Error::abstract_support_error (UTL_ScopedName *v,
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
 
-// Report illegal component or home support of local interface.
+// Report illegal component or home support of abstract interface.
+void
+UTL_Error::concrete_interface_expected (UTL_ScopedName *c,
+                                        UTL_ScopedName *i)
+{
+  idl_error_header (EIDL_CANT_SUPPORT,
+                    idl_global->lineno (),
+                    idl_global->filename ());
+  ACE_ERROR ((LM_ERROR,
+              " component or home "));
+  c->dump (*ACE_DEFAULT_LOG_STREAM);
+  ACE_ERROR ((LM_ERROR,
+              " attempts to support an abstract interface: "));
+  i->dump (*ACE_DEFAULT_LOG_STREAM);
+  ACE_ERROR ((LM_ERROR,
+              "\n"));
+  idl_global->set_err_count (idl_global->err_count () + 1);
+}
+
+// Report illegal component or home support of abstract interface.
 void
 UTL_Error::unconstrained_interface_expected (UTL_ScopedName *c,
                                              UTL_ScopedName *i)
@@ -1339,19 +1356,6 @@ UTL_Error::back_end (long lineno,
   idl_error_header (EIDL_BACK_END,
                     lineno,
                     s);
-  ACE_ERROR ((LM_ERROR,
-              "\n"));
-  idl_global->set_err_count (idl_global->err_count () + 1);
-}
-
-void
-UTL_Error::illegal_infix (void)
-{
-  idl_error_header (EIDL_ILLEGAL_INFIX,
-                    idl_global->lineno (),
-                    idl_global->filename ());
-  ACE_ERROR ((LM_ERROR,
-              "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
 
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 008eae5be2c..2059501580e 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -179,11 +179,11 @@ IDL_GlobalData::IDL_GlobalData (void)
     gperf_path_ (0),
     temp_dir_ (0),
     ident_string_ (0),
+    obv_support_ (I_TRUE),
     case_diff_error_ (I_TRUE),
     nest_orb_ (I_FALSE),
     idl_flags_ (""),
-    preserve_cpp_keywords_ (I_TRUE),
-    pass_orb_idl_ (I_FALSE)
+    preserve_cpp_keywords_ (I_TRUE)
 {
   // Path for the perfect hash generator(gperf) program.
   // Default is $ACE_ROOT/bin/gperf unless ACE_GPERF is defined.
@@ -191,7 +191,6 @@ IDL_GlobalData::IDL_GlobalData (void)
   // in the environment.
   // Form the absolute pathname.
   char* ace_root = ACE_OS::getenv ("ACE_ROOT");
-  
   if (ace_root == 0)
     // This may not cause any problem if -g option is used to specify
     // the correct path for the  gperf program. Let us ignore this
@@ -981,6 +980,18 @@ IDL_GlobalData::ident_string (void) const
 }
 
 void
+IDL_GlobalData::obv_support (idl_bool val)
+{
+  this->obv_support_ = val;
+}
+
+idl_bool
+IDL_GlobalData::obv_support (void)
+{
+  return this->obv_support_;
+}
+
+void
 IDL_GlobalData::case_diff_error (idl_bool val)
 {
   this->case_diff_error_ = val;
@@ -1308,16 +1319,86 @@ IDL_GlobalData::file_prefixes (void)
   return this->file_prefixes_;
 }
 
-idl_bool
-IDL_GlobalData::pass_orb_idl (void) const
-{
-  return this->pass_orb_idl_;
-}
-
 void
-IDL_GlobalData::pass_orb_idl (idl_bool val)
+IDL_GlobalData::create_uses_multiple_stuff (
+    AST_Component *c,
+    AST_Component::port_description &pd
+  )
 {
-  this->pass_orb_idl_ = val;
+  ACE_CString struct_name (pd.id->get_string ());
+  struct_name += "Connection";
+  Identifier struct_id (struct_name.c_str ());
+  UTL_ScopedName sn (&struct_id, 0);
+  AST_Structure *connection =
+    idl_global->gen ()->create_structure (&sn, 0, 0);
+  struct_id.destroy ();
+
+  Identifier object_id ("objref");
+  UTL_ScopedName object_name (&object_id,
+                              0);
+  AST_Field *object_field =
+    idl_global->gen ()->create_field (pd.impl,
+                                      &object_name,
+                                      AST_Field::vis_NA);
+  (void) DeclAsScope (connection)->fe_add_field (object_field);
+  object_id.destroy ();
+
+  Identifier local_id ("Cookie");
+  UTL_ScopedName local_name (&local_id,
+                             0);
+  Identifier module_id ("Components");
+  UTL_ScopedName scoped_name (&module_id,
+                              &local_name);
+  AST_Decl *d = c->lookup_by_name (&scoped_name,
+                                   I_TRUE);
+  local_id.destroy ();
+  module_id.destroy ();
+
+  if (d == 0)
+    {
+      // This would happen if we haven't included Componennts.idl.
+      idl_global->err ()->lookup_error (&scoped_name);
+      return;
+    }
+
+  AST_ValueType *cookie = AST_ValueType::narrow_from_decl (d);
+
+  Identifier cookie_id ("ck");
+  UTL_ScopedName cookie_name (&cookie_id,
+                              0);
+  AST_Field *cookie_field =
+    idl_global->gen ()->create_field (cookie,
+                                      &cookie_name,
+                                      AST_Field::vis_NA);
+  (void) DeclAsScope (connection)->fe_add_field (cookie_field);
+  cookie_id.destroy ();
+
+  (void) c->fe_add_structure (connection);
+
+  ACE_UINT64 bound = 0;
+  AST_Expression *bound_expr =
+    idl_global->gen ()->create_expr (bound,
+                                     AST_Expression::EV_ulong);
+  AST_Sequence *sequence =
+    idl_global->gen ()->create_sequence (bound_expr,
+                                         connection,
+                                         0,
+                                         0,
+                                         0);
+
+  ACE_CString seq_string (pd.id->get_string ());
+  seq_string += "Connections";
+  Identifier seq_id (seq_string.c_str ());
+  UTL_ScopedName seq_name (&seq_id,
+                           0);
+  AST_Typedef *connections =
+    idl_global->gen ()->create_typedef (sequence,
+                                        &seq_name,
+                                        0,
+                                        0);
+  seq_id.destroy ();
+
+  (void) c->fe_add_typedef (connections);
 }
 
 // Return 0 on success, -1 failure. The <errno> corresponding to the
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 083cb626c64..b790d4070c7 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -1576,20 +1576,79 @@ UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et)
   return 0;
 }
 
-// Look through inherited list. Overridden in AST_Interface.
+// Look through inherited interfaces.
 AST_Decl *
-UTL_Scope::look_in_inherited (UTL_ScopedName *,
-                              idl_bool )
+UTL_Scope::look_in_inherited (UTL_ScopedName *e,
+                              idl_bool treat_as_ref)
 {
-  return 0;
-}
+  AST_Decl *d = 0;
+  AST_Decl *d_before = 0;
+  AST_Interface *i = AST_Interface::narrow_from_scope (this);
+  AST_Interface **is = 0;
+  long nis = -1;
 
-// Look through supported interface list. Overridden where necessary.
-AST_Decl *
-UTL_Scope::look_in_supported (UTL_ScopedName *,
-                              idl_bool)
-{
-  return 0;
+  // This scope is not an interface.
+  if (i == 0)
+    {
+      return 0;
+    }
+
+  // Can't look in an interface which was not yet defined.
+  if (!i->is_defined ())
+    {
+      idl_global->err ()->fwd_decl_lookup (i,
+                                           e);
+      return 0;
+    }
+
+  // OK, loop through inherited interfaces.
+
+  // (Don't leave the inheritance hierarchy, no module or global ...)
+  // Find all and report ambiguous results as error.
+
+  for (nis = i->n_inherits (), is = i->inherits (); nis > 0; nis--, is++)
+    {
+      d = (*is)->lookup_by_name (e,
+                                 treat_as_ref,
+                                 0 /* not in parent */);
+      if (d != 0)
+        {
+          if (d_before == 0)
+            {
+              // First result found.
+              d_before = d;
+            }
+          else
+            {
+              // Conflict against further results?
+              if (d != d_before)
+                {
+                  ACE_ERROR ((LM_ERROR,
+                              "warning in %s line %d: ",
+                              idl_global->filename ()->get_string (),
+                              idl_global->lineno ()));
+
+                  e->dump (*ACE_DEFAULT_LOG_STREAM);
+
+                  ACE_ERROR ((LM_ERROR,
+                              " is ambiguous in scope.\n"
+                              "Found "));
+
+                  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
+
+                  ACE_ERROR ((LM_ERROR,
+                              " and "));
+
+                  d_before->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
+
+                  ACE_ERROR ((LM_ERROR,
+                              ".\n"));
+                }
+            }
+        }
+    }
+
+  return d_before;
 }
 
 // Look up a String * in local scope only.
@@ -1620,11 +1679,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
   idl_bool in_corba =
     ACE_OS::strcmp (e->get_string (), "CORBA") == 0;
 
-  // Iterate over this scope. We need IK_both here for the legacy
-  // case where a recursive type is defined via an anonymous sequence.
-  // Looking up the anonymous sequence parameter succeeds only if
-  // references are included, since the decl for the (unfinished)
-  // enclosing type has not yet been added to the scope decls.
+  // Iterate over this scope.
   for (UTL_ScopeActiveIterator i (this, UTL_Scope::IK_both);
        !i.is_done ();
        i.next ())
@@ -1770,13 +1825,17 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
 
       if (d == 0)
         {
-          // A no-op unless d can inherit.
-          d = look_in_inherited (e, treat_as_ref);
-          
-          if (d == 0)
+
+          // Special case for scope which is an interface or value type.
+          // We have to look in the inherited interfaces as well.
+          // Look before parent scopes.
+          if (pd_scope_node_type == AST_Decl::NT_interface
+              || pd_scope_node_type == AST_Decl::NT_valuetype
+              || pd_scope_node_type == AST_Decl::NT_component
+              || pd_scope_node_type == AST_Decl::NT_eventtype)
             {
-              // A no-op unless d can support interfaces.
-              d = look_in_supported (e, treat_as_ref);
+              d = look_in_inherited (e,
+                                     treat_as_ref);
             }
 
           if ((d == 0) && in_parent && idl_global->err_count () == 0)
@@ -1847,6 +1906,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
         }
 
       // For the possible call to look_in_inherited() below.
+      AST_Decl::NodeType nt = d->node_type ();
       t = DeclAsScope (d);
 
       // OK, start of name is defined. Now loop doing local lookups
@@ -1865,9 +1925,10 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
       // up was inherited into that interface. The first call to
       // look_in_inherited() is this function only checks base classes
       // of the scope (interface) we started the lookup from.
-      if (d == 0)
+      if (d == 0 && nt == AST_Decl::NT_interface)
         {
-          d = t->look_in_inherited (sn, treat_as_ref);
+          d = t->look_in_inherited (sn,
+                                    treat_as_ref);
         }
 
       // If treat_as_ref is true and d is not 0, add d to
diff --git a/TAO/configure.ac b/TAO/configure.ac
index c3a870bd5eb..44fbdabdd0d 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -45,8 +45,8 @@ AC_CONFIG_MACRO_DIR([../m4])
 dnl Check what platform we are running on.
 AC_CANONICAL_TARGET([])
 
-dnl Initialize GNU Automake, and require Automake 1.9 or better.
-AM_INIT_AUTOMAKE([1.9])
+dnl Initialize GNU Automake, and require Automake 1.7 or better.
+AM_INIT_AUTOMAKE([1.7])
 
 
 dnl Add maintainer mode option to the option list.
@@ -151,14 +151,6 @@ AC_SUBST([TAO_BETA])
 
 AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE, false)
 
-AM_CONDITIONAL(BUILD_RT_CORBA, true)
-AM_CONDITIONAL(BUILD_CORBA_MESSAGING, true)
-AM_CONDITIONAL(BUILD_MINIMUM_CORBA, false)
-AM_CONDITIONAL(BUILD_INTERCEPTORS, true)
-AM_CONDITIONAL(BUILD_ACE_UUID, true)
-AM_CONDITIONAL(BUILD_AMI, true)
-AM_CONDITIONAL(BUILD_SSL, false)
-
 
 dnl
 dnl SECTION 16: AC_CONFIG_FILES([FILE...])
@@ -203,65 +195,6 @@ AC_CONFIG_FILES([
   orbsvcs/Time_Service/Makefile
   orbsvcs/Trading_Service/Makefile
   orbsvcs/orbsvcs/Makefile
-  orbsvcs/performance-tests/Makefile
-  orbsvcs/performance-tests/LoadBalancing/Makefile
-  orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile
-  orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile
-  orbsvcs/performance-tests/RTEvent/Makefile
-  orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile
-  orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
-  orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
-  orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile
-  orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
-  orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile
-  orbsvcs/performance-tests/RTEvent/lib/Makefile
-  orbsvcs/tests/Makefile
-  orbsvcs/tests/AVStreams/Makefile
-  orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
-  orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
-  orbsvcs/tests/AVStreams/Component_Switching/Makefile
-  orbsvcs/tests/AVStreams/Full_Profile/Makefile
-  orbsvcs/tests/AVStreams/Latency/Makefile
-  orbsvcs/tests/AVStreams/Modify_QoS/Makefile
-  orbsvcs/tests/AVStreams/Multicast/Makefile
-  orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
-  orbsvcs/tests/AVStreams/Multiple_Flows/Makefile
-  orbsvcs/tests/AVStreams/Pluggable/Makefile
-  orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile
-  orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
-  orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
-  orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile
-  orbsvcs/tests/Bug_1334_Regression/Makefile
-  orbsvcs/tests/Bug_1393_Regression/Makefile
-  orbsvcs/tests/Bug_1395_Regression/Makefile
-  orbsvcs/tests/Bug_1630_Regression/Makefile
-  orbsvcs/tests/Concurrency/Makefile
-  orbsvcs/tests/CosEvent/Makefile
-  orbsvcs/tests/CosEvent/Basic/Makefile
-  orbsvcs/tests/CosEvent/lib/Makefile
-  orbsvcs/tests/EC_Custom_Marshal/Makefile
-  orbsvcs/tests/EC_MT_Mcast/Makefile
-  orbsvcs/tests/EC_Mcast/Makefile
-  orbsvcs/tests/EC_Multiple/Makefile
-  orbsvcs/tests/EC_Throughput/Makefile
-  orbsvcs/tests/Event/Makefile
-  orbsvcs/tests/Event/Basic/Makefile
-  orbsvcs/tests/Event/Mcast/Makefile
-  orbsvcs/tests/Event/Mcast/Common/Makefile
-  orbsvcs/tests/Event/Mcast/Complex/Makefile
-  orbsvcs/tests/Event/Mcast/Simple/Makefile
-  orbsvcs/tests/Event/Mcast/Two_Way/Makefile
-  orbsvcs/tests/Event/Performance/Makefile
-  orbsvcs/tests/Event/lib/Makefile
-  orbsvcs/tests/FT_App/Makefile
-  orbsvcs/tests/FaultTolerance/Makefile
-  orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile
-  orbsvcs/tests/FaultTolerance/IOGR/Makefile
-  orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
-  orbsvcs/tests/FtRtEvent/Makefile
-  utils/Makefile
-  utils/catior/Makefile
-  utils/nslist/Makefile
  ])
 
 dnl Note that the "TAO_VERSION" in the message below is an M4 macro
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html
index 9879190f110..0ccd0c52522 100644
--- a/TAO/docs/ORBEndpoint.html
+++ b/TAO/docs/ORBEndpoint.html
@@ -174,7 +174,7 @@
     <P>
       where <CODE>1234</CODE> is the TCP port the endpoint will be
       opened on.  In this case, an endpoint will be opened on the
-      network interface associated with the hostname <CODE>foo2</CODE>
+      network interface associated with the hostname <CODE>foo1</CODE>
       on port <CODE>1234</CODE>.
     <P>
       Port <I>names</I> are also accepted.  For example, suppose a
@@ -190,7 +190,7 @@
     </BLOCKQUOTE>
     <P>
       Port numbers range from <CODE>0</CODE> (causes port to be chosen
-      by operating system) to <CODE>65355</CODE>.  Port numbers less
+      by operating system) to <CODE>65335</CODE>.  Port numbers less
       than <CODE>1024</CODE> on UNIX systems are considered
       privileged, and require super-user privileges to access them.
       Also be aware that some ports may already be in use by other
@@ -210,7 +210,8 @@
       interface detected by TAO.  The port for each opened endpoint
       will be chosen automatically.  The chosen port will be the same
       for all endpoints.  Each endpoint will be represented in
-      generated IOR as a separate profile.
+      generated IOR as a separate profile, or as an alternate address
+      within a single IOR profile (once IIOP 1.2 is supported).
     <P>
       Note that network interface detection only work on platforms
       that support this feature.  If network interface detection isn't
@@ -327,7 +328,6 @@
       <LI><CODE>-ORBEndpoint iiop://1.1@:1234</CODE>
       <LI><CODE>-ORBEndpoint iiop://1.1@,1.0@:1234,1.1@</CODE>
       <LI><CODE>-ORBEndpoint iiop://1.1@foo:2020/portspan=30</CODE>
-      <LI><CODE>-ORBEndpoint iiop://foo:2020 -ORBEndpoint iiop://foo:10020 </CODE> </CODE>
     </UL>
 
     <hr>
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index baa2dc38466..45077a56964 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -207,7 +207,7 @@ same host:
 % NameService.exe -ORBEndpoint iiop://localhost:12345
 </code></p>
 <p><code>
-% client.exe -ORBInitRef NameService=iiop://localhost:12345
+% client.exe -ORBInitRef NameService=iiop://localhost:12345"
 </code></p>
 <p>An explanation of these command-line options appears below. </p>
 <p></p>
@@ -909,11 +909,6 @@ the ORB uses. The default reactor is the ACE_TP_Reactor.
               <td><code>tp</code></td>
               <td>Use the <code>ACE_TP_Reactor</code>, a select based
 thread-pool reactor which is the
-        MT_NO_UPCALL means use a client connection handler that
-        participates in the leader-follower model like MT, but, like
-        RW, does not allow handling of nested upcalls within the
-        waiting thread.
-
 default.</td>
             </tr>
           </tbody>
@@ -1173,11 +1168,7 @@ a null lock is used. This makes sense in case of optimizations and is
 allowed when no forwarding is used or only a single threaded client. </td>
       </tr>
       <tr>
-        <td><code>-ORBClientConnectionHandler</code> <em>MT | ST | RW
-        / MT_NOUPCALL</em><br>
-        <code>-ORBWaitStrategy</code> <em>MT / ST / RW / MT_NOUPCALL
-        </em>
-</td>
+        <td><code>-ORBClientConnectionHandler</code> <em>MT | ST | RW</em></td>
         <td><a name="-ORBClientConnectionHandler"></a><em>ST</em> means
 use the single-threaded client connection handler, i.e., the leader
 follower model will not be used. However, <em>ST</em> does support
@@ -1198,18 +1189,6 @@ strategy will only effect two way calls, since there is no waiting for
 one way calls. This strategy can also be used in an application that is
 both a client and a server if the server side is handled by a separate
 thread and the client threads are "pure" clients. </p>
-<p>
-        MT_NOUPCALL means use a client connection handler that
-        participates in the leader-follower model like MT, but, like
-        RW, does not allow handling of nested upcalls within the
-        waiting thread.  Note that with this strategy it is possible
-        to "run out of threads" in a thread pool, and that TAO doesn't
-        grow thread pools.  Unlike RW, this does not require  <a
-        href="-ORBTransportMuxStrategy">-ORBTransportMuxStrategy&nbsp;<em>EXCLUSIVE</em></a>.
-<!--
-I'm not sure what the effect of AMI on this option is.
--->
-</p>
         <p>Default for this option is <em>MT</em>. </p>
         </td>
       </tr>
diff --git a/TAO/docs/cec_options.html b/TAO/docs/cec_options.html
index b00b58ee590..8df20da62bb 100644
--- a/TAO/docs/cec_options.html
+++ b/TAO/docs/cec_options.html
@@ -158,18 +158,10 @@ static CEC_Factory "-CECDispatching reactive ....."
           <TD><CODE>-CECConsumerControlTimeout</CODE>
             <EM>timeout</EM>
           </TD>
-          <TD><P>Set the relative roundtrip timeout for push and pull
-                 consumers.  The default is 10000 microseconds.
-                 This relative roundtrip timeout is utilized
-                 when each consumer attached to the supplier is queried.
-                 If querying any one of the consumers times out, it may
-                 be disconnected depending on the
-                 -CECProxyDisconnectRetries setting.
-              </P>
-              <P>This option can also be referenced as
-                 -CECConsumerControlRoundtripTimeout.
-             </P>
-         </TD>
+          <TD>Set the timeout period (in microseconds) used by the reactive
+            consumer control policy to detect a timeout when polling the state
+						of the consumers.
+          </TD>
         </TR>
 
         <!-- <TR NAME="CECSupplierControlTimeout"> -->
@@ -177,18 +169,10 @@ static CEC_Factory "-CECDispatching reactive ....."
           <TD><CODE>-CECSupplierControlTimeout</CODE>
             <EM>timeout</EM>
           </TD>
-          <TD><P>Set the relative roundtrip timeout for push or pull
-                 suppliers.  The default is 10000 microseconds.
-                 This relative roundtrip timeout is utilized
-                 when each supplier attached to the consumer is queried.
-                 If querying any one of the suppliers times out, it may
-                 be disconnected depending on the
-                 -CECProxyDisconnectRetries setting.
-              </P>
-              <P>This option can also be referenced as
-                 -CECSupplierControlRoundtripTimeout.
-             </P>
-         </TD>
+          <TD>Set the timeout period (in microseconds) used by the reactive
+            supplier control policy to detect a timeout when polling the state
+						of the suppliers.
+          </TD>
         </TR>
 
         <!-- <TR NAME="CECReactivePullingPeriod"> -->
@@ -300,19 +284,6 @@ static CEC_Factory "-CECDispatching reactive ....."
             </P>
          </TD>
         </TR>
-
-        <!-- <TR NAME="CECProxyDisconnectRetries"> -->
-        <TR>
-          <TD><CODE>-CECProxyDisconnectRetries</CODE>
-            <EM>number of retries</EM>
-          </TD>
-          <TD><P>This determines the number of times a consumer or
-                 supplier can be "unresponsive" before the supplier or
-                 consumer control will disconnect it.  The default is zero
-                 retries.
-            </P>
-         </TD>
-        </TR>
       </TABLE>
     </P>
 
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 3c67ac8d5cd..581cbdc303e 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -38,20 +38,20 @@ these files:) <P>
 
 <UL>
   <LI> <B><EM>Client stubs</EM></B>, <EM>i.e.</EM>, <tt>*C.h</tt>,
-      <tt>*C.inl</tt>, and <tt>*C.cpp</tt>.  Pure client applications
+      <tt>*C.i</tt>, and <tt>*C.cpp</tt>.  Pure client applications
       only need to <code>#include</code> and link with these files.
-  <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>,  <tt>*S.h</tt>, <tt>*S.inl</tt>, and
+  <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>,  <tt>*S.h</tt>, <tt>*S.i</tt>, and
       <tt>*S.cpp</tt>.  Servers need to <code>#include</code> and link
       with these files.
-  <LI> <B><EM>Server skeleton templates</EM></B>, <EM>i.e.</EM>, <tt>*S_T.h</tt>, <tt>S_T.inl</tt>,
+  <LI> <B><EM>Server skeleton templates</EM></B>, <EM>i.e.</EM>, <tt>*S_T.h</tt>, <tt>S_T.i</tt>,
       and <tt>*S_T.cpp</tt>.  Some C++ compilers do not like template
       and non-template code in the same files, so TAO's IDL compiler
       generates these files separately.
 </UL>
 
-TAO's IDL compiler creates separate <TT>*.inl</TT> and <TT>*S_T.*</TT>
+TAO's IDL compiler creates separate <TT>*.i</TT> and <TT>*S_T.*</TT>
 files to improve the performance of the generated code.  For example,
-the <TT>*.inl</TT> files enable you to compile with inlining enabled or
+the <TT>*.i</TT> files enable you to compile with inlining enabled or
 not, which is useful for trading-off compile-time and run-time
 performance.  Fortunately, you only need to <CODE>#include</CODE> the
 client stubs declared in the <tt>*C.h</tt> file and the skeletons in
@@ -327,9 +327,9 @@ also receives other options that are specific to it. <p>
     <td><tt>post_include=</tt><i>include_path</i></td>
 
     <td>The compiler will generate code to include <i>include_path</i> at the
-        bottom of the each header file. For example, ace/post.h, which pops
-        compiler options for the Borland C++ Builder and MSVC++ compilers, is
-        included in this manner in all IDL-generated files in the TAO libraries
+        bottom of the each header file. For example, ace/post.h, which pops 
+        compiler options for the Borland C++ Builder and MSVC++ compilers, is 
+        included in this manner in all IDL-generated files in the TAO libraries 
         and CORBA services.</td>
   </tr>
 
@@ -490,7 +490,7 @@ also receives other options that are specific to it. <p>
   <tr><a name="ci">
     <td><tt>-ci</tt></td>
 
-    <td>Client inline file name ending. Default is "C.inl".</td>
+    <td>Client inline file name ending. Default is "C.i".</td>
     <td>&nbsp;</td>
   </tr>
 
@@ -511,26 +511,26 @@ also receives other options that are specific to it. <p>
   <tr><a name="si">
     <td><tt>-si</tt></td>
 
-    <td>Server inline skeleton file name ending. Default is "S.inl".</td>
+    <td>Server inline skeleton file name ending. Default is "S.i".</td>
     <td>&nbsp;</td>
   </tr>
 
   <tr><a name="st">
     <td><tt>-st</tt></td>
 
-    <td>Server's template inline file name ending. Default is "S_T.inl".</td>
+    <td>Server's template inline file name ending. Default is "S_T.i".</td>
     <td>&nbsp;</td>
   </tr>
 
   <tr><a name="t">
     <td><tt>-t</tt></td>
 
-    <td>Temporary directory to be used by the IDL compiler.
+    <td>Temporary directory to be used by the IDL compiler. 
     </td>
     <td>Unix: use environment variable TEMPDIR if defined, else use /tmp/.
-        Windows 95/98/Me: use environment variable TMP or TEMP if defined
+        Windows 95/98/Me: use environment variable TMP or TEMP if defined 
         and directory exists, else use current directory.  Windows NT/2000/XP:
-        use environment variable TMP or TEMP if defined, else use the
+        use environment variable TMP or TEMP if defined, else use the 
         Windows directory.
     </td>
   </tr>
@@ -577,10 +577,10 @@ also receives other options that are specific to it. <p>
         will use native C++ exceptions. If the value of the flag is 1,
         tao_idl will generate code that will use the <CODE>CORBA::Environment</CODE> variable for
         passing exceptions. If the value of the flag is 2, the C++ 'throw' keyword will be used
-        in place of ACE_THROW_SPEC, ACE_THROW, and ACE_RETHROW (ACE_THROW_RETURN and
-        TAO_INTERCEPTOR_THROW will still be used). The default depends on how TAO_IDL
-	has been built. If TAO_IDL is built with native exceptions enabled, the IDL
-	compiler will not generate the emulated exception macros. If IDL compiler is
+        in place of ACE_THROW_SPEC, ACE_THROW, and ACE_RETRHOW (ACE_THROW_RETURN and
+        TAO_INTERCEPTOR_THROW will still be used). The default depends on how TAO_IDL 
+	has been built. If TAO_IDL is built with native exceptions enabled, the IDL 
+	compiler will not generate the emulated exception macros. If IDL compiler is 
 	built with native exceptions disabled, macros would be generated by default. </td>
     <td>&nbsp;</td>
   </tr>
@@ -625,7 +625,7 @@ also receives other options that are specific to it. <p>
 
     <td>Generate type code and Any operator bodies in *A.cpp</td>
     <td>Decouples client and server decisions to compile and link
-        TypeCode- and Any-related code, which is generated in
+        TypeCode- and Any-related code, which is generated in 
         *C.cpp by default.</td>
   </tr>
 
@@ -734,16 +734,11 @@ also receives other options that are specific to it. <p>
     <td>&nbsp;</td>
   </tr>
 
-  <tr><a name="Sm">
-    <td><tt>-Sm</tt></td>
+  <tr><a name="Sv">
+    <td><tt>-Sv</tt></td>
 
-    <td>Suppress C++ code generation from CCM 'implied' IDL.</td>
-    <td>This code generation is achieved by default using a 'preprocessing' visitor
-        that modified the AST and is launched just before the code generating
-        visitors. There is a new tool in CIAO that converts the entire IDL file
-        into one containing explicit declarations of the implied IDL types.
-        For such a file, we don't want the preprocessing visitor to bve launched,
-        so this command line option will suppress it.</td>
+    <td>Suppress valuetype support.</td>
+    <td>&nbsp;</td>
   </tr>
 
 </table> <P>
diff --git a/TAO/docs/libraries.html b/TAO/docs/libraries.html
index f583dc4a4af..a07553476c8 100644
--- a/TAO/docs/libraries.html
+++ b/TAO/docs/libraries.html
@@ -90,6 +90,13 @@ and the dependencies outlined below are the same. <P>
    <td>dynamicinterface.mpb</td>
    </tr>
    <tr align=left>
+   <th>libTAO_DynamicInterface.so</th>
+   <td>Support for DII and DSI invocations. Applications have to
+    <code> #include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
+    </code> to get the right symbols.</td>
+   <td>dynamicinterface.mpb</td>
+   </tr>
+   <tr align=left>
    <th>libTAO_IFR_Client.so</th>
    <td>Support for client/stub side interfaces for
     InterfaceRepository applications. Applications have to <code>
diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html
index b1469d84279..68f29b61d5f 100644
--- a/TAO/docs/orbsvcs.html
+++ b/TAO/docs/orbsvcs.html
@@ -34,7 +34,7 @@ bgcolor="#ffffff">
       so files are included like this:</P>
 
       <P><CODE>
-      #include "orbsvcs/CosNamingC.h"
+      #include "orbsvcs/orbsvcs/CosNamingC.h"
       </CODE></P>
 
     <P>To simplify the IDL generation the skeletons are also on the
@@ -114,7 +114,7 @@ bgcolor="#ffffff">
         </TR>
       <TR>
         <TD>Scheduling Service</TD>
-        <TD><CODE>orbsvcs/orbsvcs/Sched</CODE></TD>
+        <TD><CODE>orbsvcs/Sched</CODE></TD>
         <TD>Venkita Subromianian <vankita at cs dot wustl dot edu>
       </TR>
       <TR>
diff --git a/TAO/docs/releasenotes/OBV.html b/TAO/docs/releasenotes/OBV.html
index 6320b983ab1..2878175f439 100644
--- a/TAO/docs/releasenotes/OBV.html
+++ b/TAO/docs/releasenotes/OBV.html
@@ -14,7 +14,7 @@
         <a href="mailto: bosk@ipmce.ru">Boris Kolpackov</a>
         <a href="mailto:g.edwards@vanderbilt.edu">George Edwards</a>
 
-        <p>Last Update: 2004/08/24 </p>
+        <p>Last Update: 2003/06/30 </p>
       </center>
 
       <p>Objects-by-Value (OBV) describes the new type, <CODE>valuetype</CODE>, introduced in CORBA 2.3
@@ -49,12 +49,14 @@
 
       <ul>
         <li><p>The IDL compiler understands <CODE>valuetype</CODE>. 
-        Relevant option of TAO's IDL compiler is: <P>
+        Relevant options of TAO's IDL compiler are: <P>
             <UL>
+            <LI>-Gv Enable OBV support (default)
+            <LI>-Sv Disable OBV support
             <LI>-Wb,obv_opt_accessor Make accessor and modifier functions inline.
-            Overriding them is not allowed in this mode.</LI>
-            </UL></P>
-	    <p></p>
+            Overriding them is not allowed in this mode.
+            </UL>
+          <p><CODE>libTAO</CODE> must be compiled with <CODE>TAO_HAS_VALUETYPE</CODE>.</p>
         </li>
         <li><p><CODE>Valuetype</CODE>s can be used as arguments in CORBA invocations.
             There is an example in
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 751a13f40e8..20946967024 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -185,9 +185,6 @@ Notification Service
 <li>
 <a href="../../CIAO/docs/releasenotes/index.html">CORBA Component Model (CIAO)</a></li>
 <li>
-<a href="../../CIAO/docs/releasenotes/dance.html">Deployment and
-    Configuration Engine (DAnCE)</a></li>
-<li>
 <a href="../../CIAO/CIDLC/README.html">Component Implementation
 Definition Language Compiler (CIDLC)</a></li>
 <li>
@@ -279,7 +276,7 @@ WFMO_Reactor_Test, Timer_Cancellation_Test</ul>
 <h3>
 <a NAME="idl"></a>IDL Compiler</h3>
 Point of contact: <a href="mailto:j.parsons@vanderbilt.edu">Jeff Parsons</a>
-<p>Current status: (As of August 14, 2004.)
+<p>Current status: (As of July 6, 2004.)
 <ul>
 <li>
 Generated code closely follows the C++ Mapping specified in the latest
@@ -438,8 +435,11 @@ far only the repository ID is output, but this may be enhanced when requirements
 and/or desires become clearer.</li>
 
 <li>
-The IDL compiler has support for valuetypes (see release notes
-for valuetypes for details). </li>
+The IDL compiler now has limited support for valuetypes (see release notes
+for valuetypes for details). If the TAO library is built with TAO_HAS_VALUETYPE
+defined, and IDL_HAS_VALUETYPE is also defined, then the IDL compiler will
+enable OBV support with the command line option -Gv, and disable it with
+the option -Sv (the default).</li>
 
 <li>
 As part of the implementation of interceptors, the TAO IDL compiler now
@@ -627,15 +627,6 @@ IDL compiler now processes the files sequentially in a single process.
 Note that, for each file, execution of the preprocessor spawns a new
 process, as it always has.
 </li>
-
-<li>
-Added command line option -Sm to suppress the action of CCM preprocessing
-visitor, which is by default launched before the C++ generating visitors,
-in order to add CCM equivalent IDL to the AST. There is a new tool in CIAO
-which converts IDL files by replacing IDL3 constructs with equivalent IDL2
-constructs, and if the IDL compiler is run on these files, we do not want
-the CCM preprocessing to occur.
-</li>
 </ul>
 
 <h4>
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
index 819c4ed0cb5..3d54c9ff404 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
@@ -5,8 +5,8 @@
 #ifndef TAO_TUTORIALS_QUOTER_EVENT_SERVICE_CONSUMER_I_H
 #define TAO_TUTORIALS_QUOTER_EVENT_SERVICE_CONSUMER_I_H
 
-#include <orbsvcs/CosEventCommS.h>
-#include <orbsvcs/CosEventChanneAdminC.h>
+#include <orbsvcs/orbsvcs/CosEventCommS.h>
+#include <orbsvcs/orbsvcs/CosEventChanneAdminC.h>
 
 class Stock_Consumer : public POA_CosEventComm::PushConsumer {
 public:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
index edaddf509bd..f5965752877 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
@@ -1,16 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba  {
+project(*client) : orbsvcsexe, portableserver, event, naming  {
   requires += exceptions
+  avoids += minimum_corba
   source_files {
     client.cpp
     Stock_Consumer.cpp
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba {
+project(*server) : orbsvcsexe, portableserver, event, naming {
   requires += exceptions
+  avoids += minimum_corba
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
index d5de84958cd..b880122709a 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
@@ -5,8 +5,8 @@
 #ifndef TAO_TUTORIALS_QUOTER_EVENT_SERVICE_STOCK_CONSUMER_H
 #define TAO_TUTORIALS_QUOTER_EVENT_SERVICE_STOCK_CONSUMER_H
 
-#include <orbsvcs/CosEventCommS.h>
-#include <orbsvcs/CosEventChannelAdminC.h>
+#include <orbsvcs/orbsvcs/CosEventCommS.h>
+#include <orbsvcs/orbsvcs/CosEventChannelAdminC.h>
 
 class Stock_Consumer : public POA_CosEventComm::PushConsumer {
 public:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h
index 47ac82f0003..fe92edb307e 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h
@@ -6,7 +6,7 @@
 #define TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_FACTORY_I_H
 
 #include "QuoterS.h"
-#include <orbsvcs/CosEventChannelAdminS.h>
+#include <orbsvcs/orbsvcs/CosEventChannelAdminS.h>
 
 class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
index d6e82748c82..c273ff5a4c7 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
@@ -6,8 +6,8 @@
 #define TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_I_H
 
 #include "QuoterS.h"
-#include <orbsvcs/CosEventCommS.h>
-#include <orbsvcs/CosEventChannelAdminC.h>
+#include <orbsvcs/orbsvcs/CosEventCommS.h>
+#include <orbsvcs/orbsvcs/CosEventChannelAdminC.h>
 
 class Quoter_Stock_i
   : public virtual POA_Quoter::Modify_Stock,
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
index 43abc2992c9..0f1b5491cb3 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "Stock_Consumer.h"
-#include <orbsvcs/CosNamingC.h>
+#include <orbsvcs/orbsvcs/CosNamingC.h>
 #include "ace/streams.h"
 
 int main (int argc, char* argv[])
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
index 56b0532a42c..dfe70557c91 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "Stock_Factory_i.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
 
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
index c26cf41b26c..992af2980af 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "QuoterC.h"
-#include <orbsvcs/CosNamingC.h>
+#include <orbsvcs/orbsvcs/CosNamingC.h>
 #include "ace/streams.h"
 
 int main (int argc, char* argv[])
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
index 86d293611bc..b961ff80081 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "Stock_Factory_i.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/streams.h"
 
 int main (int argc, char* argv[])
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
index a6df82cb29a..b3226bc8160 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
@@ -1,16 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver, naming, ami, minimum_corba  {
+project(*client) : taoexe, portableserver, naming, ami  {
   requires += exceptions
+  avoids += minimum_corba
   source_files {
     client.cpp
     Handler_i.cpp
   }
 }
 
-project(*server) : taoexe, portableserver, naming, ami, minimum_corba {
+project(*server) : taoexe, portableserver, naming, ami {
   requires += exceptions
+  avoids += minimum_corba
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
index 5134a909130..785c8628d04 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
@@ -1,16 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba  {
+project(*client) : orbsvcsexe, portableserver, rtevent, naming  {
   requires += exceptions
+  avoids += minimum_corba
   source_files {
     client.cpp
     Stock_Consumer.cpp
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba {
+project(*server) : orbsvcsexe, portableserver, rtevent, naming {
   requires += exceptions
+  avoids += minimum_corba
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
index a82044836bc..5761200e4e7 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
@@ -5,8 +5,8 @@
 #ifndef TAO_TUTORIALS_QUOTER_RT_EVENT_SERVICE_STOCK_CONSUMER_H
 #define TAO_TUTORIALS_QUOTER_RT_EVENT_SERVICE_STOCK_CONSUMER_H
 
-#include <orbsvcs/RtecEventCommS.h>
-#include <orbsvcs/RtecEventChannelAdminC.h>
+#include <orbsvcs/orbsvcs/RtecEventCommS.h>
+#include <orbsvcs/orbsvcs/RtecEventChannelAdminC.h>
 
 class Stock_Consumer : public POA_RtecEventComm::PushConsumer {
 public:
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h
index c30c68e2a69..9ff5db1ac4f 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h
@@ -6,7 +6,7 @@
 #define TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_FACTORY_I_H
 
 #include "QuoterS.h"
-#include <orbsvcs/RtecEventChannelAdminS.h>
+#include <orbsvcs/orbsvcs/RtecEventChannelAdminS.h>
 
 class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
index ea37a47f82b..d793656d196 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Stock_i.h"
-#include <orbsvcs/Event_Utilities.h>
+#include <orbsvcs/orbsvcs/Event_Utilities.h>
 
 ///derive a class from the tie template class to release itself by ref_count
 class MyTieStock:public POA_RtecEventComm::PushSupplier_tie<Quoter_Stock_i>
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
index 7ec530709eb..996a4323f20 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
@@ -6,8 +6,8 @@
 #define TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_I_H
 
 #include "QuoterS.h"
-#include <orbsvcs/RtecEventCommS.h>
-#include <orbsvcs/RtecEventChannelAdminC.h>
+#include <orbsvcs/orbsvcs/RtecEventCommS.h>
+#include <orbsvcs/orbsvcs/RtecEventChannelAdminC.h>
 
 class Quoter_Stock_i
   : public virtual POA_Quoter::Modify_Stock,
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
index 95fc7a4ee53..cdf17f1f5cf 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
@@ -3,8 +3,8 @@
 //
 
 #include "Stock_Consumer.h"
-#include <orbsvcs/CosNamingC.h>
-#include <orbsvcs/Event_Utilities.h>
+#include <orbsvcs/orbsvcs/CosNamingC.h>
+#include <orbsvcs/orbsvcs/Event_Utilities.h>
 #include "ace/streams.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
index 3660fc9b82d..94c6764003f 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "Stock_Factory_i.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
index 2178e744e80..dca23bb8206 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
@@ -11,7 +11,7 @@ project(*client) : taoexe, portableserver, rtevent, naming  {
   }
 }
 
-project(*server) : taoexe, portableserver, rtevent, naming, iortable {
+project(*server) : taoexe, portableserver, rtevent, naming {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../../idl
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
index d7152082ec0..202171a2f9e 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -1,5 +1,6 @@
 // $Id$
-project : taoexe, portableserver, minimum_corba {
+project : taoexe, portableserver {
+  avoids += minimum_corba
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../../idl
diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html
index 3b100609d88..9d97da6874e 100644
--- a/TAO/docs/tutorials/Quoter/index.html
+++ b/TAO/docs/tutorials/Quoter/index.html
@@ -25,13 +25,13 @@
       magazine.
     </P>
 
-    <P>This tutorial builds up from simple client and server
+    <P>In this tutorial, we build up from simple client and server
       applications to explore advanced TAO features, such as
       <A HREF="http://www.cs.wustl.edu/~schmidt/report-doc.html#ami">
         asynchronous method invocation</A>,
-      <A HREF="http://www.cs.wustl.edu/~schmidt/PDF/C++-report-col19.pdf">
+      <A HREF="http://www.cs.wustl.edu/~schmidt/C++-report-col19.ps.gz">
         reliable oneways</A>,
-      the <A HREF="http://www.cs.wustl.edu/~schmidt/PDF/JSAC-98.pdf">
+      the <A HREF="http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz">
         real-time Events Service</A>,
       the <A HREF="../../INS.html">
         Interoperable Naming Service</A>
@@ -90,7 +90,7 @@
     <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address>
 <!-- Created: Sat Nov 27 15:25:06 CST 1999 -->
 <!-- hhmts start -->
-Last modified: Fri Aug 27 13:04:01 CDT 2004
+Last modified: Fri Feb  8 14:12:11 CST 2002
 <!-- hhmts end -->
   </body>
 </html>
diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp
index 17b74ff11fa..5b8d094b4d3 100644
--- a/TAO/examples/Advanced/ch_18/server.cpp
+++ b/TAO/examples/Advanced/ch_18/server.cpp
@@ -25,7 +25,7 @@
 #include "server.h"
 #include <algorithm>
 #include "icp.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 const char * Controller_oid = "Controller";
 const unsigned int           DeviceLocator_impl::MAX_EQ_SIZE = 100;
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index 7f62ba20434..e4df81125a3 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Callback_Quoter notifier): namingexe, naming_serv {
+project(Callback_Quoter notifier): namingexe {
   Source_Files {
     Notifier_i.cpp
     Notifier_Input_Handler.cpp
@@ -9,7 +9,7 @@ project(Callback_Quoter notifier): namingexe, naming_serv {
   }
 }
 
-project(Callback_Quoter consumer): namingexe, portableserver {
+project(Callback_Quoter consumer): namingexe {
   Source_Files {
     Consumer_Input_Handler.cpp
     Consumer_Signal_Handler.cpp
@@ -19,7 +19,7 @@ project(Callback_Quoter consumer): namingexe, portableserver {
   }
 }
 
-project(Callback_Quoter supplier): namingexe, portableserver {
+project(Callback_Quoter supplier): namingexe {
   Source_Files {
     Supplier_i.cpp
     Supplier_Timer_Handler.cpp
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h
index 9a0cd8b6c22..cc0646c0ef2 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h
@@ -31,8 +31,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "Consumer_Input_Handler.h"
 #include "Consumer_Signal_Handler.h"
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index 9f5279a815b..6e126029194 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -22,8 +22,8 @@
 #include "Notifier_i.h"
 #include "NotifierS.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/CosNamingS.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/CosNamingS.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 class Notifier_Input_Handler : public ACE_Event_Handler
 {
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h
index 2753e58c776..cae78aa15d9 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.h
+++ b/TAO/examples/Callback_Quoter/Supplier_i.h
@@ -19,8 +19,8 @@
 #ifndef SUPPLIER_I_H
 #define SUPPLIER_I_H
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Reactor.h"
 #include "ace/Read_Buffer.h"
 #include "NotifierC.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index 4f4368cca67..7a5969d2c29 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -5,7 +5,7 @@
 
 #include "ace/Process_Manager.h"
 #include "ace/OS_NS_unistd.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Web_ServerC.h"
 #include "Iterator_Handler.h"
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index a1c2d6de7e5..e1f4fa883e0 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -3,7 +3,7 @@
 
 // Ossama Othman <ossama@uci.edu>
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Web_ServerS.h"
 
 #include "Iterator_Factory_i.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index 986c828875a..2daf289a7ff 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -5,7 +5,7 @@
 
 #include "ace/Process_Manager.h"
 #include "ace/OS_NS_unistd.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Push_Web_ServerC.h"
 #include "Push_Iterator_Handler.h"
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp
index 83388bc3fb9..2f83bff364b 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp
@@ -3,7 +3,7 @@
 
 // Ossama Othman <ossama@uci.edu>
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Push_Web_ServerS.h"
 #include "Push_Iterator_Factory_i.h"
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
index 02d4eecf462..fd7509be985 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): namingexe, portableserver {
+project(*Server): namingexe {
   Source_Files {
     Content_Iterator_i.cpp
     Iterator_Factory_i.cpp
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index a5ec056cc20..fe5151af49a 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -5,7 +5,7 @@
 
 #include "ace/FILE_Connector.h"
 #include "ace/Process_Manager.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Web_ServerC.h"
 #include "ace/OS_NS_strings.h"
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
index 701dccbeac0..f72546b7767 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
@@ -3,7 +3,7 @@
 
 // Ossama Othman <ossama@uci.edu>
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Web_ServerS.h"
 
 #include "Iterator_Factory_i.h"
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h
index b7bee482f35..2df1a0b799f 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Handler.h
@@ -23,8 +23,8 @@
 #define _CONSUMER_HANDLER_H
 
 #include "Event_Comm_i.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 class Consumer_Handler
 {
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index fd6298eee08..65a948f7185 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*notifier): namingexe, naming_serv {
+project(*notifier): namingexe {
   Source_Files {
     Event_Comm_i.cpp
     Notifier_Server.cpp
@@ -9,7 +9,7 @@ project(*notifier): namingexe, naming_serv {
   }
 }
 
-project(*consumer): namingexe, portableserver {
+project(*consumer): namingexe {
   Source_Files {
     Consumer_Input_Handler.cpp
     Consumer_Handler.cpp
@@ -18,7 +18,7 @@ project(*consumer): namingexe, portableserver {
   }
 }
 
-project(*supplier): namingexe, portableserver {
+project(*supplier): namingexe {
   Source_Files {
     Event_Comm_i.cpp
     Supplier_Input_Handler.cpp
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h
index 103664a4756..6a13a2485d0 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.h
+++ b/TAO/examples/Event_Comm/Notifier_Handler.h
@@ -24,8 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 class Notifier_Handler
 {
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index bbb1880c33a..3be60e4bc63 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -19,8 +19,8 @@
 
 #include "Event_Comm_i.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/CosNamingS.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/CosNamingS.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 class Notifier_Server
 {
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 81e8d8b0d83..7b8721e8014 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -7,7 +7,7 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "testC.h"
 #include "MUF_Scheduler.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
index 3fa7f6dcd1e..91fc9b26f27 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
@@ -9,8 +9,9 @@ project(muf_server): kokyu_dsrt_scheduler_server {
   }
 }
 
-project(muf_client): orbsvcsexe, svc_utils, kokyu_dsrt_scheduler_client {
+project(muf_client): orbsvcsexe, kokyu_dsrt_scheduler_client {
   exename = muf_client
+  libs += TAO_Svc_Utils
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 84bdfb0f588..4be2d6c7ce4 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,8 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*balancer): taoexe, portableserver, minimum_corba {
-  avoids += repo
+project(*balancer): taoexe, portableserver {
+  avoids += minimum_corba repo
   exename = load_balancer
 
   IDL_Files {
@@ -17,8 +17,8 @@ project(*balancer): taoexe, portableserver, minimum_corba {
   }
 }
 
-project(*server): taoserver, minimum_corba {
-  avoids += repo
+project(*server): taoserver {
+  avoids += minimum_corba repo
 
   Source_Files {
     IdentityC.cpp
@@ -29,8 +29,8 @@ project(*server): taoserver, minimum_corba {
   }
 }
 
-project(*client): taoclient, portableserver, minimum_corba {
-  avoids += repo
+project(*client): taoclient, portableserver {
+  avoids += minimum_corba repo
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index 60513e19345..41fae6859b0 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Service): namingexe, naming_serv, lifecycle {
+project(*Service): namingexe, lifecycle {
   Source_Files {
     Logger_i.cpp
     Logging_Service.cpp
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index e0916ad81ed..9d7e8e01dc2 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -32,8 +32,8 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 #include "Logger_i.h"
 #include "LoggerS.h"
 #include "LoggerC.h"
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index d04a9f713e7..6aaad74b114 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -2,7 +2,7 @@
 
 #include "LoggerC.h"
 #include "Logging_Test_i.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "tao/debug.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram_Mcast.h"
diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h
index 781c55a7b4f..753b0cd7bc0 100644
--- a/TAO/examples/Logging/Logging_Test_i.h
+++ b/TAO/examples/Logging/Logging_Test_i.h
@@ -28,9 +28,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "LoggerC.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 class Logger_Client
 {
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index ce1d87be55f..f38edeefc8c 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, valuetype, minimum_corba {
+project(*server): taoexe, portableserver, valuetype {
+  avoids += minimum_corba
   Source_Files {
     Server_i.cpp
     Event_Types_impl.cpp
@@ -10,7 +11,8 @@ project(*server): taoexe, portableserver, valuetype, minimum_corba {
   }
 }
 
-project(*client): taoexe, portableserver, valuetype, minimum_corba {
+project(*client): taoexe, portableserver, valuetype {
+  avoids += minimum_corba
   Source_Files {
     Client_i.cpp
     Event_Types_impl.cpp
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 7f01d95962a..92e0254b024 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
index 04d3e67fc42..19d9e4f61a2 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -1,11 +1,13 @@
 //$Id$
-project(*Client) : taoexe, messaging, portableserver, minimum_corba {
+project(*Client) : taoexe, messaging, portableserver {
+  avoids += minimum_corba
   source_files {
     client.cpp
   }
 }
 
-project(*Server) : taoexe, messaging, portableserver, dynamicinterface, minimum_corba {
+project(*Server) : taoexe, messaging, portableserver, dynamicinterface{
+  avoids += minimum_corba
   source_files {
     Database_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index 779807622d3..dd0c0d645cd 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoexe, portableserver, minimum_corba {
+project(*Client) : taoexe, portableserver {
+  avoids += minimum_corba
   source_files {
     client.cpp
   }
 }
 
-project(*Server) : taoexe, portableserver, minimum_corba {
+project(*Server) : taoexe, portableserver {
+  avoids += minimum_corba
   source_files {
     File_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index 7f01d95962a..92e0254b024 100644
--- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
index e5743eb768c..e2176127181 100644
--- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver, minimum_corba {
+project: taoexe, portableserver {
+  avoids += minimum_corba
 }
 
diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
index 6356aeab319..e8b34068166 100644
--- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoexe, portableserver, minimum_corba {
+project(*Client) : taoexe, portableserver {
+  avoids += minimum_corba
   source_files {
     client.cpp
   }
 }
 
-project(*Server) : taoexe, portableserver, minimum_corba {
+project(*Server) : taoexe, portableserver {
+  avoids += minimum_corba
   source_files {
     test_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
index 0cc793eef25..5ddbc1753a3 100644
--- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
+++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -1,5 +1,6 @@
 // $Id$
-project(*lib): taolib_with_idl, portableserver, minimum_corba {
+project(*lib): taolib_with_idl, portableserver {
+  avoids += minimum_corba
   sharedname = Generic_Servant
   dynamicflags = GENERIC_SERVANT_BUILD_DLL
   idlflags += -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h
@@ -8,7 +9,8 @@ project(*lib): taolib_with_idl, portableserver, minimum_corba {
   }
 }
 
-project(*client): taoexe, portableserver, minimum_corba {
+project(*client): taoexe, portableserver {
+  avoids += minimum_corba
   after += *lib
   libs += Generic_Servant
   idl_files {
diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc
index 5fb4927d770..08d63c26e51 100644
--- a/TAO/examples/POA/Loader/POA_Loader.mpc
+++ b/TAO/examples/POA/Loader/POA_Loader.mpc
@@ -1,5 +1,6 @@
 // $Id$
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
index b330e9a825f..de7282249a6 100644
--- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
+++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
@@ -1,3 +1,4 @@
 //$Id$
-project : taoexe, portableserver, minimum_corba {
+project : taoexe, portableserver {
+	avoids += minimum_corba
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
index 57a09f749b8..04ca8b96d72 100644
--- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
+++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
index 843c856715b..6c3c72f5505 100644
--- a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
+++ b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
index 368e062cbc6..d1e881a3dab 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,5 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver, bidir_giop, minimum_corba {
+project: taoexe, portableserver, bidir_giop {
+	
+	avoids += minimum_corba
 }
+
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
index 0b54971c2cb..6f42aaf7f48 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc
index e517831c421..e921c19724a 100644
--- a/TAO/examples/POA/TIE/POA_TIE.mpc
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -1,14 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoexe, portableserver, minimum_corba {
+project(*Client) : taoexe, portableserver {
+  avoids += minimum_corba
   source_files {
     client.cpp
     testC.cpp
   }
 }
 
-project(*Server) : taoexe, portableserver, minimum_corba {
+project(*Server) : taoexe, portableserver {
+  avoids += minimum_corba
   source_files {
     test_i.cpp
     server.cpp
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index 28a01e93b28..8ac9cf12210 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -168,19 +168,14 @@ Client::svc (void)
       //ACE_DEBUG ((LM_DEBUG, "...finished\n"));
 
       long dur = measured.sec () * 1000000 + measured.usec ();
-      if (dur == 0)
-        ACE_DEBUG ((LM_DEBUG, "Time not measurable, calculation skipped\n"));
-      else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "Time for %u Msgs: %u usec \n",
-                    this->niterations_,
-                    dur));
-
-        ACE_DEBUG ((LM_DEBUG, "Time for 1 Msg: %u usec, %u calls/sec\n",
-                    dur / this->niterations_,
-                    1000000 / (dur / this->niterations_)));
-      }
+      ACE_DEBUG ((LM_DEBUG,
+                  "Time for %u Msgs: %u usec \n",
+                  this->niterations_,
+                  measured.sec () * 1000000 + measured.usec ()));
+
+      ACE_DEBUG ((LM_DEBUG, "Time for 1 Msg: %u usec, %u calls/sec\n",
+                  dur / this->niterations_,
+                  1000000 / (dur / this->niterations_)));
 
       server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index 12516fcb83a..340bb6d7e78 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -15,7 +15,7 @@
 
 #include "Generic_Factory.h"
 
-#include "orbsvcs/LifeCycleServiceC.h"
+#include "orbsvcs/orbsvcs/LifeCycleServiceC.h"
 
 ACE_RCSID (Quoter, 
            Generic_Factory, 
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index f972a2040d5..c48f1565830 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -4,7 +4,8 @@
 // todo : Once MPC is used for everything, we should consider
 //        removing the includes += lines below, and updating
 //        the source code instead.
-project(*server): namingexe, lifecycle, minimum_corba {
+project(*server): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -13,7 +14,8 @@ project(*server): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*client): namingexe, lifecycle, minimum_corba {
+project(*client): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -21,7 +23,8 @@ project(*client): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*Factory Finder): namingexe, lifecycle, minimum_corba {
+project(*Factory Finder): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -30,7 +33,8 @@ project(*Factory Finder): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*Generic Factory): namingexe, lifecycle, minimum_corba {
+project(*Generic Factory): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 7dec1d90a22..be51846ebe7 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Read_Buffer.h"
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "client.h"
 
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index d5014c872c8..f171180c031 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -28,7 +28,7 @@
 
 #include "QuoterC.h"
 
-#include "orbsvcs/CosLifeCycleC.h"
+#include "orbsvcs/orbsvcs/CosLifeCycleC.h"
 
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index 880be8f44c6..1b3362e8c1d 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -28,8 +28,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 #include "tao/PortableServer/ORB_Manager.h"
 #include "Quoter_i.h"
 #include "QuoterC.h"
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index ea5cef35093..699bc523440 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -18,7 +18,7 @@
 
 #include "ace/Singleton.h"
 #include "ace/Sched_Params.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "activity_export.h"
diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h
index 5b333145f0b..fa71c73a8f7 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.h
+++ b/TAO/examples/RTCORBA/Activity/Builder.h
@@ -13,7 +13,7 @@
 #ifndef BUILDER_H
 #define BUILDER_H
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 
 class Periodic_Task;
diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h
index f5263b88645..5a889cc0a29 100644
--- a/TAO/examples/RTScheduling/DT_Creator.h
+++ b/TAO/examples/RTScheduling/DT_Creator.h
@@ -2,7 +2,7 @@
 #ifndef DT_CREATOR_H
 #define DT_CREATOR_H
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 #include "tao/RTScheduling/RTScheduler.h"
diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.cpp b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp
index 2e9d20ec627..e6c3d1e3742 100644
--- a/TAO/examples/RTScheduling/MIF_SchedulingC.cpp
+++ b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp
@@ -56,7 +56,7 @@ namespace TAO
 // Traits specializations for MIF_Scheduling::SegmentSchedulingParameterPolicy.
 
 MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
-TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::duplicate (
+TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::tao_duplicate (
     MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p
   )
 {
@@ -64,7 +64,7 @@ TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::duplicate
 }
 
 void
-TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::release (
+TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::tao_release (
     MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p
   )
 {
@@ -72,13 +72,13 @@ TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::release (
 }
 
 MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
-TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::nil (void)
+TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::tao_nil (void)
 {
   return MIF_Scheduling::SegmentSchedulingParameterPolicy::_nil ();
 }
 
 CORBA::Boolean
-TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::marshal (
+TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::tao_marshal (
     MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -200,14 +200,14 @@ static const CORBA::Long _oc_MIF_Scheduling_SegmentSchedulingParameterPolicy[] =
   ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:MIF_Scheduling/SegmentSchedulingParameterPolicy:1.0
     33,
-  ACE_NTOHL (0x5365676d),
-  ACE_NTOHL (0x656e7453),
-  ACE_NTOHL (0x63686564),
-  ACE_NTOHL (0x756c696e),
-  ACE_NTOHL (0x67506172),
-  ACE_NTOHL (0x616d6574),
-  ACE_NTOHL (0x6572506f),
-  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x5365676d), 
+  ACE_NTOHL (0x656e7453), 
+  ACE_NTOHL (0x63686564), 
+  ACE_NTOHL (0x756c696e), 
+  ACE_NTOHL (0x67506172), 
+  ACE_NTOHL (0x616d6574), 
+  ACE_NTOHL (0x6572506f), 
+  ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = SegmentSchedulingParameterPolicy
   };
 
@@ -231,7 +231,7 @@ namespace MIF_Scheduling
 // Traits specializations for MIF_Scheduling::MIF_Scheduler.
 
 MIF_Scheduling::MIF_Scheduler_ptr
-TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::duplicate (
+TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::tao_duplicate (
     MIF_Scheduling::MIF_Scheduler_ptr p
   )
 {
@@ -239,7 +239,7 @@ TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::duplicate (
 }
 
 void
-TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::release (
+TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::tao_release (
     MIF_Scheduling::MIF_Scheduler_ptr p
   )
 {
@@ -247,13 +247,13 @@ TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::release (
 }
 
 MIF_Scheduling::MIF_Scheduler_ptr
-TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::nil (void)
+TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::tao_nil (void)
 {
   return MIF_Scheduling::MIF_Scheduler::_nil ();
 }
 
 CORBA::Boolean
-TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::marshal (
+TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::tao_marshal (
     MIF_Scheduling::MIF_Scheduler_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -262,7 +262,7 @@ TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*MIF_Scheduling__TAO_MIF_Scheduler_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -273,7 +273,7 @@ MIF_Scheduling::MIF_Scheduler::MIF_Scheduler (void)
 MIF_Scheduling::MIF_Scheduler::~MIF_Scheduler (void)
 {}
 
-void
+void 
 MIF_Scheduling::MIF_Scheduler::_tao_any_destructor (void *_tao_void_pointer)
 {
   MIF_Scheduler *_tao_tmp_pointer =
@@ -291,10 +291,10 @@ MIF_Scheduling::MIF_Scheduler::_narrow (
     {
       return MIF_Scheduler::_nil ();
     }
-
+  
   MIF_Scheduler_ptr proxy =
     dynamic_cast<MIF_Scheduler_ptr> (_tao_objref);
-
+  
   return MIF_Scheduler::_duplicate (proxy);
 }
 
@@ -305,7 +305,7 @@ MIF_Scheduling::MIF_Scheduler::_duplicate (MIF_Scheduler_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -360,20 +360,20 @@ static const CORBA::Long _oc_MIF_Scheduling_MIF_Scheduler[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x4d49465f),
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c69),
-  ACE_NTOHL (0x6e672f4d),
-  ACE_NTOHL (0x49465f53),
-  ACE_NTOHL (0x63686564),
-  ACE_NTOHL (0x756c6572),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x4d49465f), 
+  ACE_NTOHL (0x53636865), 
+  ACE_NTOHL (0x64756c69), 
+  ACE_NTOHL (0x6e672f4d), 
+  ACE_NTOHL (0x49465f53), 
+  ACE_NTOHL (0x63686564), 
+  ACE_NTOHL (0x756c6572), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:MIF_Scheduling/MIF_Scheduler:1.0
     14,
-  ACE_NTOHL (0x4d49465f),
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c65),
+  ACE_NTOHL (0x4d49465f), 
+  ACE_NTOHL (0x53636865), 
+  ACE_NTOHL (0x64756c65), 
   ACE_NTOHL (0x72000000),  // name = MIF_Scheduler
   };
 
@@ -543,7 +543,7 @@ operator>>= (
     TAO_Objref_Var_T<
         MIF_Scheduling::SegmentSchedulingParameterPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         MIF_Scheduling::SegmentSchedulingParameterPolicy
@@ -563,7 +563,7 @@ operator>>= (
     TAO_Objref_Var_T<
         MIF_Scheduling::MIF_Scheduler
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         MIF_Scheduling::MIF_Scheduler
@@ -585,7 +585,7 @@ operator>>= (
     TAO_Objref_Var_T< \
         MIF_Scheduling::SegmentSchedulingParameterPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         MIF_Scheduling::SegmentSchedulingParameterPolicy
@@ -605,7 +605,7 @@ operator>>= (
     TAO_Objref_Var_T< \
         MIF_Scheduling::MIF_Scheduler
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         MIF_Scheduling::MIF_Scheduler
@@ -616,4 +616,5 @@ operator>>= (
         MIF_Scheduling::MIF_Scheduler \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.h b/TAO/examples/RTScheduling/MIF_SchedulingC.h
index fd67d8171a8..11e0aeb9d27 100644
--- a/TAO/examples/RTScheduling/MIF_SchedulingC.h
+++ b/TAO/examples/RTScheduling/MIF_SchedulingC.h
@@ -299,14 +299,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct  Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>
   {
-    static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr duplicate (
+    static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr tao_duplicate (
         MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
       );
-    static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -320,14 +320,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct  Objref_Traits<MIF_Scheduling::MIF_Scheduler>
   {
-    static MIF_Scheduling::MIF_Scheduler_ptr duplicate (
+    static MIF_Scheduling::MIF_Scheduler_ptr tao_duplicate (
         MIF_Scheduling::MIF_Scheduler_ptr
       );
-    static void release (
+    static void tao_release (
         MIF_Scheduling::MIF_Scheduler_ptr
       );
-    static MIF_Scheduling::MIF_Scheduler_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static MIF_Scheduling::MIF_Scheduler_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         MIF_Scheduling::MIF_Scheduler_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -376,3 +376,4 @@ namespace TAO
 #endif /* __BORLANDC__ */
 
 #endif /* ifndef */
+
diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h
index 7a77efe0117..4a717c0a367 100644
--- a/TAO/examples/RTScheduling/Starter.h
+++ b/TAO/examples/RTScheduling/Starter.h
@@ -2,8 +2,7 @@
 #ifndef STARTER_H
 #define STARTER_H
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 #include "SynchC.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 543f6dca5e0..bf6ba78109f 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -20,8 +20,7 @@
 #define TAO_UTIL_H
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index 600979a6a74..de802cc0313 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe {
   Source_Files {
     Account_i.cpp
     AccountManager_i.cpp
@@ -10,7 +10,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc
index 737aaab2d22..5a9f45c9660 100644
--- a/TAO/examples/Simple/echo/echo.mpc
+++ b/TAO/examples/Simple/echo/echo.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe {
   Source_Files {
     Echo_i.cpp
     ../Simple_util.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index 32af3e12220..b7c562c0efb 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe {
   Source_Files {
     Grid_i.cpp
     server.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/time-date/Simple_time_date.mpc b/TAO/examples/Simple/time-date/Simple_time_date.mpc
index 7eaefad4fc4..5069c2e7c66 100644
--- a/TAO/examples/Simple/time-date/Simple_time_date.mpc
+++ b/TAO/examples/Simple/time-date/Simple_time_date.mpc
@@ -26,7 +26,7 @@ project(*server): taoserver {
   }
 }
 
-project(*client): taoclient, iortable, namingexe, portableserver {
+project(*client): taoclient, namingexe {
   after    += *lib
   libs     += Time_Date
   libpaths += .
diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc
index bab89530e80..0de1921511b 100644
--- a/TAO/examples/Simple/time/time.mpc
+++ b/TAO/examples/Simple/time/time.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe {
   Source_Files {
     Time_i.cpp
     server.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index d3f8aae7059..64597a89f24 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -26,8 +26,8 @@
 
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
 #include "tao/PortableServer/ORB_Manager.h"
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
index 1bdbc4e848d..7eaef3102a4 100644
--- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
+++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
-project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client, minimum_corba {
+project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client {
+  avoids  += minimum_corba
   exename  = create_tc
   Source_Files {
     testC.cpp
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index e461065f445..4b0eab8fac7 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -1,21 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, portableserver {
+project(*server): namingexe {
   Source_Files {
     status_i.cpp
     server.cpp
   }
 }
 
-project(*client): namingexe, portableserver {
+project(*client): namingexe {
   Source_Files {
     ior_corbaloc_client_i.cpp
     client.cpp
   }
 }
 
-project(*corbaname client): namingexe, portableserver {
+project(*corbaname client): namingexe {
   Source_Files {
     status_i.cpp
     corbaname_client.cpp
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
index 5595ed23148..d27b2152df3 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
@@ -23,7 +23,7 @@
 #define IOR_CORBALOC_CLIENT_I_H
 
 #include "corbalocC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp
index b5351d69be2..415daf348c1 100644
--- a/TAO/examples/ior_corbaloc/server.cpp
+++ b/TAO/examples/ior_corbaloc/server.cpp
@@ -3,7 +3,7 @@
 
 #include "status_i.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 int main (int argc, char* argv[])
 {
diff --git a/TAO/examples/mfc/client.mpc b/TAO/examples/mfc/client.mpc
index 1769261ac85..03acd5782c3 100644
--- a/TAO/examples/mfc/client.mpc
+++ b/TAO/examples/mfc/client.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(MFC client): namingexe, portableserver {
+project(MFC client): namingexe {
   idlflags += -Wb,pch_include=StdAfx.h
 
   Source_Files {
diff --git a/TAO/examples/mfc/server.mpc b/TAO/examples/mfc/server.mpc
index 9b8ccc137f2..fa12033db6d 100644
--- a/TAO/examples/mfc/server.mpc
+++ b/TAO/examples/mfc/server.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(MFC Server): namingexe, portableserver, ace_mfc {
+project(MFC Server): namingexe, ace_mfc {
   exename    = server
   pch_header = StdAfx.h
   pch_source = StdAfx.cpp
diff --git a/TAO/interop-tests/wchar/Client.java b/TAO/interop-tests/wchar/Client.java
index 9caf55e5b92..821582b167e 100644
--- a/TAO/interop-tests/wchar/Client.java
+++ b/TAO/interop-tests/wchar/Client.java
@@ -15,171 +15,98 @@ import interop.*;
 
 public class Client
 {
-    private WCharReference ref;
-    private org.omg.CORBA.ORB orb;
 
-    final private static int WCHAR_TO_SERVER = 0x0001;
-    final private static int WSTRING_TO_SERVER = 0x0002;
-    final private static int WARRAY_TO_SERVER = 0x0004;
-    final private static int ANY_WCHAR_TO_SERVER = 0x0008;
-    final private static int WSTRING_EXCEPTION = 0x0010;
-    final private static int WCHAR_FROM_SERVER = 0x0020;
-    final private static int WSTRING_FROM_SERVER = 0x0040;
-    final private static int WARRAY_FROM_SERVER = 0x0080;
-    final private static int ANY_WCHAR_FROM_SERVER = 0x0100;
-    final private static int ANY_WSTRING_TO_SERVER = 0x0200;
-    final private static int ANY_WSTRING_FROM_SERVER = 0x0400;
-    final private static int ANY_WSTRING_ECHO = 0x0800;
-    final private static int WSTRUCTSEQ_FROM_SERVER = 0x1000;
-    final private static int WSTRUCTSEQ_TO_SERVER = 0x2000;
-    final private static int TBD_1 = 0x4000; // update ALL_TESTS if this is defined
-    final private static int TBD_0 = 0x8000; // update ALL_TESTS if this is defined
-    final private static int ALL_TESTS = 0x3FFF;
-
-    // for all tests, run each test named in this array
-    final private static String test_name[] =
-        {
-            "wchar_to_server", "wstring_to_server", "warray_to_server",
-            "any(wchar)_to_server", "wstring_exception", "wchar_from_server",
-            "wstring_from_server", "warray_from_server", "any(wchar)_from_server",
-            "any(wstring)_to_server", "any(wstring)_from_server",
-            "any(wstring)_echo", "wstructseq_from_server", "wstructseq_to_server"
-        };
+    private static WCharReference ref = new WCharReference();
+    private static org.omg.CORBA.ORB orb;
+
+    private static int WCHAR_TO_SERVER = 0x0001;
+    private static int WSTRING_TO_SERVER = 0x0002;
+    private static int WARRAY_TO_SERVER = 0x0004;
+    private static int ANY_WCHAR_TO_SERVER = 0x0008;
+    private static int WSTRING_EXCEPTION = 0x0010;
+    private static int WCHAR_FROM_SERVER = 0x0020;
+    private static int WSTRING_FROM_SERVER = 0x0040;
+    private static int WARRAY_FROM_SERVER = 0x0080;
+    private static int ANY_WCHAR_FROM_SERVER = 0x0100;
+    private static int TBD_6 = 0x0200;
+    private static int TBD_5 = 0x0400;
+    private static int TBD_4 = 0x0800;
+    private static int TBD_3 = 0x1000;
+    private static int TBD_2 = 0x2000;
+    private static int TBD_1 = 0x4000;
+    private static int TBD_0 = 0x8000;
+    private static int ALL_TESTS = 0xFFFF;
+
+    private static String test_name[] =
+    {
+        "wchar_to_server", "wstring_to_server", "warray_to_server",
+        "any(wchar)_to_server", "wstring_exception", "wchar_from_server",
+        "wstring_from_server", "warray_from_server", "any(wchar)_from_server"
+    };
 
-    private int tests_to_run = 0;
-    private short data_set = 0;
-    private boolean verbose = false;
+    private static int tests_to_run = 0;
+    private static short data_set = 0;
+    private static boolean verbose = false;
 
-    private boolean runOneTest (WChar_Passer server, int test_num)
+    private static boolean runOneTest (WChar_Passer server, int test_num)
     {
         switch (test_num)
-        {
-            case 0x0001: //WCHAR_TO_SERVER:
             {
-                if (verbose)
-                    System.out.println ("test wchar_to_server");
-                return server.wchar_to_server (ref.get_wchar(data_set),
-                    data_set);
-            }
+            case 0x0001: //WCHAR_TO_SERVER:
+                return server.wchar_to_server (Client.
+                                               ref.get_wchar(data_set),
+                                               data_set);
             case 0x0002: //WSTRING_TO_SERVER:
-            {
-                if (verbose)
-                    System.out.println ("test wstring_to_server");
-                return server.wstring_to_server (ref.get_wstring(data_set),
-                    data_set);
-            }          
+                return server.wstring_to_server (Client.
+                                                 ref.get_wstring(data_set),
+                                                 data_set);
             case 0x0004: //WARRAY_TO_SERVER:
-            {
-                if (verbose)
-                    System.out.println ("test warray_to_server");
-                return server.warray_to_server (ref.get_warray(data_set),
-                    data_set);
-            }
+                return server.warray_to_server (Client.
+                                                ref.get_warray(data_set),
+                                                data_set);
             case 0x0008: //ANY_WCHAR_TO_SERVER:
-            {
-                if (verbose)
-                    System.out.println ("test any_wchar_to_server");
-                Any a = orb.create_any();
-                a.insert_wchar (ref.get_wchar(data_set));
-                return server.any_to_server (a,data_set);
-            }
-            case 0x0010: //WSTRING_EXCEPTION:
-            {
-                if (verbose)
-                    System.out.println ("test wstring_exception");
-                try 
                 {
-                    server.exception_test(data_set);
-                } 
-                catch (interop.WChar_PasserPackage.WStringException ex) 
+                    Any a = orb.create_any();
+                    a.insert_wchar (ref.get_wchar(data_set));
+                    return server.any_to_server (a,data_set);
+                }
+            case 0x0010: //WSTRING_EXCEPTION:
                 {
-                    return ref.match_except (data_set,ex.why);
+                    try {
+                        server.exception_test(data_set);
+                    } catch (interop.WChar_PasserPackage.WStringException ex) {
+                        return Client.ref.match_except (data_set,ex.why);
+                    }
+                    break;
                 }
-                break;
-            }
             case 0x0020: // WCHAR_FROM_SERVER:
-            {
-                if (verbose)
-                    System.out.println ("test wchar_from_server");
-                char wc = server.wchar_from_server (data_set);
-                return ref.match_wchar (data_set,wc);
-            }
-            case 0x0040: //WSTRING_FROM_SERVER:
-            {
-                if (verbose)
-                    System.out.println ("test wstring_from_server");
-                String ws = server.wstring_from_server (data_set);
-                return ref.match_wstring (data_set,ws);
-            }
-            case 0x0080: //WARRAY_FROM_SERVER:
-            {
-                if (verbose)
-                    System.out.println ("test warray_from_server");
-                char wa[] = server.warray_from_server (data_set);
-                return ref.match_warray (data_set,wa);
-            }
-            case 0x0100: // ANY_WCHAR_FROM_SERVER:
-            {
-                if (verbose)
-                    System.out.println ("test any(wchar) from server not yet implemented");
-                return true;
-            }
-            case 0x0200: // ANY_WSTRING_TO_SERVER:
                 {
-                if (verbose)
-                    System.out.println ("test wstring to server not yet implemented");
-                return true;
-            }
-            case 0x0400: // ANY_WSTRING_FROM_SERVER:
+                    char wc = server.wchar_from_server (data_set);
+                    return Client.ref.match_wchar (data_set,wc);
+                }
+            case 0x0040: //WSTRING_FROM_SERVER:
                 {
-                if (verbose)
-                    System.out.println ("test wstring from server not yet implemented");
-                return true;
-            }
-            case 0x0800: // ANY_WSTRING_ECHO:
+                    String ws = server.wstring_from_server (data_set);
+                    return Client.ref.match_wstring (data_set,ws);
+                }
+            case 0x0080: //WARRAY_FROM_SERVER:
                 {
-                if (verbose)
-                    System.out.println ("test wstring echo not yet implemented");
-                return true;
-            }
-            case 0x1000: // WSTRUCTSEQ_FROM_SERVER
-            {
-                if (verbose)
-                    System.out.println ("test wstructseq_from_server");
-                wstruct wsList[] =
-                    server.wstructseq_from_server(data_set);
-                boolean result = true;
-                for (int i = 0; i < wsList.length; i++)
-                    result &=
-                        ref.match_wstring (data_set,
-                        wsList[i].st_string);
-                return result;
-            }
-            case 0x2000: // WSTRUCTSEQ_TO_SERVER
-            {
-                if (verbose)
-                    System.out.println ("test wstructseq_to_server");
-                wstruct wsList[] = new wstruct[5];
-                for (int i = 0; i < wsList.length; ++i)
+                    char wa[] = server.warray_from_server (data_set);
+                    return Client.ref.match_warray (data_set,wa);
+                }
+            case 0x0100: // ANY_WCHAR_FROM_SERVER:
                 {
-                    wsList[i] = get_wstruct(data_set);
                     if (verbose)
-                        System.out.println ("initialized wsList[" + i + "] : " + wsList[i]);
+                        System.out.println ("test any(wchar) from server not yet implemented");
+                    return true;
                 }
-                return server.wstructseq_to_server(wsList, data_set);
-            }
-      
             default:
-            {
-                if (verbose)
-                    System.out.println ("unknown test type" + test_num);
                 break;
-            }        
-        }
+            }
         return false;
     }
 
-    public boolean runTests (WChar_Passer server)
+    public static boolean runTests (WChar_Passer server)
     {
         int successes = 0;
         int numtests = 0;
@@ -187,49 +114,22 @@ public class Client
         int t = 1;
         for (int i = 0; i < test_name.length; i++, t <<= 1)
             if ((tests_to_run & t) == t)
-            {
-                boolean result = runOneTest (server,t);
-                ++numtests;
-                if (result) ++successes;
-                if (verbose)
-                    System.out.println (test_name[i] +
-                                        "[" + data_set + "] " +
-                                        (result ? "passed" : "failed"));
-            }
+                {
+                    boolean result = runOneTest (server,t);
+                    ++numtests;
+                    if (result) ++successes;
+                    if (verbose)
+                        System.out.println (test_name[i] +
+                                            "[" + data_set + "] " +
+                                            (result ? "passed" : "failed"));
+                }
         if (verbose)
             System.out.println ("Total of " + successes +
                                 "successes out of " + numtests + " tests");
         return successes == numtests;
     }
 
-    // TODO: this should have a home where it's accessable to both
-    // client & server, but it doesn't belong in WCharReference
-    public wstruct get_wstruct (short key)
-    {
-        wstruct result = new wstruct();
-
-        result.st_char = ref.get_wchar(key);
-        result.st_string = ref.get_wstring(key);
-        result.st_array = ref.get_warray(key);
-        result.st_any = orb.create_any();
-        result.st_any.insert_wstring(ref.get_wstring(key));
-          
-        return result;
-    }
-      
-    // TODO: this should have a home where it's accessable to both
-    // client & server, but it doesn't belong in WCharReference
-    public boolean match_wstruct (short key, wstruct test )
-    {
-        boolean result = ref.match_wchar(key, test.st_char);
-        result &= ref.match_wstring(key, test.st_string);
-        result &= ref.match_warray(key, test.st_array);
-        // @@ todo result &= ref.match_wstring (key, test.st_any.extract_wstring());
-        return result;
-    }
-  
-
-    public void run(String[] args)
+    public static void main( String[] args )
         throws Exception
     {
         String iorfile = "IOR";
@@ -285,7 +185,6 @@ public class Client
 
         // initialize the ORB.
         orb = org.omg.CORBA.ORB.init( args, null );
-        ref = new WCharReference(verbose);
 
         BufferedReader br =
             new BufferedReader( new FileReader( f ));
@@ -298,18 +197,11 @@ public class Client
 
         WChar_Passer wp = WChar_PasserHelper.narrow( obj );
 
-        boolean result = runTests (wp);
-        System.out.println ("wchar_interop test (Java client, " +
+        boolean result = Client.runTests (wp);
+        System.out.println ("wchar_interop test (Jacorb client, " +
                             wp.orb_name() + " server) " +
                             (result ? "passed" : "failed"));
         if (kill_server)
             wp.shutdown();
     }
-    public static void main( String[] args )
-        throws Exception
-    {
-        Client client = new Client();
-        client.run(args);
-    }
-  
 }// Client
diff --git a/TAO/interop-tests/wchar/Server.java b/TAO/interop-tests/wchar/Server.java
index 3fc1fb6d6d7..710f1ee775b 100644
--- a/TAO/interop-tests/wchar/Server.java
+++ b/TAO/interop-tests/wchar/Server.java
@@ -55,7 +55,7 @@ public class Server
                 poa.servant_to_reference( servant );
 
             PrintWriter pw =
-                new PrintWriter( new FileWriter( iorfile ));
+                new PrintWriter( new FileWriter( args[ 0 ] ));
 
             // print stringified object reference to file
             pw.println( orb.object_to_string( obj ));
diff --git a/TAO/interop-tests/wchar/WChar_PasserImpl.java b/TAO/interop-tests/wchar/WChar_PasserImpl.java
index ee3086bfa1b..575ba37fbe2 100644
--- a/TAO/interop-tests/wchar/WChar_PasserImpl.java
+++ b/TAO/interop-tests/wchar/WChar_PasserImpl.java
@@ -26,8 +26,7 @@ public class WChar_PasserImpl
 
     public String orb_name ()
     {
-        // we don't really know, eh?
-        return "Java ORB";
+        return "JacORB";
     }
 
     public boolean wchar_to_server (char test, short key)
@@ -66,7 +65,7 @@ public class WChar_PasserImpl
 
     public boolean wstruct_to_server (wstruct test, short key)
     {
-        return match_wstruct (key, test);
+        return false;
     }
 
     public wstruct wstruct_from_server (short key)
@@ -74,35 +73,6 @@ public class WChar_PasserImpl
         return new wstruct();
     }
 
-    public boolean wstructseq_to_server (wstruct[] test, short key)
-    {
-        boolean result = true;
-        System.out.println ("wstructseq_to_server called, key = " + key);
-        for (int i = 0; i < test.length; i++)
-        {
-            if (wstruct_to_server(test[i],key))
-            {
-                //            System.out.println ("wstructseq_to_server passed entry " + i);
-            }
-            else
-            {
-                System.out.println ("wstructseq_to_server FAILED entry " + i);
-                result = false;
-            }
-        }            
-        return result;
-    }
-    
-    public wstruct[] wstructseq_from_server (short key)
-    {
-        wstruct[] wsList = new wstruct[5];
-        for (int i = 0; i < wsList.length; i++)
-        {
-            wsList[i] = get_wstruct(key);
-        }
-        return wsList;
-    }
-
     public boolean wunion_to_server (wunion test, short key)
     {
         return false;
@@ -163,30 +133,5 @@ public class WChar_PasserImpl
         orb.shutdown(false);
     }
 
-    // TODO: this should have a home where it's accessable to both
-    // client & server, but it doesn't belong in WCharReference
-    public wstruct get_wstruct (short key)
-    {
-        wstruct result = new wstruct();
-
-        result.st_char = ref.get_wchar(key);
-        result.st_string = ref.get_wstring(key);
-        result.st_array = ref.get_warray(key);
-        result.st_any = orb.create_any();
-        result.st_any.insert_wstring(ref.get_wstring(key));
-          
-        return result;
-    }
-      
-    // TODO: this should have a home where it's accessable to both
-    // client & server, but it doesn't belong in WCharReference
-    public boolean match_wstruct (short key, wstruct test )
-    {
-        boolean result = ref.match_wchar(key, test.st_char);
-        result &= ref.match_wstring(key, test.st_string);
-        result &= ref.match_warray(key, test.st_array);
-        // @@ todo result &= ref.match_wstring (key, test.st_any.extract_wstring());
-        return result;
-    }
 
 }
diff --git a/TAO/interop-tests/wchar/interop_wchar.idl b/TAO/interop-tests/wchar/interop_wchar.idl
index 8b8a7ca3b56..bb15e237584 100644
--- a/TAO/interop-tests/wchar/interop_wchar.idl
+++ b/TAO/interop-tests/wchar/interop_wchar.idl
@@ -14,8 +14,6 @@ module interop {
     any st_any;
   };
 
-  typedef sequence< wstruct > wstructseq;
-
   enum wchar_types {is_wchar, is_wstring, is_warray};
 
   union wunion switch (wchar_types) {
@@ -44,9 +42,6 @@ module interop {
     boolean wstruct_to_server (in wstruct test, in short key);
     wstruct wstruct_from_server (in short key);
 
-    boolean wstructseq_to_server (in wstructseq test, in short key);
-    wstructseq wstructseq_from_server (in short key);
-
     boolean wunion_to_server (in wunion test, in short key);
     wunion wunion_from_server (in short key, in wchar_types type);
 
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index 88aa05387ca..907d1c45285 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.cpp
+++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp
@@ -98,86 +98,43 @@ interop_WChar_Passer_i::warray_from_server (CORBA::Short key
 CORBA::Boolean
 interop_WChar_Passer_i::wstruct_to_server (const interop::wstruct & test,
                                            CORBA::Short key
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return
     ref_.match_wchar (key,test.st_char) &&
     ref_.match_wstring (key,test.st_string) &&
     ref_.match_warray (key,test.st_array) &&
-    this->any_to_server (test.st_any,key ACE_ENV_ARG_PARAMETER);
+    this->any_to_server (test.st_any,key);
 }
 
 interop::wstruct *
 interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key
-                                             ACE_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
-  interop::wstruct_var ws = new interop::wstruct ();
-  ws->st_char = this->wchar_from_server(key ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  ws->st_string = this->wstring_from_server(key ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  interop::wstruct *ws = new interop::wstruct ();
+  ws->st_char = this->wchar_from_server(key);
+  ws->st_string = this->wstring_from_server(key);
   ref_.assign_warray (key, ws->st_array);
   ws->st_any <<= ref_.get_wstring(key);
-  return ws._retn ();
-}
-
-CORBA::Boolean
-interop_WChar_Passer_i::wstructseq_to_server (const interop::wstructseq & test,
-                                              CORBA::Short key
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC (( CORBA::SystemException ))
-{
-  CORBA::Boolean result = 1;
-  for (CORBA::ULong i = 0; result && i < test.length(); i++)
-    {
-      result = this->wstruct_to_server(test[i], key ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-  return result;
-}
-
-interop::wstructseq *
-interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key
-                                                ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (( CORBA::SystemException ))
-{
-  interop::wstructseq_var wsListI = new interop::wstructseq();
-  wsListI->length(5);
-
-  for (CORBA::ULong i = 0; i < wsListI->length(); i++)
-    {
-      wsListI[i].st_char = this->wchar_from_server(key ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-      wsListI[i].st_string = this->wstring_from_server(key ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-      ref_.assign_warray (key, wsListI[i].st_array);
-      // this is to keep Cxx on TRUE64 happy
-      // it won't cast a wide character literal (i.e. L"")
-      // to a CORBA::WChar *.  +
-      // {I wonder if sizeof(wchar_t) != sizeof (CORBA::WChar)?}
-      const CORBA::WChar empty_wstring[] = {0};
-      wsListI[i].st_any <<= CORBA::wstring_dup(empty_wstring);
-    }
-  return wsListI._retn();
+  return ws;
 }
 
 CORBA::Boolean
 interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test,
                                           CORBA::Short key
-                                          ACE_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   switch (test._d()) {
   case interop::is_wchar :
-    return this->wchar_to_server (test.u_char(),key  ACE_ENV_ARG_PARAMETER);
+    return this->wchar_to_server (test.u_char(),key);
   case interop::is_wstring :
-    return this->wstring_to_server (test.u_string(),key  ACE_ENV_ARG_PARAMETER);
+    return this->wstring_to_server (test.u_string(),key);
   case interop::is_warray :
-    return this->warray_to_server (test.u_array(),key ACE_ENV_ARG_PARAMETER);
-  default:
-    /*return 0*/;
+    return this->warray_to_server (test.u_array(),key);
+  default:;
   }
   return 0;
 }
@@ -207,7 +164,7 @@ interop_WChar_Passer_i::wunion_from_server (CORBA::Short key,
 CORBA::Boolean
 interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
                                        CORBA::Short key
-                                       ACE_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::WChar wc;
@@ -217,15 +174,15 @@ interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
 
   if (test >>= CORBA::Any::to_wchar(wc))
     {
-      return this->wchar_to_server(wc,key ACE_ENV_ARG_PARAMETER);
+      return this->wchar_to_server(wc,key);
     }
   else if (test >>= ws)
     {
-      return this->wstring_to_server (ws,key ACE_ENV_ARG_PARAMETER);
+      return this->wstring_to_server (ws,key);
     }
   else if (test >>= forany)
     {
-      return this->warray_to_server (forany.in(),key ACE_ENV_ARG_PARAMETER);
+      return this->warray_to_server (forany.in(),key);
     }
   return 0;
 }
@@ -269,7 +226,7 @@ interop_WChar_Passer_i::exception_test ( CORBA::Short key
                    interop::WChar_Passer::WStringException))
 {
   ACE_THROW (interop::WChar_Passer::WStringException(ref_.get_except(key),
-                                             this->wchar_from_server(key ACE_ENV_ARG_PARAMETER)));
+                                             this->wchar_from_server(key)));
 }
 
 void
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h
index 395d1a89607..261076c08e0 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.h
+++ b/TAO/interop-tests/wchar/interop_wchar_i.h
@@ -42,84 +42,75 @@ public:
   //Destructor
   virtual ~interop_WChar_Passer_i (void);
 
-  virtual char * orb_name (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * orb_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wchar_to_server (CORBA::WChar test,
                                           CORBA::Short key
-                                          ACE_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::WChar wchar_from_server (CORBA::Short key
-                                          ACE_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wstring_to_server (const CORBA::WChar * test,
                                             CORBA::Short key
-                                            ACE_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::WChar * wstring_from_server (CORBA::Short key
-                                              ACE_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean warray_to_server (const interop::warray test,
                                            CORBA::Short key
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual interop::warray_slice * warray_from_server (CORBA::Short key
-                                                      ACE_ENV_ARG_DECL)
+                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wstruct_to_server (const interop::wstruct & test,
                                             CORBA::Short key
-                                            ACE_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual interop::wstruct * wstruct_from_server (CORBA::Short key
-                                                  ACE_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual CORBA::Boolean wstructseq_to_server (const interop::wstructseq & test,
-                                            CORBA::Short key
-                                            ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
-
-  virtual interop::wstructseq * wstructseq_from_server (CORBA::Short key
-                                             ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (( CORBA::SystemException ));
-
- virtual CORBA::Boolean wunion_to_server (const interop::wunion & test,
+  virtual CORBA::Boolean wunion_to_server (const interop::wunion & test,
                                            CORBA::Short key
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual interop::wunion * wunion_from_server (CORBA::Short key,
                                                 interop::wchar_types type
-                                                ACE_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean any_to_server (const CORBA::Any &test,
                                         CORBA::Short key
-                                        ACE_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Any* any_from_server (CORBA::Short key,
                                        interop::wchar_types type
-                                       ACE_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Any* any_echo (const CORBA::Any &test
-                                ACE_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
 virtual void exception_test (CORBA::Short key
-                             ACE_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException,
                     interop::WChar_Passer::WStringException ));
 
-virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
 private:
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index 133b1c752e8..38d5bb7ad7e 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -28,8 +28,8 @@
 
 #include "ace/Log_Msg.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Concurrency/Concurrency_Utils.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 class Concurrency_Service : public TAO_ORB_Manager
 {
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index 1287013fe4b..97361a68618 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, concurrency, naming_serv {
+project : orbsvcsexe, core, concurrency, naming {
   exename  = Concurrency_Service
 }
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
index 2c58dcc0132..52cb1706816 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile.am
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am
@@ -7,33 +7,34 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Concurrency_Service.am 
 
-bin_PROGRAMS = Concurrency_Service
+noinst_PROGRAMS = Concurrency_Service
 
 Concurrency_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Concurrency_Service_SOURCES = \
-  Concurrency_Service.cpp \
-  Concurrency_Service.h
+  Concurrency_Service.cpp
 
 Concurrency_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_HEADERS = \
+  Concurrency_Service.h
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 2bb2e9205ac..4dfc74e1fde 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
-#include "orbsvcs/CosEvent/CEC_Event_Loader.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h"
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index 220aa334965..d5c50ee1e2f 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, event_serv, naming, svc_utils, iortable, messaging, portableserver {
+project : orbsvcsexe, core, event, naming, svc_utils, iortable, messaging, portableserver {
   exename  = CosEvent_Service
 }
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am
index a8ad39313de..64ad6907473 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.am
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am
@@ -7,38 +7,35 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.CosEvent_Service.am 
 
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS = CosEvent_Service
+noinst_PROGRAMS = CosEvent_Service
 
 CosEvent_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL \
+  $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH)
 
 CosEvent_Service_SOURCES = \
   CosEvent_Service.cpp
 
 CosEvent_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index 414aa3075b5..90c6ad963d1 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -6,8 +6,8 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_main.h"
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 
 ACE_RCSID (Dump_Schedule, 
            Dump_Schedule, 
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am
index 7fb792c49ef..926f30d88fc 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile.am
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am
@@ -7,28 +7,32 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Dump_Schedule.am 
 
-bin_PROGRAMS = Dump_Schedule
+noinst_PROGRAMS = Dump_Schedule
 
 Dump_Schedule_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Dump_Schedule_SOURCES = \
   Dump_Schedule.cpp
 
 Dump_Schedule_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index c0355d78d0f..f8dad651a53 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -7,14 +7,14 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_main.h"
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Event/Module_Factory.h"
-#include "orbsvcs/Event/Event_Channel.h"
-
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
 
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "ace/OS_NS_strings.h"
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index 6e6065f292b..a97012f6900 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -12,12 +12,12 @@
 #define EC_EVENT_SERVICE_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
 #include "ace/SString.h"
 
 class TAO_Module_Factory;
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
index 1acbc3499a5..f4a190213f9 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -7,39 +7,41 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Event_Service.am 
 
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS = Event_Service
+noinst_PROGRAMS = Event_Service
 
 Event_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs \
   -DTAO_HAS_TYPED_EVENT_CHANNEL
 
 Event_Service_SOURCES = \
-  Event_Service.cpp \
-  Event_Service.h
+  Event_Service.cpp
 
 Event_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
+noinst_HEADERS = \
+  Event_Service.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index 8f9e7124820..b4568f7dba7 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -7,9 +7,9 @@
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Stream.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID (Event_Service,
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
index 64fd3722ff6..958173e1715 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
@@ -12,10 +12,10 @@
 #ifndef FT_EVENTSERVICE_H
 #define FT_EVENTSERVICE_H
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
 #include "TP_Task.h"
 
 namespace POA_RtecScheduler
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
index c3fcee5e40f..24611ad85f2 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
@@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.FTRT_Event_Service.am 
 
-if BUILD_CORBA_MESSAGING
-if !BUILD_MINIMUM_CORBA
-
 noinst_PROGRAMS = ftrt_eventservice
 
 ftrt_eventservice_CPPFLAGS = \
@@ -17,15 +14,12 @@ ftrt_eventservice_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs \
   -I$(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel \
   -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
 
 ftrt_eventservice_SOURCES = \
-  FT_EventService.cpp \
-  FT_EventService.h \
-  TP_Task.h
+  FT_EventService.cpp
 
 ftrt_eventservice_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_EventChannel.la \
@@ -34,18 +28,22 @@ ftrt_eventservice_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_CORBA_MESSAGING
+noinst_HEADERS = \
+  FT_EventService.h \
+  TP_Task.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index 35a72e48214..a46723ae7fd 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -5,7 +5,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Stream.h"
-#include "orbsvcs/FtRtEvent/Utils/UUID.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h"
 
 ACE_RCSID (Factory_Service,
            EventChannelFactory_i,
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
index 656df7363bf..bd0c8a0b174 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
@@ -13,7 +13,7 @@
 #ifndef EVENTCHANNELFACTORY_I_H
 #define EVENTCHANNELFACTORY_I_H
 
-#include "orbsvcs/FT_CORBAS.h"
+#include "orbsvcs/orbsvcs/FT_CORBAS.h"
 #include "ace/Synch.h"
 #include "ace/Hash_Map_Manager_T.h"
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
index fcf1d07ad22..b3dadfc1daf 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel {
+project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification {
   after    += FaultTolerance
   exename   = ftrtec_factory_service
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
index 40653ddb2b5..5bc5db16548 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
@@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.FTRTEC_Factory_Service.am 
 
-if BUILD_ACE_UUID
-if !BUILD_MINIMUM_CORBA
-
 noinst_PROGRAMS = ftrtec_factory_service
 
 ftrtec_factory_service_CPPFLAGS = \
@@ -17,36 +14,35 @@ ftrtec_factory_service_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 ftrtec_factory_service_SOURCES = \
   EventChannelFactory_i.cpp \
-  FTRTEC_Factory_Service.cpp \
-  EventChannelFactory_i.h
+  FTRTEC_Factory_Service.cpp
 
 ftrtec_factory_service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACE_UUID
+noinst_HEADERS = \
+  EventChannelFactory_i.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index 3a8a8db6714..4ebd1ce8f4d 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -2,13 +2,13 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
-#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
 /// include this file to statically linked with FT ORB
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
 /// include this file to statically linked with Transaction Depth
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
 ACE_RCSID (Gateway_Service,
            FTRTEC_Gateway_Service,
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
index d46fcdc9e68..79ee5cfa865 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
@@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.FTRTEC_Gateway_Service.am 
 
-if BUILD_ACE_UUID
-if !BUILD_MINIMUM_CORBA
-
 noinst_PROGRAMS = ftrtec_gateway_service
 
 ftrtec_gateway_service_CPPFLAGS = \
@@ -17,8 +14,7 @@ ftrtec_gateway_service_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs \
   -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
 
 ftrtec_gateway_service_SOURCES = \
@@ -28,19 +24,20 @@ ftrtec_gateway_service_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACE_UUID
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index 83df60813d3..c1c9cec8356 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
@@ -12,10 +12,10 @@
 //=============================================================================
 
 #include "FT_DefaultFaultAnalyzer.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/FT_NotifierC.h"
-#include "orbsvcs/FT_FaultDetectorFactoryC.h"
-#include "orbsvcs/FT_ReplicationManagerC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/FT_NotifierC.h"
+#include "orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h"
+#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h"
 #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
index 814162e6662..ccf11188739 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "FT_ReplicationManagerLib_export.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 
 namespace TAO
 {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 2464d558f1a..68c97c8833e 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -17,7 +17,7 @@
 //=============================================================================
 
 #include "FT_FaultConsumer.h"
-#include "orbsvcs/FT_ReplicationManagerC.h"
+#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h"
 #include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 4ce246a321a..38bf8e8b347 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -22,8 +22,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyCommS.h"
-#include "orbsvcs/FT_NotifierC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommS.h"
+#include "orbsvcs/orbsvcs/FT_NotifierC.h"
 #include "FT_ReplicationManagerLib_export.h"
 
 namespace TAO
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index d0b64b49e4f..2c8ce6cb62d 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
@@ -22,8 +22,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/FT_CORBAC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/FT_CORBAC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "FT_ReplicationManagerLib_export.h"
 
 namespace TAO
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 205f9f96d63..e2df60d3357 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -1,6 +1,6 @@
 #include "FT_Property_Validator.h"
-#include "orbsvcs/PortableGroup/PG_Operators.h"
-#include "orbsvcs/FT_ReplicationManagerC.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h"
+#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h"
 
 
 ACE_RCSID (PortableGroup,
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index cc5912f9b36..6b389719098 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -15,8 +15,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index b0e7514c829..28e2ebd144a 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -22,13 +22,13 @@
 #include "tao/IORTable/IORTable.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
-#include "orbsvcs/PortableGroup/PG_Object_Group.h"
-#include "orbsvcs/PortableGroup/PG_Property_Set.h"
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
-#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
 
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h"
 
 ACE_RCSID (FT_ReplicationManager,
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 3536274bd0d..dd8f18d4f50 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -22,16 +22,16 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include <orbsvcs/FT_ReplicationManagerS.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerS.h>
 //#include <orbsvcs/PortableGroup/PG_PropertyManager.h>
 //#include <orbsvcs/PortableGroup/PG_GenericFactory.h>
 //#include <orbsvcs/PortableGroup/PG_ObjectGroupManager.h>
 // Note: the new, improved versions...
 //#include <orbsvcs/PortableGroup/PG_Object_Group_Map.h>
-#include <orbsvcs/PortableGroup/PG_Properties_Support.h>
-#include <orbsvcs/PortableGroup/PG_Group_Factory.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h>
 
-#include <orbsvcs/PortableGroup/PG_FactoryRegistry.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h>
 #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h>
 
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index dfd27e69fe0..c8b0643d09c 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -1,7 +1,8 @@
 // $Id$
-project(*Lib): orbsvcslib, core, fault_tolerance, notification_skel, ftorb, portablegroup, minimum_corba {
+project(*Lib): orbsvcslib, core, notification, fault_tolerance, ftorb, portablegroup {
   sharedname   = TAO_ReplicationManagerLib
   dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL
+  avoids      += minimum_corba
 
   Source_Files {
     FT_FaultAnalyzer.cpp
@@ -11,7 +12,7 @@ project(*Lib): orbsvcslib, core, fault_tolerance, notification_skel, ftorb, port
   }
 }
 
-project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb {
+project : taoserver, orbsvcsexe, fault_tolerance, iormanip, ftorb {
   exename  = FT_ReplicationManager
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index ecce2c241ae..326235cde9c 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -12,13 +12,13 @@
 //=============================================================================
 
 #include "FT_ReplicationManagerFaultAnalyzer.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/FT_NotifierC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/FT_NotifierC.h"
 #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h"
 #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h"
-#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
-#include "orbsvcs/PortableGroup/PG_Operators.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "tao/debug.h"
 #include <iostream>
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
index f15238af5bf..1149c2e149f 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
@@ -24,7 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h"
-#include "orbsvcs/FT_CORBAC.h"
+#include "orbsvcs/orbsvcs/FT_CORBAC.h"
 
 // Forward declarations.
 template <class T> class ACE_Unbounded_Set;
diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
index c033916bcff..e7b4181ac89 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
+++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
@@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.FT_ReplicationManager_Lib.am 
 
-if BUILD_ACE_UUID
-if !BUILD_MINIMUM_CORBA
-
 lib_LTLIBRARIES = libTAO_ReplicationManagerLib.la
 
 libTAO_ReplicationManagerLib_la_CPPFLAGS = \
@@ -17,16 +14,14 @@ libTAO_ReplicationManagerLib_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs \
   -DTAO_REPLICATIONMANAGERLIB_BUILD_DLL
 
 libTAO_ReplicationManagerLib_la_SOURCES = \
-  FT_DefaultFaultAnalyzer.cpp \
   FT_FaultAnalyzer.cpp \
-  FT_FaultConsumer.cpp \
-  FT_FaultEventDescriptor.cpp
+  FT_DefaultFaultAnalyzer.cpp \
+  FT_FaultEventDescriptor.cpp \
+  FT_FaultConsumer.cpp
 
 libTAO_ReplicationManagerLib_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
@@ -38,29 +33,29 @@ libTAO_ReplicationManagerLib_la_LIBADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 noinst_HEADERS = \
-  FT_DefaultFaultAnalyzer.h \
   FT_FaultAnalyzer.h \
-  FT_FaultConsumer.h \
-  FT_FaultEventDescriptor.h
+  FT_FaultEventDescriptor.h \
+  FT_DefaultFaultAnalyzer.h \
+  FT_FaultConsumer.h
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACE_UUID
 
 ## Makefile.FT_ReplicationManager.am 
 
-if BUILD_ACE_UUID
-if !BUILD_MINIMUM_CORBA
-
 noinst_PROGRAMS = FT_ReplicationManager
 
 FT_ReplicationManager_CPPFLAGS = \
@@ -68,43 +63,40 @@ FT_ReplicationManager_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 FT_ReplicationManager_SOURCES = \
-  FT_Property_Validator.cpp \
   FT_ReplicationManager.cpp \
-  FT_ReplicationManagerFaultAnalyzer.cpp \
   FT_ReplicationManager_Main.cpp \
-  FT_Property_Validator.h \
-  FT_ReplicationManager.h \
-  FT_ReplicationManagerFaultAnalyzer.h
+  FT_Property_Validator.cpp \
+  FT_ReplicationManagerFaultAnalyzer.cpp
 
 FT_ReplicationManager_LDADD = \
-  libTAO_ReplicationManagerLib.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACE_UUID
+ libTAO_ReplicationManagerLib.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+  FT_ReplicationManagerFaultAnalyzer.h \
+  FT_Property_Validator.h \
+  FT_ReplicationManager.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index ef7637ddf64..30ba12055a6 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -14,8 +14,8 @@
 #include "Fault_Detector_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/PortableGroup/PG_Property_Set.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h"
 
 // Use this macro at the beginning of CORBA methods
 // to aid in debugging.
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index ec7dd75f590..c9d5b8e6398 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -32,8 +32,8 @@ namespace TAO
 /////////////////////////////////
 // Includes needed by this header
 #include <ace/Vector_T.h>
-#include <orbsvcs/FT_FaultDetectorFactoryS.h>
-#include <orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryS.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
 #include <ace/Thread_Manager.h>
 
 /////////////////////
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
index d5882ad1a15..9f5d76029cf 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
@@ -36,8 +36,8 @@ namespace TAO
 }
 
 
-#include "orbsvcs/FT_NotifierC.h"
-#include "orbsvcs/FT_ReplicaC.h"
+#include "orbsvcs/orbsvcs/FT_NotifierC.h"
+#include "orbsvcs/orbsvcs/FT_ReplicaC.h"
 #include "ace/Time_Value.h"
 
 
diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am
index f61903d0926..cb913c06ab4 100644
--- a/TAO/orbsvcs/Fault_Detector/Makefile.am
+++ b/TAO/orbsvcs/Fault_Detector/Makefile.am
@@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Fault_Detector.am 
 
-if BUILD_ACE_UUID
-if !BUILD_MINIMUM_CORBA
-
 noinst_PROGRAMS = Fault_Detector
 
 Fault_Detector_CPPFLAGS = \
@@ -17,16 +14,12 @@ Fault_Detector_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Fault_Detector_SOURCES = \
-  FT_FaultDetectorFactory_i.cpp \
-  Fault_Detector_Main.cpp \
   Fault_Detector_i.cpp \
-  FT_FaultDetectorFactory_i.h \
-  Fault_Detector_i.h
+  Fault_Detector_Main.cpp \
+  FT_FaultDetectorFactory_i.cpp
 
 Fault_Detector_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
@@ -35,17 +28,23 @@ Fault_Detector_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACE_UUID
+noinst_HEADERS = \
+  FT_FaultDetectorFactory_i.h \
+  Fault_Detector_i.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index ab820df236c..5f3e11e20d8 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -34,9 +34,9 @@ namespace TAO
 }
 
 
-#include <orbsvcs/FT_NotifierS.h>
-#include <orbsvcs/FT_ReplicationManagerC.h>
-#include <orbsvcs/Notify/Notify_EventChannelFactory_i.h>
+#include <orbsvcs/orbsvcs/FT_NotifierS.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h>
 #include <ace/Vector_T.h>
 
 /////////////////////
diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
index ae081aaa722..5f079ce6c8a 100644
--- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
+++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : taoserver, orbsvcsexe, fault_tolerance, notification_serv {
+project : taoserver, orbsvcsexe, fault_tolerance, notification {
   exename  = Fault_Notifier
   Source_Files {
     FT_Notifier_i.cpp
diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am
index 68c4b852343..c941b54cb4e 100644
--- a/TAO/orbsvcs/Fault_Notifier/Makefile.am
+++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am
@@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Fault_Notifier.am 
 
-if BUILD_ACE_UUID
-if !BUILD_MINIMUM_CORBA
-
 noinst_PROGRAMS = Fault_Notifier
 
 Fault_Notifier_CPPFLAGS = \
@@ -17,40 +14,35 @@ Fault_Notifier_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Fault_Notifier_SOURCES = \
   FT_Notifier_i.cpp \
-  Fault_Notifier_Main.cpp \
-  FT_Notifier_i.h
+  Fault_Notifier_Main.cpp
 
 Fault_Notifier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACE_UUID
+noinst_HEADERS = \
+  FT_Notifier_i.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index f598d35bb93..4ce922eda83 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -2,11 +2,11 @@
 // $Id$
 
 #include "IFR_Service.h"
-#include "orbsvcs/IFRService/ComponentRepository_i.h"
-#include "orbsvcs/IFRService/Options.h"
-#include "orbsvcs/IFRService/IFR_ComponentsS.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
-#include "orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h"
+#include "orbsvcs/orbsvcs/IFRService/Options.h"
+#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h"
+#include "orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
 #include "tao/IORTable/IORTable.h"
 #include "tao/ORB_Core.h"
 #include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index 566eec1207a..a66487d1896 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -17,7 +17,7 @@
 #define IFR_SERVICE_H
 
 #include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h"
 #include "tao/ORB.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am
index 4e6b40c3a68..ef0f466d495 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.am
+++ b/TAO/orbsvcs/IFR_Service/Makefile.am
@@ -7,39 +7,36 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.IFR_Service.am 
 
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS = IFR_Service
+noinst_PROGRAMS = IFR_Service
 
 IFR_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_BUILDDIR)
 
 IFR_Service_SOURCES = \
   IFR_Server.cpp \
-  IFR_Service.cpp \
-  IFR_Service.h
+  IFR_Service.cpp
 
 IFR_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \
+ $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
+noinst_HEADERS = \
+  IFR_Service.h
 
 ## Makefile.TAO_IFR_BE.am 
 
-if !BUILD_MINIMUM_CORBA
-
 lib_LTLIBRARIES = libTAO_IFR_BE.la
 
 libTAO_IFR_BE_la_CPPFLAGS = \
@@ -67,29 +64,26 @@ libTAO_IFR_BE_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_IFR_BE_la_LIBADD = \
-  $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-noinst_HEADERS = \
+noinst_HEADERS += \
   be_extern.h \
   be_global.h \
-  ifr_adding_visitor.h \
+  ifr_adding_visitor_union.h \
   ifr_adding_visitor_exception.h \
-  ifr_adding_visitor_operation.h \
   ifr_adding_visitor_structure.h \
-  ifr_adding_visitor_union.h \
-  ifr_removing_visitor.h \
-  ifr_visitor.h
+  ifr_adding_visitor_operation.h \
+  ifr_adding_visitor.h \
+  ifr_visitor.h \
+  ifr_removing_visitor.h
 
-endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.TAO_IFR_EXE.am 
 
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS += tao_ifr
+bin_PROGRAMS = tao_ifr
 
 tao_ifr_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -103,8 +97,7 @@ tao_ifr_CPPFLAGS = \
 tao_ifr_SOURCES = \
   $(TAO_ROOT)/TAO_IDL/driver/drv_args.cpp \
   $(TAO_ROOT)/TAO_IDL/driver/drv_preproc.cpp \
-  $(TAO_ROOT)/TAO_IDL/tao_idl.cpp \
-  $(TAO_ROOT)/TAO_IDL/include/drv_extern.h
+  $(TAO_ROOT)/TAO_IDL/tao_idl.cpp
 
 tao_ifr_LDADD = \
   libTAO_IFR_BE.la \
@@ -113,7 +106,8 @@ tao_ifr_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
+noinst_HEADERS += \
+  $(TAO_ROOT)/TAO_IDL/include/drv_extern.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index 71e5dd3eab4..ba73720cb32 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -17,7 +17,7 @@
 
 #include "Server_Repository.h"
 
-#include "orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
 
 #include "tao/PortableServer/ImplRepoS.h"
 #include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index f2971a7fbc5..fa08b1b2df3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -7,7 +7,7 @@
 #include "INS_Locator.h"
 #include "Adapter_Activator.h"
 
-#include "orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
 
 #include "tao/IORTable/IORTable.h"
 #include "tao/PortableServer/POA.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index 39f5d0f11fb..c36d04a647e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -31,7 +31,6 @@ project(ImR_Activator) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, ior
 
 project(tao_imr) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable {
   exename  = tao_imr
-  install  = $(ACE_ROOT)/bin
   Source_Files {
     tao_imr.cpp
     tao_imr_i.cpp
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index d170b8fdca1..6551226a03b 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -14,8 +14,8 @@
 // ============================================================================
 
 
-#include "orbsvcs/CosLifeCycleC.h"
-#include "orbsvcs/LifeCycleServiceC.h"
+#include "orbsvcs/orbsvcs/CosLifeCycleC.h"
+#include "orbsvcs/orbsvcs/LifeCycleServiceC.h"
 
 #ifndef CRITERIA_EVALUATOR_H_H
 #define CRITERIA_EVALUATOR_H_H
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index f088231c4f2..9fd155d9179 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -20,7 +20,7 @@
 // ============================================================================
 
 #include "Factory_Trader.h"
-#include "orbsvcs/CosTradingC.h"
+#include "orbsvcs/orbsvcs/CosTradingC.h"
 
 ACE_RCSID (LifeCycle_Service, 
            Factory_Trader, 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
index ebf8a024d32..5a42d04a3cb 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
@@ -17,9 +17,9 @@
 #ifndef FACTORY_TRADER_H
 #define FACTORY_TRADER_H
 
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
-#include "orbsvcs/CosLifeCycleC.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h"
+#include "orbsvcs/orbsvcs/CosLifeCycleC.h"
 
 
 class Factory_Trader
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 1375457f260..ce6a8681ac2 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, lifecycle, naming, trading_serv, minimum_corba {
+project : orbsvcsexe, core, lifecycle, naming, trading {
+  avoids  += minimum_corba
   exename  = LifeCycle_Service
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index a1e011451b8..b0a3411bbaa 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -15,7 +15,7 @@
 
 #include "ace/Get_Opt.h"
 
-#include "orbsvcs/LifeCycleServiceC.h"
+#include "orbsvcs/orbsvcs/LifeCycleServiceC.h"
 
 #include "LifeCycle_Service_i.h"
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index 2997da242a5..562d97451de 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/LifeCycleServiceS.h"
+#include "orbsvcs/orbsvcs/LifeCycleServiceS.h"
 #include "Factory_Trader.h"
 #include "Criteria_Evaluator.h"
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
index 1583bc278c8..b1ca8c9c112 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
@@ -7,41 +7,41 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.LifeCycle_Service.am 
 
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS = LifeCycle_Service
+noinst_PROGRAMS = LifeCycle_Service
 
 LifeCycle_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 LifeCycle_Service_SOURCES = \
-  Criteria_Evaluator.cpp \
   Factory_Trader.cpp \
+  Criteria_Evaluator.cpp \
   LifeCycle_Service.cpp \
-  LifeCycle_Service_i.cpp \
-  Criteria_Evaluator.h \
-  Factory_Trader.h \
-  LifeCycle_Service.h \
-  LifeCycle_Service_i.h
+  LifeCycle_Service_i.cpp
 
 LifeCycle_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+  LifeCycle_Service_i.h \
+  Factory_Trader.h \
+  Criteria_Evaluator.h \
+  LifeCycle_Service.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
index 2574a799cfd..1528d5321b4 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
@@ -1,10 +1,7 @@
 // -*- MPC -*-
-//
 // $Id$
 
-
-project(LoadManager): namingexe, portableserver, core, iortable, iormanip, loadbalancing {
-  exename  = LoadManager
+project(CosLoadManager): namingexe, portableserver, core, iormanip, loadbalancing {
   requires += ami interceptors
   Source_Files {
     LoadManager.cpp
@@ -12,9 +9,8 @@ project(LoadManager): namingexe, portableserver, core, iortable, iormanip, loadb
   }
 }
 
-project(LoadMonitor): namingexe, portableserver, core, loadbalancing {
+project(CosLoadMonitor): namingexe, portableserver, core, loadbalancing {
   requires += ami interceptors
-  exename  = LoadMonitor
   Source_Files {
     LoadMonitor.cpp
     Push_Handler.cpp
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index c1976869d18..e554d610122 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -1,6 +1,6 @@
 #include "Signal_Handler.h"
 
-#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index f358baac632..aaadc7a2e05 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -1,8 +1,8 @@
 #include "Push_Handler.h"
 #include "Monitor_Signal_Handler.h"
 
-#include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h"
-#include "orbsvcs/LoadBalancing/LB_conf.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_conf.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am
index ab6a73c5bef..41c2fd88751 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.am
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.am
@@ -5,86 +5,75 @@ ACE_BUILDDIR = $(top_builddir)/..
 TAO_ROOT = $(top_srcdir)
 TAO_BUILDDIR = $(top_builddir)
 
-## Makefile.LoadManager.am 
+## Makefile.CosLoadManager.am 
 
-if BUILD_AMI
-if BUILD_INTERCEPTORS
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS = LoadManager
+noinst_PROGRAMS = LoadManager
 
 LoadManager_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 LoadManager_SOURCES = \
   LoadManager.cpp \
-  Signal_Handler.cpp \
-  Signal_Handler.h
+  Signal_Handler.cpp
 
 LoadManager_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_INTERCEPTORS
-endif BUILD_AMI
-
-## Makefile.LoadMonitor.am 
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+  Signal_Handler.h
 
-if BUILD_AMI
-if BUILD_INTERCEPTORS
-if !BUILD_MINIMUM_CORBA
+## Makefile.CosLoadMonitor.am 
 
-bin_PROGRAMS += LoadMonitor
+noinst_PROGRAMS += LoadMonitor
 
 LoadMonitor_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 LoadMonitor_SOURCES = \
   LoadMonitor.cpp \
-  Monitor_Signal_Handler.cpp \
   Push_Handler.cpp \
-  Signal_Handler.cpp \
-  Monitor_Signal_Handler.h \
-  Push_Handler.h \
-  Signal_Handler.h
+  Monitor_Signal_Handler.cpp \
+  Signal_Handler.cpp
 
 LoadMonitor_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_INTERCEPTORS
-endif BUILD_AMI
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+  Push_Handler.h \
+  Signal_Handler.h \
+  Monitor_Signal_Handler.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h
index aee41ca5e76..97d44eeb471 100644
--- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h
@@ -20,7 +20,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 
 /**
diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.h b/TAO/orbsvcs/LoadBalancer/Push_Handler.h
index 7913a399f72..1faa67aaf3b 100644
--- a/TAO/orbsvcs/LoadBalancer/Push_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 #include "ace/Event_Handler.h"
 
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
index ad5e1e76b66..8f5d3c09116 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
@@ -1,5 +1,4 @@
 // $Id$
-project: namingexe, core, dslogadmin_serv {
-  exename   = Basic_Logging_Service
+project: namingexe, dslogadmin {
   includes += $(TAO_ROOT)/orbsvcs
 }
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
index 66f65eb0284..2bfd1e99121 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
@@ -7,7 +7,7 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Basic_Logging_Service.am 
 
-bin_PROGRAMS = Basic_Logging_Service
+noinst_PROGRAMS = Basic_Logging_Service
 
 Basic_Logging_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -15,23 +15,30 @@ Basic_Logging_Service_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Basic_Logging_Service_SOURCES = \
-  Basic_Logging_Service.cpp \
-  Basic_Logging_Service.h
+  Basic_Logging_Service.cpp
 
 Basic_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_HEADERS = \
+  Basic_Logging_Service.h
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
index 2fef8068b7e..3ad79188922 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
@@ -1,5 +1,4 @@
 // $Id$
-project: namingexe, core, dseventlogadmin_serv {
-  exename   = Event_Logging_Service
+project: namingexe, dseventlogadmin {
   includes += $(TAO_ROOT)/orbsvcs
 }
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
index a827aca7cb3..be54683a0b2 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
@@ -7,45 +7,42 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Event_Logging_Service.am 
 
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS = Event_Logging_Service
+noinst_PROGRAMS = Event_Logging_Service
 
 Event_Logging_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs \
   -DTAO_HAS_TYPED_EVENT_CHANNEL
-
+ 
 Event_Logging_Service_SOURCES = \
-  Event_Logging_Service.cpp \
-  Event_Logging_Service.h
+  Event_Logging_Service.cpp
 
 Event_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
+noinst_HEADERS = \
+  Event_Logging_Service.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
index 14d699263cd..8d9d161d35a 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
@@ -7,46 +7,45 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Notify_Logging_Service.am 
 
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS = Notify_Logging_Service
+noinst_PROGRAMS = Notify_Logging_Service
 
 Notify_Logging_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs \
   -DTAO_HAS_TYPED_EVENT_CHANNEL
 
 Notify_Logging_Service_SOURCES = \
   Notify_Logging_Server.cpp \
-  Notify_Logging_Service.cpp \
-  Notify_Logging_Service.h
+  Notify_Logging_Service.cpp
 
 Notify_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
+noinst_HEADERS = \
+  Notify_Logging_Service.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
index 471c70f9582..ea990697888 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project: namingexe, core, dsnotifylogadmin_serv, iortable {
+project: namingexe, dsnotifylogadmin {
   exename   = Notify_Logging_Service
   includes += $(TAO_ROOT)/orbsvcs
 }
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
index 9274beeb8c5..8ee3233f598 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
@@ -7,37 +7,41 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.RTEvent_Logging_Service.am 
 
-bin_PROGRAMS = RTEvent_Logging_Service
+noinst_PROGRAMS = RTEvent_Logging_Service
 
 RTEvent_Logging_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 RTEvent_Logging_Service_SOURCES = \
-  RTEvent_Logging_Service.cpp \
-  RTEvent_Logging_Service.h
+  RTEvent_Logging_Service.cpp
 
 RTEvent_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+  RTEvent_Logging_Service.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
index 857dd4983a2..87ea7bcd04f 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
@@ -25,7 +25,7 @@
 #include "orbsvcs/Log/RTEventLogFactory_i.h"
 
 #include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
index 45f99a3790b..3756a9e0726 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
@@ -1,5 +1,4 @@
 // $Id$
-project: namingexe, core, rteventlogadmin {
-  exename   = RTEvent_Logging_Service
+project: namingexe, rteventlogadmin {
   includes += $(TAO_ROOT)/orbsvcs
 }
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
index ef7a917070c..3e864f17887 100644
--- a/TAO/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/Makefile.am
@@ -24,8 +24,9 @@ SUBDIRS += \
 	Event_Service \
 	Dump_Schedule \
 	CosEvent_Service \
-	Concurrency_Service \
-	performance-tests \
-	tests
+	Concurrency_Service
 
+#
+#	 performance-tests \
+#	 tests \
 #	 examples
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
index e2c02543132..aeee835b58d 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -7,64 +7,66 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.NT_Naming_Service.am 
 
-bin_PROGRAMS = NT_Naming_Service
+noinst_PROGRAMS = NT_Naming_Service
 
 NT_Naming_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 NT_Naming_Service_SOURCES = \
-  NT_Naming_Server.cpp \
-  NT_Naming_Service.cpp \
   Naming_Service.cpp \
-  NT_Naming_Service.h \
-  Naming_Service.h
+  NT_Naming_Server.cpp \
+  NT_Naming_Service.cpp
 
 NT_Naming_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_HEADERS = \
+  NT_Naming_Service.h \
+  Naming_Service.h
+
 ## Makefile.Naming_Service.am 
 
-bin_PROGRAMS += Naming_Service
+noinst_PROGRAMS += Naming_Service
 
 Naming_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Naming_Service_SOURCES = \
   Naming_Server.cpp \
-  Naming_Service.cpp \
-  Naming_Service.h
+  Naming_Service.cpp
 
 Naming_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_HEADERS += \
+  Naming_Service.h
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 9dd785b891e..a16d6d434dc 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -3,34 +3,6 @@
 #include "Naming_Service.h"
 #include "ace/OS_main.h"
 
-#include <orbsvcs/Shutdown_Utilities.h>
-#include <tao/debug.h>
-
-class Naming_Svc_Shutdown : public Shutdown_Functor
-{
-public:
-  Naming_Svc_Shutdown(TAO_Naming_Service& ns);
-
-  void operator() (int which_signal);
-private:
-  TAO_Naming_Service& ns_;
-};
-
-Naming_Svc_Shutdown::Naming_Svc_Shutdown (TAO_Naming_Service &ns)
-  : ns_(ns)
-{
-}
-
-void
-Naming_Svc_Shutdown::operator() (int which_signal)
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Name Service: shutting down on signal %d\n",
-                which_signal));
-  (void) this->ns_.shutdown ();
-}
-
 // Driver function for the TAO Naming Service.
 
 int
@@ -38,10 +10,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   TAO_Naming_Service naming_service;
 
-  // Stuff to insure that we're gracefully shut down...
-  Naming_Svc_Shutdown killer (naming_service);
-  Service_Shutdown kill_contractor(killer);
-
   if (naming_service.init (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_LIB_TEXT("Failed to start the Naming Service.\n")),
@@ -61,7 +29,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_ENDTRY;
   ACE_CHECK_RETURN (1);
 
-  naming_service.fini ();
-
   return 0;
 }
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 1d57246d2f1..5cbe18e4aae 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -122,35 +122,6 @@ TAO_Naming_Service::run (ACE_ENV_SINGLE_ARG_DECL)
   return 0;
 }
 
-void
-TAO_Naming_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-int
-TAO_Naming_Service::fini (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  this->my_naming_server_.fini();
-
-  ACE_TRY
-  {
-    // destroy implies shutdown
-    this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::fini");
-    return -1;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 // Destructor.
 TAO_Naming_Service::~TAO_Naming_Service (void)
 {
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index b2326ebabab..8bcbfcecf2d 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -21,7 +21,7 @@
 #define TAO_NAMING_SERVICE_H
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 class TAO_Naming_Service
 {
@@ -42,15 +42,9 @@ public:
   virtual int init (int argc, ACE_TCHAR* argv[]);
   // Initialize the Naming Service with the arguments.
 
-  virtual int fini (void);
-  // The opposite of init().
-
   int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Run the TAO_Naming_Service.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  // Shut down the TAO_Naming_Service; you must still call fini().
-
   virtual ~TAO_Naming_Service (void);
   // Destructor.
 
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index 7a96a9e6d25..ff877b2864f 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, naming_serv {
+project : orbsvcsexe, core, naming {
   exename  = Naming_Service
   Source_Files {
     Naming_Server.cpp
@@ -9,7 +9,7 @@ project : orbsvcsexe, core, naming_serv {
   }
 }
 
-project(NT_Naming_Service) : orbsvcsexe, core, naming_serv {
+project(NT_Naming_Service) : orbsvcsexe, core, naming {
   exename  = NT_Naming_Service
   Source_Files {
     Naming_Service.cpp
diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am
index 0ceeaa1e7f7..6a9f26b8679 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile.am
+++ b/TAO/orbsvcs/Notify_Service/Makefile.am
@@ -7,85 +7,71 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.NT_Notify_Service.am 
 
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS = NT_Notify_Service
+noinst_PROGRAMS = NT_Notify_Service
 
 NT_Notify_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 NT_Notify_Service_SOURCES = \
-  NT_Notify_Server.cpp \
-  NT_Notify_Service.cpp \
   Notify_Service.cpp \
-  NT_Notify_Service.h \
-  Notify_Service.h
+  NT_Notify_Server.cpp \
+  NT_Notify_Service.cpp
 
 NT_Notify_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
+noinst_HEADERS = \
+  Notify_Service.h \
+  NT_Notify_Service.h
 
 ## Makefile.Notify_Service.am 
 
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS += Notify_Service
+noinst_PROGRAMS += Notify_Service
 
 Notify_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Notify_Service_SOURCES = \
   Notify_Server.cpp \
-  Notify_Service.cpp \
-  Notify_Service.h
+  Notify_Service.cpp
 
 Notify_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
+noinst_HEADERS += \
+  Notify_Service.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index e0de0ef0a8e..52af603fc0b 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -20,8 +20,8 @@
 
 #include "ace/Task.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "../orbsvcs/Notify/CosNotify_Initializer.h"
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 61fa82afa05..69a9fe56a6b 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, notification_serv, naming, iortable {
+project : orbsvcsexe, core, notification, naming {
   exename  = Notify_Service
   Source_Files {
     Notify_Server.cpp
@@ -12,7 +12,7 @@ project : orbsvcsexe, core, notification_serv, naming, iortable {
   }
 }
 
-project(NT_Notify_Service) : orbsvcsexe, core, notification_serv, naming, iortable {
+project(NT_Notify_Service) : orbsvcsexe, core, notification, naming {
   exename  = NT_Notify_Service
   Source_Files {
     Notify_Service.cpp
diff --git a/TAO/orbsvcs/PSS/PSDL_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Scope.cpp
index 2ebf0c03022..0f4815208ed 100644
--- a/TAO/orbsvcs/PSS/PSDL_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Scope.cpp
@@ -43,7 +43,7 @@ TAO_PSDL_Scope::to_lower_case (ACE_CString &identifier)
   size_t len = identifier.length ();
   for (size_t i = 0; i <= len; ++i)
     {
-      identifier[i] = ACE_OS::ace_tolower (identifier[i]);
+      identifier[i] = ACE_OS::to_lower (identifier[i]);
     }
 }
 
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am
index 6eb147f68f8..503520aaf4a 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile.am
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am
@@ -7,29 +7,34 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Scheduling_Service.am 
 
-bin_PROGRAMS = Scheduling_Service
+noinst_PROGRAMS = Scheduling_Service
 
 Scheduling_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Scheduling_Service_SOURCES = \
-  Scheduling_Service.cpp \
-  Scheduling_Service.h
+  Scheduling_Service.cpp
 
 Scheduling_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_HEADERS = \
+  Scheduling_Service.h
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 3da4c4e1039..a071c1b0fc1 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -5,7 +5,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Argv_Type_Converter.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_strings.h"
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
index e76f5c63b15..2ed1d8f10f8 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
@@ -26,11 +26,11 @@
 #define TAO_SCHEDULING_SERVICE_H
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Sched/Reconfig_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h"
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
-#include "orbsvcs/Sched/Strategy_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h"
 #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */
-#include "orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
 #include "ace/SString.h"
 
 class TAO_Scheduling_Service
diff --git a/TAO/orbsvcs/TAO_Service/svc.conf b/TAO/orbsvcs/TAO_Service/svc.conf
index 6168a3a624d..94d84ad5d3d 100644
--- a/TAO/orbsvcs/TAO_Service/svc.conf
+++ b/TAO/orbsvcs/TAO_Service/svc.conf
@@ -1,14 +1,14 @@
 # Dynamically configure the naming service into the application process.
-#dynamic TAO_Naming_Loader Service_Object * TAO_CosNaming_Serv:_make_TAO_Naming_Loader () "dummy -o ns.ior"
+#dynamic TAO_Naming_Loader Service_Object * TAO_CosNaming:_make_TAO_Naming_Loader () "dummy -o ns.ior"
 
 # Dynamically configure the default Event Service Factory
-#dynamic CEC_Factory Service_Object * TAO_CosEvent_Serv:_make_TAO_CEC_Default_Factory () ""
+#dynamic CEC_Factory Service_Object * TAO_CosEvent:_make_TAO_CEC_Default_Factory () ""
 
 # Dynamically configure the naming service into the application process.
-#dynamic TAO_CEC_Event_Loader Service_Object * TAO_CosEvent_Serv:_make_TAO_CEC_Event_Loader () "dummy -o foo.ref -x"
+#dynamic TAO_CEC_Event_Loader Service_Object * TAO_CosEvent:_make_TAO_CEC_Event_Loader () "dummy -o foo.ref -x"
 
 # Dynamically configure the trading service into the application process.
-#dynamic TAO_Trading_Loader Service_Object * TAO_CosTrading_Serv:_make_TAO_Trading_Loader () "dummy -TSdumpior footra.ref"
+#dynamic TAO_Trading_Loader Service_Object * TAO_CosTrading:_make_TAO_Trading_Loader () "dummy -TSdumpior footra.ref"
 
 #Dynamically remove the trading service from the application process
 #remove TAO_Trading_Loader
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index 78d4d7c61b0..6892d90987a 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -20,9 +20,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Server.h"
-#include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h"
 
 class Clerk_i
 {
diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am
index c202120c147..987c518e5eb 100644
--- a/TAO/orbsvcs/Time_Service/Makefile.am
+++ b/TAO/orbsvcs/Time_Service/Makefile.am
@@ -7,64 +7,66 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Time_Service_Clerk.am 
 
-bin_PROGRAMS = Time_Service_Clerk
+noinst_PROGRAMS = Time_Service_Clerk
 
 Time_Service_Clerk_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Time_Service_Clerk_SOURCES = \
   Clerk_i.cpp \
-  Time_Service_Clerk.cpp \
-  Clerk_i.h
+  Time_Service_Clerk.cpp
 
 Time_Service_Clerk_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_HEADERS = \
+  Clerk_i.h
+
 ## Makefile.Time_Service_Server.am 
 
-bin_PROGRAMS += Time_Service_Server
+noinst_PROGRAMS += Time_Service_Server
 
 Time_Service_Server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Time_Service_Server_SOURCES = \
   Server_i.cpp \
-  Time_Service_Server.cpp \
-  Server_i.h
+  Time_Service_Server.cpp
 
 Time_Service_Server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_HEADERS += \
+  Server_i.h
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index 70660377faf..6cc665c12ed 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -20,9 +20,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Server.h"
-#include "orbsvcs/Time/TAO_Time_Service_Server.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h"
 
 class Server_i
 {
diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc
index 865cc01d9fc..a3e8eed4121 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service.mpc
+++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv {
+project(Time_Service_Server) : orbsvcsexe, core, time {
   exename  = Time_Service_Server
   Source_Files {
     Server_i.cpp
@@ -9,7 +9,7 @@ project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv {
   }
 }
 
-project(Time_Service_Clerk) : orbsvcsexe, core, time, naming_serv {
+project(Time_Service_Clerk) : orbsvcsexe, core, time {
   exename  = Time_Service_Clerk
   Source_Files {
     Clerk_i.cpp
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
index 12056013012..866b0c34d69 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile.am
+++ b/TAO/orbsvcs/Trading_Service/Makefile.am
@@ -7,31 +7,38 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.Trading_Service.am 
 
-bin_PROGRAMS = Trading_Service
+noinst_PROGRAMS = Trading_Service
 
 Trading_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Trading_Service_SOURCES = \
   Trading_Server.cpp \
-  Trading_Service.cpp \
-  Trading_Service.h
+  Trading_Service.cpp
+
+Trading_Service_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 Trading_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+  Trading_Service.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index 55f5073f798..29d4bd2fef4 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -24,10 +24,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IOR_Multicast.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
-#include "orbsvcs/Trader/Trading_Loader.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h"
+#include "orbsvcs/orbsvcs/Trader/Trading_Loader.h"
 
 class Trading_Service;
 
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
index 46950125c54..0bd2fdc6201 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, naming, trading_serv {
+project : orbsvcsexe, core, naming, trading {
   exename  = Trading_Service
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
index a8ca4d25dab..9f36dda8a84 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
@@ -1,19 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : orbsvcsexe, event, event_skel, naming {
+project(*Client) : orbsvcsexe, event {
   idlflags += -I ../../..
-  exename = FactoryClient
   source_files {
     FactoryClient.cpp
   }
 }
 
-project(*Server) : orbsvcsexe, event, event_serv, naming {
+project(*Server) : orbsvcsexe, event {
   idlflags += -I ../../..
-  exename = FactoryServer
   source_files {
-    main.cpp
     FactoryDriver.cpp
     CosEventChannelFactory_i.cpp
   }
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
index ffeff6c5f94..59446678f5a 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
@@ -36,7 +36,7 @@
 #ifndef TAO_COSEVENTCHANNELFACTORY_IDL
 #define TAO_COSEVENTCHANNELFACTORY_IDL
 
-#include "orbsvcs/CosEventChannelAdmin.idl"
+#include "orbsvcs/orbsvcs/CosEventChannelAdmin.idl"
 
 module CosEventChannelFactory
 {
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 60210ad8515..c3661adf5eb 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -2,7 +2,7 @@
 // $Id$
 
 #include "CosEventChannelFactory_i.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Auto_Ptr.h"
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index 628383b8ed2..520fc37d382 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -23,7 +23,7 @@
 #include /**/ "ace/pre.h"
 
 #include "CosEventChannelFactoryS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 72c9ebc763b..2161591ffef 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -2,7 +2,7 @@
 // $Id$
 
 #include "CosEventChannelFactoryC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Log_Msg.h"
 
 class FactoryClient
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
index 97d837a7c2e..d60f76a6c68 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
@@ -22,7 +22,7 @@
 #define TAO_FACTORYDRIVER_H
 
 #include "CosEventChannelFactory_i.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 // @@ Pradeep: I know this is just an example, but could you talk to
 //    Vishal about making this a service that could be bootstraped
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
index 246f2e8cbd7..aa651b338c2 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, rtevent, event, event_skel, naming {
+project : orbsvcsexe, rtevent, event {
   after += CosEC_RtEC_Based_lib
   includes += ../lib
   libs += CosEC_RtEC_Based
   libpaths += ../lib
-}
+}
+\ No newline at end of file
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index 68f393240e7..aeb77be05a1 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "RtEC_Based_CosEC.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Get_Opt.h"
 
 RtEC_Based_CosEC::RtEC_Based_CosEC (void)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index 72f1bd8224f..6a66feb0f76 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -17,7 +17,7 @@
 #define RTEC_BASED_COSEC_H
 
 #include "CosEvent_Utilities.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #if defined (_MSC_VER)
 #pragma warning(push)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
index 5381540bb2c..22284842ca5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
@@ -22,8 +22,8 @@
 #define CONSUMERADMIN_I_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "ProxyPushSupplier_i.h"
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
index 62ea3052326..28ddfc71428 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, event_skel, rtevent, rtsched {
+project : orbsvcslib, event, rtevent, rtsched {
   sharedname = CosEC_RtEC_Based
   dynamicflags += TAO_RTEC_COSEC_BUILD_DLL
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index 41da6bcd3b4..f2520c36c0b 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -2,8 +2,8 @@
 // $Id$
 
 #include "CosEvent_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "EventChannel_i.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
index a55db26014c..644d57fab98 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -21,10 +21,10 @@
 #define TAO_COSEVENT_UTILITIES_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecBaseC.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/RtecBaseC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 #include "rtec_cosec_export.h"
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
index 03b96d3847f..14ffd0da9f9 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -22,8 +22,8 @@
 #define EVENTCHANNEL_I_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 #include "ConsumerAdmin_i.h"
 #include "SupplierAdmin_i.h"
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index 73311b2af45..dfd35b67112 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -1,11 +1,11 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
 #include "ProxyPushConsumer_i.h"
 #include "ace/Auto_Ptr.h"
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
index ce07097b36f..b8ae2bc3c36 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -22,8 +22,8 @@
 #define _PROXYPUSHCONSUMER_I_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "rtec_cosec_export.h"
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index 52c99def13d..38fb66a0291 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 //
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 #include "ProxyPushSupplier_i.h"
 #include "ace/Auto_Ptr.h"
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
index b1adfc0b0bc..ded678af2d4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -22,8 +22,8 @@
 #define _PROXYPUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 #include "rtec_cosec_export.h"
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
index 30c3435bdef..0e2a79802c4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
@@ -22,8 +22,8 @@
 #define SUPPLIER_ADMIN_I_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 #include "ProxyPushConsumer_i.h"
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
index c1ced5cbc08..f62fd70e6af 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -17,10 +17,10 @@
 #ifndef COSECCONSUMER_H_
 #define COSECCONSUMER_H_
 
-#include "orbsvcs/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 class Consumer : public POA_CosEventComm::PushConsumer
 {
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
index 1cd65727ebb..89c0143b7cd 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : orbsvcsexe, event, event_skel, rtevent, rtsched {
+project(*Client) : orbsvcsexe, event, rtevent, rtsched {
   after += CosEC_RtEC_Based_lib
   includes += ../../lib
   libs += CosEC_RtEC_Based
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
index 413244fc4f4..7bd54f164de 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -17,10 +17,10 @@
 #ifndef COSECSUPPLIER_H_
 #define COSECSUPPLIER_H_
 
-#include "orbsvcs/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 class Supplier : public POA_CosEventComm::PushSupplier
 {
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index ce523fed960..0c547769e90 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -17,10 +17,10 @@
 #ifndef COSECCONSUMER_H_
 #define COSECCONSUMER_H_
 
-#include "orbsvcs/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "Multiple.h"
 
 class Consumer : public POA_CosEventComm::PushConsumer, public Multiple
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
index 3018aa6b8df..ee8fe174725 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched {
+project(*Cons) : orbsvcsexe, event, rtevent, rtsched {
   after += CosEC_RtEC_Based_lib
   includes += ../../lib
   libs += CosEC_RtEC_Based
@@ -12,7 +12,7 @@ project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched {
   }
 }
 
-project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched {
+project(*Supp) : orbsvcsexe, event, rtevent, rtsched {
   after += CosEC_RtEC_Based_lib
   includes += ../../lib
   libs += CosEC_RtEC_Based
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
index 3248946ce78..883c5d20dcf 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
@@ -17,10 +17,9 @@
 #ifndef COSECMULTIPLE_H
 #define COSECMULTIPLE_H
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/Naming/Naming_Server.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 
 class Multiple
 {
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index 29b213cd31f..bcc3bf9f145 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -17,10 +17,10 @@
 #ifndef COSECSUPPLIER_H_
 #define COSECSUPPLIER_H_
 
-#include "orbsvcs/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "Multiple.h"
 
 class Supplier : public POA_CosEventComm::PushSupplier,
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index 578cebcefd0..81d992eb24b 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Consumer.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 ACE_RCSID (CosEC_Examples, 
            Consumer, 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 7156353e483..cf672b12d27 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -17,7 +17,7 @@
 #ifndef CONSUMER_H
 #define CONSUMER_H
 
-#include "orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
index 7a91454ad07..a423f5f1075 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
@@ -1,19 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Service) : orbsvcsexe, event, event_serv, naming {
+project(*Service) : orbsvcsexe, event {
   Source_Files {
     Service.cpp
   }
 }
 
-project(*Consumer) : orbsvcsexe, event, event_skel {
+project(*Consumer) : orbsvcsexe, event {
   Source_Files {
     Consumer.cpp
   }
 }
 
-project(*Supplier) : orbsvcsexe, event, event_skel {
+project(*Supplier) : orbsvcsexe, event {
   Source_Files {
     Supplier.cpp
   }
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index f9fee3e6b0d..9dbb168736a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index 099735ce5f7..85d26f07d32 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Supplier.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (CosEC_Examples, 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index 4fdc39bfa08..7771693bd2e 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
@@ -17,7 +17,7 @@
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
 
-#include "orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index b1858fb720a..aa6cea972e4 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosTypedEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminC.h"
 #include "Country_i.h"
 
 ACE_RCSID (CosEC_Examples, 
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
index cddcd128801..d933c1610e7 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming {
+project(*Consumer) : event, orbsvcsexe, portableserver {
   requires += ec_typed_events
   source_files {
     Consumer.cpp
@@ -9,7 +9,7 @@ project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming {
   }
 }
 
-project(*Supplier) : event_skel, orbsvcsexe, portableserver, naming {
+project(*Supplier) : event, orbsvcsexe, portableserver {
   requires += ec_typed_events
   after    += CosEC_TypedSimple_Consumer
   idl_files {
@@ -18,4 +18,4 @@ project(*Supplier) : event_skel, orbsvcsexe, portableserver, naming {
     CountryC.cpp
     Supplier.cpp
   }
-}
+}
+\ No newline at end of file
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
index 77c68564272..124de09b122 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
@@ -5,7 +5,7 @@
 #ifndef TAO_COUNTRY_IDL
 #define TAO_COUNTRY_IDL
 
-#include "orbsvcs/CosTypedEventComm.idl"
+#include "orbsvcs/orbsvcs/CosTypedEventComm.idl"
 #pragma prefix "jon.com"
 
 interface Country : ::CosTypedEventComm::TypedPushConsumer 
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index c908d935e80..176a2ecbc31 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosTypedEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminC.h"
 #include "CountryC.h"
 
 ACE_RCSID(CosEC_Examples, Supplier, "$Id:")
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
index b06ffc65f92..4e41cac3de1 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
@@ -17,8 +17,8 @@
 #ifndef TLS_CLIENT_H
 #define TLS_CLIENT_H
 
-#include "orbsvcs/DsLogAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 class TLS_Client
 {
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index b8dc8157a18..357cced7a5d 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -1,5 +1,5 @@
 #include "Event_Consumer.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index 946299dc55d..0f8339d9e11 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
@@ -17,9 +17,9 @@
 #ifndef EVENT_CONSUMER_H
 #define EVENT_CONSUMER_H
 
-#include "orbsvcs/DsEventLogAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index 1fee4da0b1a..fc2d84cbe72 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -1,5 +1,5 @@
 #include "Event_Supplier.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
index c37b9a5c9df..4a66e3ab074 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
@@ -17,9 +17,9 @@
 #ifndef EVENT_SUPPLIER_H
 #define EVENT_SUPPLIER_H
 
-#include "orbsvcs/DsEventLogAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
index f58a5f29118..fb4ebd95b7e 100644
--- a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
+++ b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Consumer) : orbsvcsexe, dseventlogadmin, event_skel, naming {
+project(*Consumer) : orbsvcsexe, event, dseventlogadmin {
   exename = consumer
   source_files {
     Event_Consumer.cpp
   }
 }
 
-project(*Supplier) : orbsvcsexe, dseventlogadmin, event_skel, naming {
+project(*Supplier) : orbsvcsexe, event, dseventlogadmin {
   exename = supplier
   source_files {
     Event_Supplier.cpp
diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
index 321de1e7566..74ebf988ce3 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
+++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Consumer) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming {
+project(*Consumer) : orbsvcsexe, notification, dsnotifylogadmin, naming {
   exename = consumer
   source_files {
     Notify_Consumer.cpp
   }
 }
 
-project(*Supplier) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming {
+project(*Supplier) : orbsvcsexe, notification, dsnotifylogadmin, naming {
   exename = supplier
   source_files {
     Notify_Supplier.cpp
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 6c7c5447c96..83a910e565a 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -1,6 +1,6 @@
 #include "Notify_Consumer.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID (Notify,
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index 3b9cb99b1e5..484963ddf43 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
@@ -17,11 +17,11 @@
 #ifndef NOTIFY_CONSUMER_H
 #define NOTIFY_CONSUMER_H
 
-#include "orbsvcs/DsNotifyLogAdminS.h"
-#include "orbsvcs/DsEventLogAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosNotifyCommS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommS.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 5a8edb31e03..14dcf3155d8 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -1,5 +1,5 @@
 #include "Notify_Supplier.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID (Notify,
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
index ecba0889eaa..7e68335f786 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
@@ -17,10 +17,10 @@
 #ifndef NOTIFY_SUPPLIER_H
 #define NOTIFY_SUPPLIER_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/DsNotifyLogAdminC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosNotifyCommS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommS.h"
 
 
 class Filter_StructuredPushSupplier;
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index 396b9e8c77e..ebf87ba501c 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -1,6 +1,6 @@
 #include "RTEvent_Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID (RTEvent,
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index 5c908495901..cbdeb7b1d80 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
@@ -17,9 +17,9 @@
 #ifndef RTEVENT_CONSUMER_H
 #define RTEVENT_CONSUMER_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RTEventLogAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index a98457d4f72..8af49c7efc9 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -1,6 +1,6 @@
 #include "RTEvent_Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_unistd.h"
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
index 170a98db896..1d05033b459 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
@@ -17,9 +17,9 @@
 #ifndef RTEVENT_SUPPLIER_H
 #define RTEVENT_SUPPLIER_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RTEventLogAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index e0960aed1a6..ec4101f7ca7 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -16,9 +16,9 @@
 #ifndef NOTIFY_FILTER_CLIENT_H
 #define NOTIFY_FILTER_CLIENT_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/SString.h"
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
index 0c0e54324fc..061cdf7d4ae 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
+++ b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, notification, notification_skel, naming {
+project : orbsvcsexe, notification, naming {
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index bc7a3316a5c..4194e62bd31 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -16,8 +16,8 @@
 
 #include "ORB_Objects.h"
 #include "tao/RTCORBA/RTCORBA.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "ace/SString.h"
 
 /**
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 2a1c42434b4..2b29678007d 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -4,8 +4,8 @@
 #include "Consumer.h"
 #include "ORB_Run_Task.h"
 #include "ace/Arg_Shifter.h"
-#include "orbsvcs/NotifyExtC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "tao/ORB_Core.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
index e846e43303b..2cbab1c3352 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
@@ -16,8 +16,8 @@
 
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/NotifyExtC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 /**
  * @class TAO_Notify_ORB_Objects
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
index 33182f595ee..d01675cb10b 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
@@ -15,8 +15,8 @@
 
 #include "ORB_Objects.h"
 #include "tao/RTCORBA/RTCORBA.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "ace/SString.h"
 #include "ace/Condition_Thread_Mutex.h"
 
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index f3aa4a7322e..bd760366a36 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -7,8 +7,8 @@
 #include "tao/ORB_Core.h"
 #include "ace/Sched_Params.h"
 #include "Supplier.h"
-#include "orbsvcs/NotifyExtC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_errno.h"
 
 ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$")
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
index 6684e2215b1..589a889ed25 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -1,5 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, notification, notification_skel, naming, minimum_corba {
+project : orbsvcsexe, notification, naming {
+  avoids += minimum_corba
 }
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index b9b05c2d39e..ff46bc4e5a1 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -16,9 +16,9 @@
 #ifndef NOTIFY_SUBSCRIBE_CLIENT_H
 #define NOTIFY_SUBSCRIBE_CLIENT_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
index ffe7ad82f73..614bc45268f 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
@@ -16,8 +16,8 @@
 
 #include "ORB_Objects.h"
 #include "tao/RTCORBA/RTCORBA.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_time.h"
 
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 11e04f8f4dc..4b4aa0283bf 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -4,8 +4,8 @@
 #include "Consumer.h"
 #include "ORB_Run_Task.h"
 #include "ace/Arg_Shifter.h"
-#include "orbsvcs/NotifyExtC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "tao/ORB_Core.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
index ed469821a28..2be127fbfd1 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
@@ -1,5 +1,6 @@
 // $Id$
-project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba {
+project(*Supplier): rtnotify, notifytest, rtportableserver {
+  avoids += minimum_corba
   exename = Supplier
   Source_Files {
     Supplier.cpp
@@ -9,7 +10,8 @@ project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba {
   }
 }
 
-project(*Consumer): rtnotify, notifytest, rtportableserver, minimum_corba {
+project(*Consumer): rtnotify, notifytest, rtportableserver {
+  avoids += minimum_corba
   exename = Consumer
   Source_Files {
     Consumer.cpp
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
index 7ca6ab99442..9ec6510cb60 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
@@ -15,8 +15,8 @@
 
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/NotifyExtC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 /**
  * @class TAO_Notify_ORB_Objects
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
index 1a3c7893c76..e19d6b55401 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
@@ -15,8 +15,8 @@
 
 #include "ORB_Objects.h"
 #include "tao/RTCORBA/RTCORBA.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "ace/Condition_Thread_Mutex.h"
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index ed563e2e69d..bc23e0c05b3 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -7,8 +7,8 @@
 #include "tao/ORB_Core.h"
 #include "ace/Sched_Params.h"
 #include "Supplier.h"
-#include "orbsvcs/NotifyExtC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_errno.h"
 
 ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$")
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf b/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf
index 80a46e01105..f197dcef2ee 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
-##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc
index 66df1682a11..c7442bcc119 100644
--- a/TAO/orbsvcs/examples/ORT/ORT.mpc
+++ b/TAO/orbsvcs/examples/ORT/ORT.mpc
@@ -1,5 +1,6 @@
 // $Id$
-project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba {
+project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client {
+  avoids += minimum_corba
   source_files {
     GatewayC.cpp
     GatewayS.cpp
@@ -12,9 +13,10 @@ project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba {
   }
 }
 
-project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iorinterceptor {
+project(*Server) : orbsvcsexe, dynamicinterface, ifr_client {
   exename   = server
   after    += *Gateway
+  avoids += minimum_corba
   source_files {
     server.cpp
     GatewayC.cpp
@@ -32,7 +34,8 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iori
   }
 }
 
-project(*Client) : orbsvcsexe, event, minimum_corba {
+project(*Client) : orbsvcsexe, event {
+  avoids += minimum_corba
   after += *Server
   source_files {
     client.cpp
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index 854519127e0..afb2783d8af 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -2,6 +2,7 @@
 
 #include "Object_Factory_i.h"
 #include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/ObjectReferenceTemplate.h"
 
 Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb,
                                     PortableServer::POA_ptr gateway_poa)
@@ -28,9 +29,7 @@ Object_Factory_i::create_object (const char *interface_repository_id,
   const PortableInterceptor::ObjectId *obj_id =
     ACE_reinterpret_cast (const PortableInterceptor::ObjectId *,
                           &id.in ());
-  ACE_UNUSED_ARG(obj_id);
-  ACE_UNUSED_ARG(interface_repository_id);
-/*
+
   TAO_POA *poa = dynamic_cast <TAO_POA *> (this->gateway_poa_);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
@@ -44,7 +43,7 @@ Object_Factory_i::create_object (const char *interface_repository_id,
     ort->make_object (interface_repository_id,
                       *obj_id
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());*/
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return CORBA::Object::_nil();
+  return object_ptr;
 }
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index 17ae07e376a..1f6d7a9e796 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
 #include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index c8268e1c3ea..e096cc9d86b 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
@@ -12,7 +12,7 @@
 #ifndef CONSUMER_H
 #define CONSUMER_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index 29e85721e86..ad503080423 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
 #include "EC.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Event/EC_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway.h"
 #include "ace/Arg_Shifter.h"
 
 ACE_RCSID (EC_Examples, 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
index 2734de1dcd0..ee85894676e 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
@@ -12,7 +12,7 @@
 #ifndef EC_H
 #define EC_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index 11a219fd352..17944dad818 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
 #include "Gateway.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Dynamic_Service.h"
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
index 6c7d931d988..d54c2519354 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
@@ -11,7 +11,7 @@
 #ifndef GATEWAY_H
 #define GATEWAY_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index 6d8586d16a8..ce16ed2237e 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
 #include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
index 98e87ec39d2..65e67be9ed9 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
@@ -11,7 +11,7 @@
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
index 8439914f22b..41e999a9416 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
@@ -18,7 +18,7 @@
 #define ADDRSERVER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 
 class AddrServer : public POA_RtecUDPAdmin::AddrServer
 {
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index dba1cb22b01..8d41d2b200d 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 ACE_RCSID (EC_Examples, 
            Consumer, 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index 536404b824b..5a8a514e190 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -17,8 +17,8 @@
 #ifndef CONSUMER_H
 #define CONSUMER_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index 4ab33c1ee29..052a5fe8280 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -4,13 +4,13 @@
 #include "Consumer.h"
 #include "Supplier.h"
 #include "AddrServer.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/ECG_Mcast_EH.h"
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index f83b00c5864..84a8d5a9f10 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 ACE_RCSID (EC_Examples, 
            Supplier, 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 7c591f5fdb7..a44b55a18aa 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -17,8 +17,8 @@
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index bdbdbaad894..e89e7df6977 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -17,7 +17,7 @@
 #ifndef CONSUMER_H
 #define CONSUMER_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
index 3a6d4463fa3..71197184d8e 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
@@ -3,7 +3,7 @@
 // This file was automatically generated by the Scheduler_Factory.
 // Before editing the file please consider generating it again.
 
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 
 
 // There were no scheduling anomalies.
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 1011f5d53bc..fcf9123becd 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Sched/Reconfig_Scheduler.h"
-#include "orbsvcs/Runtime_Scheduler.h"
-#include "orbsvcs/Event/Module_Factory.h"
-#include "orbsvcs/Event/Event_Channel.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 #include "Consumer.h"
 #include "Supplier.h"
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index b0391f7602b..c2a428371a6 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -17,7 +17,7 @@
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index d49a22fa62a..18d42999eab 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 #include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 ACE_RCSID (EC_Examples, 
            Consumer, 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index 19005b96ec1..ebbcb6fa5f9 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -17,7 +17,7 @@
 #ifndef CONSUMER_H
 #define CONSUMER_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index 4bc618c1232..9b4692a69ed 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Get_Opt.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_RCSID (EC_Examples, 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 850888b1d77..a91a5f8ec05 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 #include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (EC_Examples, 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index b1fce544ccc..e358500267d 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -17,7 +17,7 @@
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/examples/Security/Send_File/README b/TAO/orbsvcs/examples/Security/Send_File/README
index c02ca187f21..e0b149b01f4 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/README
+++ b/TAO/orbsvcs/examples/Security/Send_File/README
@@ -37,16 +37,14 @@ phrase (it is 'test').
 
 ======= Testing IIOP interoperability
 
-	We also want to verify that the client and server (assuming
-	"-SSLNoProtection" flag is set in server's `server.conf' file)
-	can interoperate with regular IIOP servers and clients.
+	We also want to verify that the client and
+server can interoperate with regular IIOP servers and clients.
 	First setup a pure IIOP server:
 
 $ server -o test.ior
 $ client -ORBSvcConf client.conf -k file://test.ior < myfile
 
-	next a pure IIOP client (assuming "-SSLNoProtection" flag is
-        set in server's `server.conf' file):
+	next a pure IIOP client:
 
 $ server -ORBSvcConf server.conf -o test.ior
 $ client -k file://test.ior < myfile
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.conf b/TAO/orbsvcs/examples/Security/Send_File/server.conf
index e178933feb9..ee0ef1aa57c 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.conf
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLNoProtection"
+dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index db2b00eb703..48ed722aa12 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -3,7 +3,7 @@
 
 project(AV) : orbsvcslib, core, property, naming, qos {
   sharedname    = TAO_AV
-  idlflags     += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h
+  idlflags     += -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h
   dynamicflags  = TAO_AV_BUILD_DLL
   tagchecks    += AV
   pch_header    =
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index f53b3ddba1d..b5b79a52ae4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -29,20 +29,20 @@
 #include "ace/SOCK_Acceptor.h"
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/CosPropertyServiceS.h"
-#include "orbsvcs/AVStreamsS.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/AV/AV_Core.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/Null_MediaCtrlS.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/CosPropertyServiceS.h"
+#include "orbsvcs/orbsvcs/AVStreamsS.h"
+#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/AV/AV_Core.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/Null_MediaCtrlS.h"
 
 #if defined (TAO_ORBSVCS_HAS_Trader)
-#include "orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
 #endif /* TAO_ORBSVCS_HAS_Trader */
 
-#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
 
 #define FLOWSPEC_MAX 5
 // for the Hash_Map helper classes.
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 08597e73734..f97ad1cb0aa 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1,22 +1,22 @@
 // $Id$
 
-#include "orbsvcs/AV/AV_Core.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
-#include "orbsvcs/AV/UDP.h"
-#include "orbsvcs/AV/TCP.h"
-#include "orbsvcs/AV/RTP.h"
-#include "orbsvcs/AV/RTCP.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/default_resource.h"
+#include "orbsvcs/orbsvcs/AV/AV_Core.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/UDP.h"
+#include "orbsvcs/orbsvcs/AV/TCP.h"
+#include "orbsvcs/orbsvcs/AV/RTP.h"
+#include "orbsvcs/orbsvcs/AV/RTCP.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/default_resource.h"
 
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
-#include "orbsvcs/AV/QoS_UDP.h"
+#include "orbsvcs/orbsvcs/AV/QoS_UDP.h"
 #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */
 
 #if defined (ACE_HAS_SCTP)
-#include "orbsvcs/AV/SCTP_SEQ.h"
+#include "orbsvcs/orbsvcs/AV/SCTP_SEQ.h"
 #endif // ACE_HAS_SCTP
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index d6ac2037153..1cc2e78de16 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -15,8 +15,8 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/AVStreamsC.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AVStreamsC.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
 
 #include "ace/Singleton.h"
 #include "ace/Unbounded_Set.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index e171286341a..8abf7e851f4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -16,7 +16,7 @@
 #define TAO_AV_FLOWSPEC_ENTRY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
 #include "AV_Core.h"
 #include "ace/Addr.h"
 #include "ace/Containers.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Makefile.am b/TAO/orbsvcs/orbsvcs/AV/Makefile.am
new file mode 100644
index 00000000000..8aa87e9e67d
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/AV/Makefile.am
@@ -0,0 +1,42 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Audio/Visual (AV) Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_AV.la
+
+libTAO_AV_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_AV_la_SOURCES = \
+        AVStreams_i.cpp \
+        Endpoint_Strategy.cpp \
+        Endpoint_Strategy_T.cpp \
+        sfp.cpp
+
+noinst_HEADERS = \
+        AVStreams_i.h \
+        Endpoint_Strategy.h \
+        Endpoint_Strategy_T.h \
+        sfp.h
+
+EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index 24fd3082914..b26ef80acfb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -18,7 +18,7 @@
 
 #include "ace/Addr.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
 
 struct TAO_AV_frame_info
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index b4420b21ee5..cdc48d2316a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -6,12 +6,12 @@
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
 
 #include "UDP.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/Fill_ACE_QoS.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/QoS_UDP.i"
+#include "orbsvcs/orbsvcs/AV/QoS_UDP.i"
 #endif /* __ACE_INLINE__ */
 
 //------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
index ebc49bc6147..702fc27aa90 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -29,7 +29,7 @@
 #include "ace/QoS/QoS_Decorator.h"
 #include "ace/QoS/SOCK_Dgram_Mcast_QoS.h"
 
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 
 class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
index 38555b63efd..4465ae7cf25 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -51,11 +51,11 @@
 // FUZZ: disable check_for_math_include
 #include "ace/OS.h"
 #include "ace/Hash_Map_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/UDP.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/UDP.h"
 #include <math.h>
 #include <stdlib.h>
-#include "orbsvcs/AV/RTP.h"
+#include "orbsvcs/orbsvcs/AV/RTP.h"
 
 #include "RTCP_Channel.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h
index 1af28588edd..a6ef7fef8ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h
@@ -50,8 +50,8 @@
 #define TAO_AV_RTP_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 #define RTP_PT_BVC              22      /* Berkeley video codec */
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
index aa50d43203d..d38e975de83 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
@@ -12,7 +12,7 @@
 #define TAO_AV_DEFAULT_RESOURCE_FCATORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index 8de06427317..8ca19263633 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -22,7 +22,7 @@
 #include "ace/Connector.h"
 #include "ace/Addr.h"
 #include "ace/SOCK_Dgram.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
 #include "FlowSpec_Entry.h"
 #include "AV_Core.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
index e29c8e154ce..4c8b45256dc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/AV/default_resource.h"
+#include "orbsvcs/orbsvcs/AV/default_resource.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
index 01420bb907f..2867e024e28 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
@@ -13,8 +13,8 @@
 #define TAO_AV_DEFAULT_RESOURCE_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Resource_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Resource_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index 1885a633231..70bba33f830 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -14,8 +14,8 @@
 #define TAO_AV_SFP_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/sfpC.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/sfpC.h"
 #include "ace/SOCK_Dgram.h"
 #include "ace/INET_Addr.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/CSI.idl b/TAO/orbsvcs/orbsvcs/CSI.idl
index bf19d332c1e..bc6c4fc6680 100644
--- a/TAO/orbsvcs/orbsvcs/CSI.idl
+++ b/TAO/orbsvcs/orbsvcs/CSI.idl
@@ -15,7 +15,7 @@
 #define _CSI_IDL_
 
 // #include <IOP.idl>
-#include "tao/IOP_IOR.pidl"
+#include <tao/IOP_IOR.pidl>
 
 module IOP
 {
diff --git a/TAO/orbsvcs/orbsvcs/CSIIOP.idl b/TAO/orbsvcs/orbsvcs/CSIIOP.idl
index 1807ab38d40..973b4a5a7d1 100644
--- a/TAO/orbsvcs/orbsvcs/CSIIOP.idl
+++ b/TAO/orbsvcs/orbsvcs/CSIIOP.idl
@@ -14,8 +14,8 @@
 #define _CSIIOP_IDL_
 
 //#include <IOP.pidl>
-#include "tao/IOP_IOR.pidl"
-#include "CSI.idl"
+#include <tao/IOP_IOR.pidl>
+#include <CSI.idl>
 //import ::IOP
 //import ::CSI
 
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h
index 51ee8c8e9ac..16b0c45c420 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients.h
@@ -18,7 +18,7 @@
 #define ACE_CHANNEL_CLIENTS_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CHANNEL_CLIENTS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index a8a79821a67..695611bf0c5 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -3,14 +3,14 @@
 #ifndef ACE_CHANNEL_CLIENTS_T_C
 #define ACE_CHANNEL_CLIENTS_T_C
 
-#include "orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
 
 ACE_RCSID (orbsvcs, 
            Channel_Clients_T, 
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Channel_Clients_T.i"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.i"
 #endif /* __ACE_INLINE__ */
 
 template<class TARGET> void
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index f81af14d074..472a73753f9 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -25,7 +25,7 @@
 #define ACE_CHANNEL_CLIENTS_T_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 // @@ TODO: Add throw specs to this classes.
 
@@ -83,11 +83,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Channel_Clients_T.i"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Channel_Clients_T.cpp"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index 668ee73708b..f84ffd871dd 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -25,7 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 #include "concurrency_export.h"
 
 /// This constant defines the number of lock modes. There is really no
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 75bb4e1a88f..12da31cc6df 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -44,7 +44,7 @@
 #include "ace/Token.h"
 #include "ace/Unbounded_Queue.h"
 
-#include "orbsvcs/CosConcurrencyControlS.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h"
 #include "concurrency_export.h"
 
 #if defined (lock_held)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index b49944528d8..8e052406c9f 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosConcurrencyControlS.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h"
 #include "concurrency_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index 30f680393cb..bdeee1f5775 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Concurrency/Concurrency_Utils.h"
+#include "orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h"
 
 class TAO_Concurrency_Export TAO_Concurrency_Loader : public TAO_Object_Loader
 {
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index 5aaa4d8d70b..88f46386065 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -11,7 +11,7 @@
 
 
 #include "ace/streams.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 #include "tao/debug.h"
 #include "Concurrency_Utils.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
index ac92e019ecb..b343cd6f61c 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
@@ -22,7 +22,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 #include "CC_LockSetFactory.h"
 #include "concurrency_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am b/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am
new file mode 100644
index 00000000000..1038e3ee925
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am
@@ -0,0 +1,41 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Concurrency Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Concurrency.la
+
+libTAO_Concurrency_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Concurrency_la_SOURCES = \
+        CC_Lock.cpp \
+        CC_LockSet.cpp \
+        CC_LockSetFactory.cpp \
+        Concurrency_Utils.cpp
+
+noinst_HEADERS = \
+        CC_Lock.h \
+        CC_LockSet.h \
+        CC_LockSetFactory.h \
+        Concurrency_Utils.h
+
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 23377e65db8..c8bd81a0c35 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -3,7 +3,7 @@
 
 project(CosConcurrency) : orbsvcslib, core, portableserver {
   sharedname   = TAO_CosConcurrency
-  idlflags    += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h
+  idlflags    += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h
   dynamicflags = TAO_CONCURRENCY_BUILD_DLL
   tagchecks   += Concurrency
   pch_header   =
@@ -20,7 +20,4 @@ project(CosConcurrency) : orbsvcslib, core, portableserver {
       Concurrency
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 8446fb375cd..9181b72a2da 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,78 +1,32 @@
 // $Id$
 
-project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
+project (CosEvent) : ec_typed_events, orbsvcslib, messaging, core, naming {
   sharedname   = TAO_CosEvent
-  dynamicflags = TAO_EVENT_BUILD_DLL
+  avoids      += minimum_corba
 
-  idlflags    += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
+  // Warning : The idlflags must match exactly those used in
+  //           CosNotification, because we don't know which project
+  //           will actually generate the IDL.  For this reason we
+  //           also just use the event_export.h and macros for both
+  //           services.
+  idlflags    += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h
 
-  IDL_Files {
-    CosEventComm.idl
-    CosEventChannelAdmin.idl
-  }
-
-  Source_Files {
-    CosEventCommC.cpp
-    CosEventChannelAdminC.cpp
-  }
-
-  Header_Files {
-    CosEventCommC.h
-    CosEventChannelAdminC.h
-  }
-
-  Inline_Files {
-    CosEventCommC.inl
-    CosEventChannelAdminC.inl
-  }
-
-  Template_Files {
-  }
-
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files {
-    CosEvent.rc
-  }
-}
-
-
-project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver, ec_typed_events_skel {
-  sharedname   = TAO_CosEvent_Skel
-  dynamicflags = TAO_EVENT_SKEL_BUILD_DLL
+  // Set both DLL flags because of the shared idl files
+  dynamicflags = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL
 
-  IDL_Files {
-  }
-
-  Source_Files {
-    CosEventCommS.cpp
-    CosEventChannelAdminS.cpp
-  }
-
-  Header_Files {
-    CosEventCommS.h
-    CosEventChannelAdminS.h
-  }
-
-  Inline_Files {
-    CosEventCommS.inl
-    CosEventChannelAdminS.inl
-  }
-
-  Template_Files {
-  }
-}
-
-
-project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging, naming, svc_utils {
-  sharedname   = TAO_CosEvent_Serv
-  dynamicflags = TAO_EVENT_SERV_BUILD_DLL
   tagchecks   += CosEvent
 
   IDL_Files {
+    CosEventComm.idl
+    CosEventChannelAdmin.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
     CosEvent {
+      CosEventCommC.cpp
+      CosEventChannelAdminC.cpp
+      CosEventCommS.cpp
+      CosEventChannelAdminS.cpp
       CosEvent/CEC_ConsumerAdmin.cpp
       CosEvent/CEC_ConsumerControl.cpp
       CosEvent/CEC_Default_Factory.cpp
@@ -94,7 +48,4 @@ project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_
       CosEvent/CEC_SupplierControl.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index faa5d2b9ac0..c1044726527 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -6,7 +6,7 @@
 #include "CEC_ProxyPushConsumer.h"
 #include "CEC_EventChannel.h"
 
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "CEC_ConsumerAdmin.i"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 980431bedbb..a56cbbed72f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -15,17 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h"
 
 #include "CEC_ProxyPushSupplier.h"
 #include "CEC_ProxyPullSupplier.h"
-#include "event_serv_export.h"
+#include "event_export.h"
 
 class TAO_CEC_EventChannel;
 
@@ -45,7 +45,7 @@ class TAO_CEC_EventChannel;
  * externally.
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin 
+class TAO_Event_Export TAO_CEC_ConsumerAdmin 
   : public POA_CosEventChannelAdmin::ConsumerAdmin
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index 180466d987e..80f1bcfbdb6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -49,17 +49,6 @@ TAO_CEC_ConsumerControl::system_exception (TAO_CEC_ProxyPushSupplier *,
 {
 }
 
-bool
-TAO_CEC_ConsumerControl::need_to_disconnect (PortableServer::ServantBase*)
-{
-  return true;
-}
-
-void
-TAO_CEC_ConsumerControl::successful_transmission (PortableServer::ServantBase*)
-{
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index f3a405d26c7..07293872b3f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/CosEvent/event_serv_export.h"
+
+#include "orbsvcs/orbsvcs/CosEvent/event_export.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushSupplier;
@@ -44,7 +44,7 @@ namespace CORBA
  * = LOCKING
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_ConsumerControl
+class TAO_Event_Export TAO_CEC_ConsumerControl
 {
 public:
   /// Constructor.  It does not assume ownership of the <event_channel>
@@ -80,15 +80,6 @@ public:
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
                                  CORBA::SystemException &
                                  ACE_ENV_ARG_DECL_NOT_USED);
-
-  /// Do we need to disconnect this supplier?  The parameter type for
-  /// proxy is PortableServer::ServantBase* due to the fact that this
-  /// method will be used for TAO_CEC_ProxyPushSupplier's and
-  /// TAO_CEC_ProxyPullSupplier's.
-  virtual bool need_to_disconnect (PortableServer::ServantBase* proxy);
-
-  /// Allow others to inform us when a send or receive was successful.
-  virtual void successful_transmission (PortableServer::ServantBase* proxy);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index 6be89cac48a..58f079b3cd9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -13,12 +13,12 @@
 #include "CEC_Reactive_ConsumerControl.h"
 #include "CEC_Reactive_SupplierControl.h"
 
-#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
-#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Read.h"
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
@@ -334,8 +334,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControlTimeout")) == 0 ||
-               ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControlRoundtripTimeout")) == 0)
+      else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControlTimeout")) == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -348,8 +347,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControlTimeout")) == 0 ||
-               ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControlRoundtripTimeout")) == 0)
+      else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControlTimeout")) == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -362,18 +360,6 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECProxyDisconnectRetries")) == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              const ACE_TCHAR* opt = arg_shifter.get_current ();
-              this->proxy_disconnect_retries_ = ACE_OS::atoi (opt);
-              arg_shifter.consume_arg ();
-            }
-        }
-
       else if (ACE_OS::strncmp (arg, ACE_LIB_TEXT("-CEC"), 3) == 0)
         {
           arg_shifter.consume_arg ();
@@ -447,9 +433,8 @@ TAO_CEC_Default_Factory::create_pulling_strategy (TAO_CEC_EventChannel *ec)
         CORBA::ORB_init (argc, argv, this->orbid_);
 
       ACE_Time_Value rate (0, this->reactive_pulling_period_);
-      return new TAO_CEC_Reactive_Pulling_Strategy (
-                                 rate, this->supplier_control_timeout_,
-                                 ec, orb.in ());
+      return new TAO_CEC_Reactive_Pulling_Strategy (rate, ec,
+                                                    orb.in ());
     }
   return 0;
 }
@@ -1229,10 +1214,7 @@ TAO_CEC_Default_Factory::create_consumer_control (TAO_CEC_EventChannel* ec)
         CORBA::ORB_init (argc, argv, this->orbid_);
 
       ACE_Time_Value rate (0, this->consumer_control_period_);
-      return new TAO_CEC_Reactive_ConsumerControl (
-                                 rate, this->consumer_control_timeout_,
-                                 this->proxy_disconnect_retries_,
-                                 ec, orb.in ());
+      return new TAO_CEC_Reactive_ConsumerControl (rate, consumer_control_timeout_, ec, orb.in ());
     }
   return 0;
 }
@@ -1251,10 +1233,7 @@ TAO_CEC_Default_Factory::create_consumer_control (TAO_CEC_TypedEventChannel* ec)
         CORBA::ORB_init (argc, argv, this->orbid_);
 
       ACE_Time_Value rate (0, this->consumer_control_period_);
-      return new TAO_CEC_Reactive_ConsumerControl (
-                                 rate, this->consumer_control_timeout_,
-                                 this->proxy_disconnect_retries_,
-                                 ec, orb.in ());
+      return new TAO_CEC_Reactive_ConsumerControl (rate, consumer_control_timeout_, ec, orb.in ());
     }
   return 0;
 }
@@ -1278,11 +1257,8 @@ TAO_CEC_Default_Factory::create_supplier_control (TAO_CEC_EventChannel* ec)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, this->orbid_);
 
-      ACE_Time_Value rate (0, this->supplier_control_period_);
-      return new TAO_CEC_Reactive_SupplierControl (
-                                 rate, this->supplier_control_timeout_,
-                                 this->proxy_disconnect_retries_,
-                                 ec, orb.in ());
+      ACE_Time_Value rate (0, this->consumer_control_period_);
+      return new TAO_CEC_Reactive_SupplierControl (rate, supplier_control_timeout_, ec, orb.in ());
     }
   return 0;
 }
@@ -1300,11 +1276,8 @@ TAO_CEC_Default_Factory::create_supplier_control (TAO_CEC_TypedEventChannel* ec)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, this->orbid_);
 
-      ACE_Time_Value rate (0, this->supplier_control_period_);
-      return new TAO_CEC_Reactive_SupplierControl (
-                                 rate, this->supplier_control_timeout_,
-                                 this->proxy_disconnect_retries_,
-                                 ec, orb.in ());
+      ACE_Time_Value rate (0, this->consumer_control_period_);
+      return new TAO_CEC_Reactive_SupplierControl (rate, supplier_control_timeout_, ec, orb.in ());
     }
   return 0;
 }
@@ -1324,7 +1297,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CEC_Default_Factory,
                        &ACE_SVC_NAME (TAO_CEC_Default_Factory),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Default_Factory)
+ACE_FACTORY_DEFINE (TAO_Event, TAO_CEC_Default_Factory)
 
 // ****************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
index d314e1785ca..07536f4627c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -38,7 +38,7 @@
  * set in the service configurator file.
  * = MEMORY MANAGMENT
  */
-class TAO_Event_Serv_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory
+class TAO_Event_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory
 {
 public:
   /// Constructor
@@ -199,9 +199,6 @@ private:
   /// The consumer and supplier control timeout in usecs
   ACE_Time_Value consumer_control_timeout_;
   ACE_Time_Value supplier_control_timeout_;
-
-  /// The number of retries before disconnecting a proxy
-  unsigned int proxy_disconnect_retries_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -209,7 +206,7 @@ private:
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE (TAO_CEC_Default_Factory)
-ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Default_Factory)
+ACE_FACTORY_DECLARE (TAO_Event, TAO_CEC_Default_Factory)
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
index b039316d2cb..f7699383cb4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
@@ -20,7 +20,6 @@ TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void)
      consumer_control_period_ (TAO_CEC_DEFAULT_CONSUMER_CONTROL_PERIOD),
      supplier_control_period_ (TAO_CEC_DEFAULT_SUPPLIER_CONTROL_PERIOD),
      consumer_control_timeout_ (0, TAO_CEC_DEFAULT_CONSUMER_CONTROL_TIMEOUT),
-     supplier_control_timeout_ (0, TAO_CEC_DEFAULT_SUPPLIER_CONTROL_TIMEOUT),
-     proxy_disconnect_retries_ (TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES)
+     supplier_control_timeout_ (0, TAO_CEC_DEFAULT_SUPPLIER_CONTROL_TIMEOUT)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
index 5a97e4bd902..8cf65a09905 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
@@ -118,10 +118,6 @@
 # define TAO_CEC_DEFAULT_SUPPLIER_CONTROL_TIMEOUT 10000 /* usecs */
 #endif /* TAO_CEC_DEFAULT_SUPPLIER_CONTROL_TIMEOUT */
 
-#ifndef TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES
-# define TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES 0
-#endif /* TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CEC_DEFAULTS_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index a6ba0f8a724..b121b22e54d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -16,9 +16,9 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
 
-#include "event_serv_export.h"
+#include "event_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,7 +40,7 @@ class TAO_CEC_TypedEvent;
  * for each queue or can simply push the event to the consumer in
  * FIFO order.
  */
-class TAO_Event_Serv_Export TAO_CEC_Dispatching
+class TAO_Event_Export TAO_CEC_Dispatching
 {
 public:
   /// destructor...
@@ -84,7 +84,7 @@ public:
  * The events are dispatched in FIFO ordering, using the invoking
  * thread to push the event to the consumer.
  */
-class TAO_Event_Serv_Export TAO_CEC_Reactive_Dispatching : public TAO_CEC_Dispatching
+class TAO_Event_Export TAO_CEC_Reactive_Dispatching : public TAO_CEC_Dispatching
 {
 public:
   /// The scheduler is used to find the range of priorities and similar
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index fe5b698b592..ac24df18469 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -28,7 +28,7 @@
 #include "tao/Basic_Types.h"
 #include "tao/Objref_VarOut_T.h"
 
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "orbsvcs/orbsvcs/CosEvent/event_export.h"
 
 #include "CEC_ProxyPushSupplier.h"
 
@@ -43,7 +43,7 @@
  * dispatching.
  *
  */
-class TAO_Event_Serv_Export TAO_CEC_Dispatching_Task : public ACE_Task<ACE_SYNCH>
+class TAO_Event_Export TAO_CEC_Dispatching_Task : public ACE_Task<ACE_SYNCH>
 {
 public:
   /// Constructor
@@ -72,7 +72,7 @@ private:
 
 // ****************************************************************
 
-class TAO_Event_Serv_Export TAO_CEC_Dispatch_Command : public ACE_Message_Block
+class TAO_Event_Export TAO_CEC_Dispatch_Command : public ACE_Message_Block
 {
 public:
   /// Constructor, it will allocate its own data block
@@ -91,7 +91,7 @@ public:
 
 // ****************************************************************
 
-class TAO_Event_Serv_Export TAO_CEC_Shutdown_Task_Command : public TAO_CEC_Dispatch_Command
+class TAO_Event_Export TAO_CEC_Shutdown_Task_Command : public TAO_CEC_Dispatch_Command
 {
 public:
   /// Constructor
@@ -103,7 +103,7 @@ public:
 
 // ****************************************************************
 
-class TAO_Event_Serv_Export TAO_CEC_Push_Command : public TAO_CEC_Dispatch_Command
+class TAO_Event_Export TAO_CEC_Push_Command : public TAO_CEC_Dispatch_Command
 {
 public:
   /// Constructor
@@ -129,7 +129,7 @@ private:
 // ****************************************************************
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-class TAO_Event_Serv_Export TAO_CEC_Invoke_Command : public TAO_CEC_Dispatch_Command
+class TAO_Event_Export TAO_CEC_Invoke_Command : public TAO_CEC_Dispatch_Command
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index df029202c74..ee171b6bbc8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -227,14 +227,3 @@ TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager_Ex<PortableServer::ServantBase*, unsigned int, ServantBaseHash, ACE_Equal_To<PortableServer::ServantBase*>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Entry<PortableServer::ServantBase*, unsigned int>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableServer::ServantBase*, unsigned int, ServantBaseHash, ACE_Equal_To<PortableServer::ServantBase*>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<PortableServer::ServantBase*, unsigned int>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 55f9282abe2..90c4e9cd216 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -26,11 +26,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 #include "CEC_Defaults.h"
-#include "event_serv_export.h"
-#include "ace/Hash_Map_Manager.h"
+#include "event_export.h"
 
 /**
  * @class TAO_CEC_EventChannel_Attributes
@@ -48,7 +47,7 @@
  * an easy mechanism to extend the attributes without requiring
  * changes in the EC constructor.
  */
-class TAO_Event_Serv_Export TAO_CEC_EventChannel_Attributes
+class TAO_Event_Export TAO_CEC_EventChannel_Attributes
 {
 public:
   /**
@@ -98,23 +97,9 @@ private:
  * ConsumerAdmin and Dispatching) and to provide a simpler
  * interface to the CEC_Factory.
  */
-class TAO_Event_Serv_Export TAO_CEC_EventChannel : public POA_CosEventChannelAdmin::EventChannel
+class TAO_Event_Export TAO_CEC_EventChannel : public POA_CosEventChannelAdmin::EventChannel
 {
 public:
-  class ServantBaseHash
-  {
-  public:
-    u_long operator() (PortableServer::ServantBase* const & ptr) const {
-      return ACE_reinterpret_cast(u_long, ptr);
-    }
-  };
-
-  typedef ACE_Hash_Map_Manager_Ex<PortableServer::ServantBase*,
-                                  unsigned int,
-                                  ServantBaseHash,
-                                  ACE_Equal_To<PortableServer::ServantBase*>,
-                                  TAO_SYNCH_MUTEX> ServantRetryMap;
-
   /**
    * constructor
    * If <own_factory> is not 0 it assumes ownership of the factory.
@@ -253,8 +238,6 @@ public:
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  ServantRetryMap& get_servant_retry_map (void);
-
 private:
   /// The POAs used to activate "supplier-side" and "consumer-side"
   /// objects.
@@ -294,8 +277,6 @@ private:
   /// suppliers
   TAO_CEC_ConsumerControl *consumer_control_;
   TAO_CEC_SupplierControl *supplier_control_;
-
-  ServantRetryMap retry_map_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
index 256d518b72a..563dc6e69e0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
@@ -192,8 +192,3 @@ TAO_CEC_EventChannel::disconnect_callbacks (void) const
   return this->disconnect_callbacks_;
 }
 
-ACE_INLINE TAO_CEC_EventChannel::ServantRetryMap&
-TAO_CEC_EventChannel::get_servant_retry_map (void)
-{
-  return this->retry_map_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index 78f11357d3e..a7f8408d45f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -18,9 +18,9 @@
 #include "CEC_Event_Loader.h"
 #include "ace/Dynamic_Service.h"
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
@@ -459,7 +459,7 @@ TAO_CEC_Event_Loader::fini (void)
   return 0;
 }
 
-ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Event_Loader)
+ACE_FACTORY_DEFINE (TAO_Event, TAO_CEC_Event_Loader)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Dynamic_Service<TAO_CEC_Event_Loader>;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index d48c98c3705..4d4ca86a992 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -23,7 +23,7 @@
 #include "CEC_TypedEventChannel.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "ace/Service_Config.h"
 
@@ -32,7 +32,7 @@
  *
  * @brief Dynamically load an instance of the COS Event Service.
  */
-class TAO_Event_Serv_Export TAO_CEC_Event_Loader : public TAO_Object_Loader
+class TAO_Event_Export TAO_CEC_Event_Loader : public TAO_Object_Loader
 {
 public:
   /// Constructor
@@ -98,6 +98,6 @@ private:
   ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &))
 };
 
-ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Event_Loader)
+ACE_FACTORY_DECLARE (TAO_Event, TAO_CEC_Event_Loader)
 
 #endif /* TAO_CEC_EVENT_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
index 7161eb63dfd..248ef824c76 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -22,7 +22,7 @@
 
 #include "tao/Objref_VarOut_T.h"
 
-#include "event_serv_export.h"
+#include "event_export.h"
 
 class ACE_Lock;
 
@@ -70,7 +70,7 @@ typedef TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullSupplier> TAO_CEC_ProxyPullSup
  * Some implementations may require a different instance for the
  * CEC_Factory for each instance of a CEC_EventChannel.
  */
-class TAO_Event_Serv_Export TAO_CEC_Factory : public ACE_Service_Object
+class TAO_Event_Export TAO_CEC_Factory : public ACE_Service_Object
 {
 public:
   /// destructor...
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index d3a706ff5b8..ba779b69f40 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -34,7 +34,7 @@ class TAO_CEC_EventChannel;
  * threads.  It's main purpose is to decouple the suppliers from
  * the client execution time, specially in the collocated case.
  */
-class TAO_Event_Serv_Export TAO_CEC_MT_Dispatching : public TAO_CEC_Dispatching
+class TAO_Event_Export TAO_CEC_MT_Dispatching : public TAO_CEC_Dispatching
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index fd172f89e1d..592b10354b4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -28,13 +28,10 @@ TAO_CEC_ProxyPullConsumer::
 
   this->default_POA_ =
     this->event_channel_->consumer_poa ();
-
-  this->event_channel_->get_servant_retry_map ().bind (this, 0);
 }
 
 TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
 {
-  this->event_channel_->get_servant_retry_map ().unbind (this);
   this->event_channel_->destroy_consumer_lock (this->lock_);
 }
 
@@ -113,24 +110,24 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
   }
 
   CORBA::Any_var any;
-  TAO_CEC_SupplierControl *control =
-                 this->event_channel_->supplier_control ();
-
   ACE_TRY
     {
       any = supplier->try_pull (has_event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
-      // Inform the control that we got something from the supplier
-      control->successful_transmission(this);
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
+      TAO_CEC_SupplierControl *control =
+        this->event_channel_->supplier_control ();
+
       control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
+      TAO_CEC_SupplierControl *control =
+        this->event_channel_->supplier_control ();
+
       control->system_exception (this,
                                  sysex
                                  ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 35fae60d38e..415ae07b47e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -15,14 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
-#include "event_serv_export.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
+#include "event_export.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_Dispatching;
@@ -41,7 +41,7 @@ class TAO_CEC_ProxyPullSupplier;
  * The object commits suicide when disconnect_pull_consumer() is
  * called.
  */
-class TAO_Event_Serv_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChannelAdmin::ProxyPullConsumer
+class TAO_Event_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChannelAdmin::ProxyPullConsumer
 {
 public:
   typedef CosEventChannelAdmin::ProxyPullConsumer_ptr _ptr_type;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index b5b75ae5f43..32cbc3086f1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -27,13 +27,10 @@ TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* ec)
 
   this->default_POA_ =
     this->event_channel_->supplier_poa ();
-
-  this->event_channel_->get_servant_retry_map ().bind (this, 0);
 }
 
 TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void)
 {
-  this->event_channel_->get_servant_retry_map ().unbind (this);
   this->event_channel_->destroy_supplier_lock (this->lock_);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index 1f7a0a603d4..85922eb8922 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,7 +26,7 @@
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Unbounded_Queue.h"
 
-#include "event_serv_export.h"
+#include "event_export.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPullConsumer;
@@ -48,7 +48,7 @@ class TAO_CEC_ProxyPullConsumer;
  * Locking is strategized, the event channel acts as a factory for
  * the locking strategies.
  */
-class TAO_Event_Serv_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChannelAdmin::ProxyPullSupplier
+class TAO_Event_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChannelAdmin::ProxyPullSupplier
 {
 public:
   typedef CosEventChannelAdmin::ProxyPullSupplier_ptr _ptr_type;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index cadc6623315..434769bbb9d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -28,13 +28,10 @@ TAO_CEC_ProxyPushConsumer::
 
   this->default_POA_ =
     this->event_channel_->consumer_poa ();
-
-  this->event_channel_->get_servant_retry_map ().bind (this, 0);
 }
 
 TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void)
 {
-  this->event_channel_->get_servant_retry_map ().unbind (this);
   this->event_channel_->destroy_consumer_lock (this->lock_);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index d16697cb4bd..aee97b6f167 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -15,14 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "event_serv_export.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
+#include "event_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_Dispatching;
@@ -41,7 +41,7 @@ class TAO_CEC_ProxyPushSupplier;
  * The object commits suicide when disconnect_push_consumer() is
  * called.
  */
-class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer 
+class TAO_Event_Export TAO_CEC_ProxyPushConsumer 
   : public POA_CosEventChannelAdmin::ProxyPushConsumer
 {
 public:
@@ -151,7 +151,7 @@ private:
  * the reference count on the proxy, eliminating the need to hold
  * mutexes during long operations.
  */
-class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer_Guard
+class TAO_Event_Export TAO_CEC_ProxyPushConsumer_Guard
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index eb188dd30f9..2deb6110383 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -10,8 +10,8 @@
 #include "CEC_Dispatching.h"
 #include "CEC_EventChannel.h"
 #include "CEC_ConsumerControl.h"
-#include "orbsvcs/ESF/ESF_RefCount_Guard.h"
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 #include "tao/debug.h"
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 #include "CEC_TypedEvent.h"
@@ -46,8 +46,6 @@ TAO_CEC_ProxyPushSupplier::TAO_CEC_ProxyPushSupplier (TAO_CEC_EventChannel* ec)
 
   this->default_POA_ =
     this->event_channel_->supplier_poa ();
-
-  this->event_channel_->get_servant_retry_map ().bind (this, 0);
 }
 
 // TAO_CEC_ProxyPushSupplier Constructure (Typed EC)
@@ -63,14 +61,11 @@ TAO_CEC_ProxyPushSupplier::TAO_CEC_ProxyPushSupplier (TAO_CEC_TypedEventChannel*
 
   this->default_POA_ =
     this->typed_event_channel_->typed_supplier_poa ();
-
-  this->event_channel_->get_servant_retry_map ().bind (this, 0);
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void)
 {
-  this->event_channel_->get_servant_retry_map ().unbind (this);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   if (this->is_typed_ec () )
     {
@@ -603,23 +598,24 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
       CosEventComm::PushConsumer::_duplicate (this->consumer_.in ());
   }
 
-  TAO_CEC_ConsumerControl *control =
-               this->event_channel_->consumer_control ();
   ACE_TRY
     {
       consumer->push (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
-      // Inform the control that we were able to push something
-      control->successful_transmission(this);
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
     {
+      TAO_CEC_ConsumerControl *control =
+        this->event_channel_->consumer_control ();
+
       control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
+      TAO_CEC_ConsumerControl *control =
+        this->event_channel_->consumer_control ();
+
       control->system_exception (this,
                                  sysex
                                  ACE_ENV_ARG_PARAMETER);
@@ -647,24 +643,24 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
       CosEventComm::PushConsumer::_duplicate (this->consumer_.in ());
   }
 
-  TAO_CEC_ConsumerControl *control =
-                  this->event_channel_->consumer_control ();
-
   ACE_TRY
     {
       consumer->push (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
-      // Inform the control that we were able to push something
-      control->successful_transmission(this);
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
     {
+      TAO_CEC_ConsumerControl *control =
+        this->event_channel_->consumer_control ();
+
       control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
+      TAO_CEC_ConsumerControl *control =
+        this->event_channel_->consumer_control ();
+
       control->system_exception (this,
                                  sysex
                                  ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index 1e05d9e7e41..d87dd7977dd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -16,13 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-#include "event_serv_export.h"
+#include "event_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -52,7 +52,7 @@ class TAO_CEC_TypedEventChannel;
  * Locking is strategized, the event channel acts as a factory for
  * the locking strategies.
  */
-class TAO_Event_Serv_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChannelAdmin::ProxyPushSupplier
+class TAO_Event_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChannelAdmin::ProxyPushSupplier
 {
 public:
   typedef CosEventChannelAdmin::ProxyPushSupplier_ptr _ptr_type;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index b4c0c970545..f1811d51f40 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -23,7 +23,7 @@
 
 #include "tao/Objref_VarOut_T.h"
 
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "orbsvcs/orbsvcs/CosEvent/event_export.h"
 
 /**
  * @class TAO_CEC_Pulling_Strategy
@@ -36,7 +36,7 @@
  * for each queue or can simply push the event to the consumer in
  * FIFO order.
  */
-class TAO_Event_Serv_Export TAO_CEC_Pulling_Strategy
+class TAO_Event_Export TAO_CEC_Pulling_Strategy
 {
 public:
   /// destructor...
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index 795ba286da9..0fed2f2298e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -12,8 +12,6 @@
 #include "CEC_ProxyPushSupplier.h"
 #include "CEC_ProxyPullSupplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
 
@@ -30,12 +28,10 @@ ACE_RCSID (CosEvent,
 TAO_CEC_Reactive_ConsumerControl::
      TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate,
                                        const ACE_Time_Value &timeout,
-                                       unsigned int retries,
                                        TAO_CEC_EventChannel *ec,
                                        CORBA::ORB_ptr orb)
   : rate_ (rate),
     timeout_ (timeout),
-    retries_ (retries),
     adapter_ (this),
     event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
@@ -54,12 +50,10 @@ TAO_CEC_Reactive_ConsumerControl::
 TAO_CEC_Reactive_ConsumerControl::
      TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate,
                                        const ACE_Time_Value &timeout,
-                                       unsigned int retries,
                                        TAO_CEC_TypedEventChannel *ec,
                                        CORBA::ORB_ptr orb)
   : rate_ (rate),
     timeout_ (timeout),
-    retries_ (retries),
     adapter_ (this),
     typed_event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
@@ -110,37 +104,6 @@ TAO_CEC_Reactive_ConsumerControl::query_consumers (
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 }
 
-bool
-TAO_CEC_Reactive_ConsumerControl::need_to_disconnect (
-                                    PortableServer::ServantBase* proxy)
-{
-  bool disconnect = true;
-  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry;
-  if (this->event_channel_->
-      get_servant_retry_map ().find (proxy, entry) == 0)
-    {
-      ++entry->int_id_;
-      if (entry->int_id_ <= this->retries_)
-        {
-          disconnect = false;
-        }
-    }
-
-  return disconnect;
-}
-
-void
-TAO_CEC_Reactive_ConsumerControl::successful_transmission (
-                                    PortableServer::ServantBase* proxy)
-{
-  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry;
-  if (this->event_channel_->
-      get_servant_retry_map ().find (proxy, entry) == 0)
-    {
-      entry->int_id_ = 0;
-    }
-}
-
 void
 TAO_CEC_Reactive_ConsumerControl::handle_timeout (
       const ACE_Time_Value &,
@@ -162,17 +125,9 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout (
                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_TRY_EX (query)
-        {
-          // Query the state of the consumers...
-          this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (query);
-        }
-      ACE_CATCHANY
-        {
-          // Ignore all exceptions
-        }
-      ACE_ENDTRY;
+      // Query the state of the consumers...
+      this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
                                                    CORBA::SET_OVERRIDE
@@ -208,12 +163,8 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Pre-compute the policy list to the set the right timeout
-      // value...
-      // We need to convert the relative timeout into 100's of nano seconds.
-      TimeBase::TimeT timeout;
-      ORBSVCS_Time::Time_Value_to_TimeT (timeout,
-                                         this->timeout_);
+      // Timeout for polling state (default = 10 msec)
+      TimeBase::TimeT timeout = timeout_.usec() * 10;
       CORBA::Any any;
       any <<= timeout;
 
@@ -307,11 +258,18 @@ TAO_CEC_Reactive_ConsumerControl::system_exception (
 {
   ACE_TRY
     {
-      if (this->need_to_disconnect (proxy))
-        {
-          proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      // The current implementation is very strict, and kicks out a
+      // client on the first system exception. We may
+      // want to be more lenient in the future, for example,
+      // this is TAO's minor code for a failed connection.
+      //
+      // if (CORBA::TRANSIENT::_narrow (&exception) != 0
+      //     && exception->minor () == 0x54410085)
+      //   return;
+
+      // Anything else is serious, including timeouts...
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -363,11 +321,17 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
     {
-      if (this->control_->need_to_disconnect (supplier))
-        {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      // The current implementation is very strict, and kicks out a
+      // client on the first system exception. We may
+      // want to be more lenient in the future, for example,
+      // this is TAO's minor code for a failed connection.
+      //
+      // if (CORBA::TRANSIENT::_narrow (&exception) != 0
+      //     && exception->minor () == 0x54410085)
+      //   return;
+
+      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -402,11 +366,17 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
     {
-      if (this->control_->need_to_disconnect (supplier))
-        {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      // The current implementation is very strict, and kicks out a
+      // client on the first system exception. We may
+      // want to be more lenient in the future, for example,
+      // this is TAO's minor code for a failed connection.
+      //
+      // if (CORBA::TRANSIENT::_narrow (&exception) != 0
+      //     && exception->minor () == 0x54410085)
+      //   return;
+
+      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 43994062fd0..164e7588496 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -21,7 +21,7 @@
 
 #include "CEC_ConsumerControl.h"
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 #include "tao/ORB.h"
 
@@ -48,7 +48,7 @@ class TAO_CEC_TypedEventChannel;
  * periodically wakeup and verify the state of the consumers
  * registered with the Event Channel.
  */
-class TAO_Event_Serv_Export TAO_CEC_ConsumerControl_Adapter : public ACE_Event_Handler
+class TAO_Event_Export TAO_CEC_ConsumerControl_Adapter : public ACE_Event_Handler
 {
 public:
   /// Constructor
@@ -74,7 +74,7 @@ private:
  * = LOCKING
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl 
+class TAO_Event_Export TAO_CEC_Reactive_ConsumerControl 
   : public TAO_CEC_ConsumerControl
 {
 public:
@@ -82,7 +82,6 @@ public:
   /// parameter.
   TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate,
                                     const ACE_Time_Value &timeout,
-                                    unsigned int retries,
                                     TAO_CEC_EventChannel *event_channel,
                                     CORBA::ORB_ptr orb);
 
@@ -91,7 +90,6 @@ public:
   TAO_CEC_Reactive_ConsumerControl (
       const ACE_Time_Value &rate,
       const ACE_Time_Value &timeout,
-      unsigned int retries,
       TAO_CEC_TypedEventChannel *typed_event_channel,
       CORBA::ORB_ptr orb
     );
@@ -115,15 +113,6 @@ public:
                                  CORBA::SystemException &
                                  ACE_ENV_ARG_DECL_NOT_USED);
 
-  /// Do we need to disconnect this supplier?  The parameter type for
-  /// proxy is PortableServer::ServantBase* due to the fact that this
-  /// method will be used for TAO_CEC_ProxyPushSupplier's and
-  /// TAO_CEC_ProxyPullSupplier's.
-  virtual bool need_to_disconnect (PortableServer::ServantBase* proxy);
-
-  /// Allow others to inform us when a send or receive was successful.
-  virtual void successful_transmission (PortableServer::ServantBase* proxy);
-
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
@@ -136,9 +125,6 @@ private:
   /// The polling timeout
   ACE_Time_Value timeout_;
 
-  /// The number of retries per proxy until it is disconnected
-  unsigned int retries_;
-
   /// The Adapter for the reactor events
   TAO_CEC_ConsumerControl_Adapter adapter_;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 470f8a98292..dec3c06aa2f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -6,8 +6,6 @@
 #include "CEC_SupplierAdmin.h"
 #include "CEC_ConsumerAdmin.h"
 
-#include "orbsvcs/Time_Utilities.h"
-
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
 
@@ -21,12 +19,10 @@ ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$")
 
 TAO_CEC_Reactive_Pulling_Strategy::
     TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate,
-                                       const ACE_Time_Value &relative_timeout,
                                        TAO_CEC_EventChannel *event_channel,
                                        CORBA::ORB_ptr orb)
   :  adapter_ (this),
      rate_ (rate),
-     relative_timeout_ (relative_timeout),
      event_channel_ (event_channel),
      orb_ (CORBA::ORB::_duplicate (orb))
 {
@@ -55,20 +51,12 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout (
                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_TRY_EX (query)
-        {
-          TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (),
-                                     this->event_channel_->supplier_control ());
+      TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (),
+                                 this->event_channel_->supplier_control ());
 
-          this->event_channel_->supplier_admin ()->for_each (&worker
-                                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (query);
-        }
-      ACE_CATCHANY
-        {
-          // Ignore all exceptions
-        }
-      ACE_ENDTRY;
+      this->event_channel_->supplier_admin ()->for_each (&worker
+                                                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
                                                    CORBA::SET_OVERRIDE
@@ -113,10 +101,8 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
 
       // Pre-compute the policy list to the set the right timeout
       // value...
-      // We need to convert the relative timeout into 100's of nano seconds.
-      TimeBase::TimeT timeout;
-      ORBSVCS_Time::Time_Value_to_TimeT (timeout,
-                                         this->relative_timeout_);
+      // @@ TODO It is currently hard-coded to 10 milliseconds
+      TimeBase::TimeT timeout = 10 * 10000;
       CORBA::Any any;
       any <<= timeout;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index 0ee810190e2..cf38a4aa8b9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -21,10 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 #include "tao/ORB.h"
-#include "tao/PolicyC.h"
 
 #include "ace/Event_Handler.h"
 
@@ -43,7 +42,7 @@ class TAO_CEC_Reactive_Pulling_Strategy;
  * periodically wakeup and try top pull events from each
  * PullSupplier connected to the EventChannel.
  */
-class TAO_Event_Serv_Export TAO_CEC_Pulling_Strategy_Adapter : public ACE_Event_Handler
+class TAO_Event_Export TAO_CEC_Pulling_Strategy_Adapter : public ACE_Event_Handler
 {
 public:
   /// Constructor
@@ -68,13 +67,12 @@ private:
  * The events are dispatched in FIFO ordering, using the invoking
  * thread to push the event to the consumer.
  */
-class TAO_Event_Serv_Export TAO_CEC_Reactive_Pulling_Strategy : public TAO_CEC_Pulling_Strategy
+class TAO_Event_Export TAO_CEC_Reactive_Pulling_Strategy : public TAO_CEC_Pulling_Strategy
 {
 public:
   /// The scheduler is used to find the range of priorities and similar
   /// info.
   TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate,
-                                     const ACE_Time_Value &relative_timeout,
                                      TAO_CEC_EventChannel *event_channel,
                                      CORBA::ORB_ptr orb);
 
@@ -93,9 +91,6 @@ private:
   /// The polling rate
   ACE_Time_Value rate_;
 
-  /// The relative timeout
-  ACE_Time_Value relative_timeout_;
-
   /// The event channel
   TAO_CEC_EventChannel *event_channel_;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index 351b24a2fdc..f0745b949e8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -13,8 +13,6 @@
 
 #include "CEC_ProxyPullConsumer.h"
 
-#include "orbsvcs/Time_Utilities.h"
-
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
 
@@ -31,12 +29,10 @@ ACE_RCSID (CosEvent,
 TAO_CEC_Reactive_SupplierControl::
      TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate,
                                        const ACE_Time_Value &timeout,
-                                       unsigned int retries,
                                        TAO_CEC_EventChannel *ec,
                                        CORBA::ORB_ptr orb)
   : rate_ (rate),
     timeout_ (timeout),
-    retries_ (retries),
     adapter_ (this),
     event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
@@ -55,12 +51,10 @@ TAO_CEC_Reactive_SupplierControl::
 TAO_CEC_Reactive_SupplierControl::
      TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate,
                                        const ACE_Time_Value &timeout,
-                                       unsigned int retries,
                                        TAO_CEC_TypedEventChannel *ec,
                                        CORBA::ORB_ptr orb)
   : rate_ (rate),
     timeout_ (timeout),
-    retries_ (retries),
     adapter_ (this),
     typed_event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
@@ -112,37 +106,6 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers (
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 }
 
-bool
-TAO_CEC_Reactive_SupplierControl::need_to_disconnect (
-                                    PortableServer::ServantBase* proxy)
-{
-  bool disconnect = true;
-  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry;
-  if (this->event_channel_->
-      get_servant_retry_map ().find (proxy, entry) == 0)
-    {
-      ++entry->int_id_;
-      if (entry->int_id_ <= this->retries_)
-        {
-          disconnect = false;
-        }
-    }
-
-  return disconnect;
-}
-
-void
-TAO_CEC_Reactive_SupplierControl::successful_transmission (
-                                    PortableServer::ServantBase* proxy)
-{
-  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry;
-  if (this->event_channel_->
-      get_servant_retry_map ().find (proxy, entry) == 0)
-    {
-      entry->int_id_ = 0;
-    }
-}
-
 void
 TAO_CEC_Reactive_SupplierControl::handle_timeout (
       const ACE_Time_Value &,
@@ -164,17 +127,9 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout (
                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_TRY_EX (query)
-        {
-          // Query the state of the suppliers...
-          this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (query);
-        }
-      ACE_CATCHANY
-        {
-          // Ignore all exceptions
-        }
-      ACE_ENDTRY;
+      // Query the state of the suppliers...
+      this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
                                                    CORBA::SET_OVERRIDE
@@ -210,12 +165,8 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Pre-compute the policy list to the set the right timeout
-      // value...
-      // We need to convert the relative timeout into 100's of nano seconds.
-      TimeBase::TimeT timeout;
-      ORBSVCS_Time::Time_Value_to_TimeT (timeout,
-                                         this->timeout_);
+	  // Timeout for polling state (default = 10 msec)
+      TimeBase::TimeT timeout = timeout_.usec() * 10;
       CORBA::Any any;
       any <<= timeout;
 
@@ -324,11 +275,18 @@ TAO_CEC_Reactive_SupplierControl::system_exception (
 {
   ACE_TRY
     {
-      if (this->need_to_disconnect (proxy))
-        {
-          proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      // The current implementation is very strict, and kicks out a
+      // client on the first system exception. We may
+      // want to be more lenient in the future, for example,
+      // this is TAO's minor code for a failed connection.
+      //
+      // if (CORBA::TRANSIENT::_narrow (&exception) != 0
+      //     && exception->minor () == 0x54410085)
+      //   return;
+
+      // Anything else is serious, including timeouts...
+      proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -380,11 +338,18 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
     {
-      if (this->control_->need_to_disconnect (consumer))
-        {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      // The current implementation is very strict, and kicks out a
+      // client on the first system exception. We may
+      // want to be more lenient in the future, for example,
+      // this is TAO's minor code for a failed connection.
+      //
+      // if (CORBA::TRANSIENT::_narrow (&exception) != 0
+      //     && exception->minor () == 0x54410085)
+      //   return;
+
+      // Anything else is serious, including timeouts...
+      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -420,11 +385,18 @@ TAO_CEC_Ping_Typed_Push_Supplier::work (TAO_CEC_TypedProxyPushConsumer *consumer
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
     {
-      if (this->control_->need_to_disconnect (consumer))
-        {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      // The current implementation is very strict, and kicks out a
+      // client on the first system exception. We may
+      // want to be more lenient in the future, for example,
+      // this is TAO's minor code for a failed connection.
+      //
+      // if (CORBA::TRANSIENT::_narrow (&exception) != 0
+      //     && exception->minor () == 0x54410085)
+      //   return;
+
+      // Anything else is serious, including timeouts...
+      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -460,11 +432,18 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
     {
-      if (this->control_->need_to_disconnect (consumer))
-        {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      // The current implementation is very strict, and kicks out a
+      // client on the first system exception. We may
+      // want to be more lenient in the future, for example,
+      // this is TAO's minor code for a failed connection.
+      //
+      // if (CORBA::TRANSIENT::_narrow (&exception) != 0
+      //     && exception->minor () == 0x54410085)
+      //   return;
+
+      // Anything else is serious, including timeouts...
+      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index bede8d09893..1aefc64bb71 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -25,7 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 #include "tao/ORB.h"
 
@@ -47,7 +47,7 @@ class TAO_CEC_TypedEventChannel;
  * periodically wakeup and verify the state of the suppliers
  * registered with the Event Channel.
  */
-class TAO_Event_Serv_Export TAO_CEC_SupplierControl_Adapter 
+class TAO_Event_Export TAO_CEC_SupplierControl_Adapter 
   : public ACE_Event_Handler
 {
 public:
@@ -74,7 +74,7 @@ private:
  * = LOCKING
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl 
+class TAO_Event_Export TAO_CEC_Reactive_SupplierControl 
   : public TAO_CEC_SupplierControl
 {
 public:
@@ -82,7 +82,6 @@ public:
   /// parameter.
   TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate,
                                     const ACE_Time_Value &timeout,
-                                    unsigned int retries,
                                     TAO_CEC_EventChannel *event_channel,
                                     CORBA::ORB_ptr orb);
 
@@ -91,7 +90,6 @@ public:
   TAO_CEC_Reactive_SupplierControl (
       const ACE_Time_Value &rate,
       const ACE_Time_Value &timeout,
-      unsigned int retries,
       TAO_CEC_TypedEventChannel *typed_event_channel,
       CORBA::ORB_ptr orb
     );
@@ -119,15 +117,6 @@ public:
                                  CORBA::SystemException &
                                  ACE_ENV_ARG_DECL_NOT_USED);
 
-  /// Do we need to disconnect this supplier?  The parameter type for
-  /// proxy is PortableServer::ServantBase* due to the fact that this
-  /// method will be used for TAO_CEC_ProxyPushSupplier's and
-  /// TAO_CEC_ProxyPullSupplier's.
-  virtual bool need_to_disconnect (PortableServer::ServantBase* proxy);
-
-  /// Allow others to inform us when a send or receive was successful.
-  virtual void successful_transmission (PortableServer::ServantBase* proxy);
-
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
@@ -140,9 +129,6 @@ private:
   /// The polling timeout
   ACE_Time_Value timeout_;
 
-  /// The number of retries per proxy until it is disconnected
-  unsigned int retries_;
-
   /// The Adapter for the reactor events
   TAO_CEC_SupplierControl_Adapter adapter_;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index a2837a9b7eb..1335ad5b02e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -4,7 +4,7 @@
 #include "CEC_ProxyPushConsumer.h"
 #include "CEC_ProxyPullConsumer.h"
 #include "CEC_EventChannel.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "CEC_SupplierAdmin.i"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 38f312bdc53..2fdab582804 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -19,17 +19,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h"
 
 #include "CEC_ProxyPushConsumer.h"
 #include "CEC_ProxyPullConsumer.h"
-#include "event_serv_export.h"
+#include "event_export.h"
 
 class TAO_CEC_EventChannel;
 
@@ -49,7 +49,7 @@ class TAO_CEC_EventChannel;
  * externally.
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin 
+class TAO_Event_Export TAO_CEC_SupplierAdmin 
   : public POA_CosEventChannelAdmin::SupplierAdmin
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index 788cc6b7852..28ffbd85d1e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -55,17 +55,6 @@ TAO_CEC_SupplierControl::system_exception (TAO_CEC_ProxyPullConsumer *,
 {
 }
 
-bool
-TAO_CEC_SupplierControl::need_to_disconnect (PortableServer::ServantBase*)
-{
-  return true;
-}
-
-void
-TAO_CEC_SupplierControl::successful_transmission (PortableServer::ServantBase*)
-{
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 7875e543f34..b65cfc52350 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -26,10 +26,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PortableServerC.h"
 #include "tao/Objref_VarOut_T.h"
 
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "orbsvcs/orbsvcs/CosEvent/event_export.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushConsumer;
@@ -55,7 +54,7 @@ namespace CORBA
  * = LOCKING
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_SupplierControl
+class TAO_Event_Export TAO_CEC_SupplierControl
 {
 public:
   /// Constructor.  It does not assume ownership of the <event_channel>
@@ -95,15 +94,6 @@ public:
   virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy,
                                  CORBA::SystemException &
                                  ACE_ENV_ARG_DECL_NOT_USED);
-
-  /// Do we need to disconnect this supplier?  The parameter type for
-  /// proxy is PortableServer::ServantBase* due to the fact that this
-  /// method will be used for TAO_CEC_ProxyPushSupplier's and
-  /// TAO_CEC_ProxyPullSupplier's.
-  virtual bool need_to_disconnect (PortableServer::ServantBase* proxy);
-
-  /// Allow others to inform us when a send or receive was successful.
-  virtual void successful_transmission (PortableServer::ServantBase* proxy);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 1e08da77de5..9dce04452c9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -16,13 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h"
 
 #include "CEC_ProxyPushSupplier.h"
 #include "CEC_TypedEvent.h"
@@ -30,7 +30,7 @@
 class TAO_CEC_TypedEventChannel;
 
 //Class TAO_CEC_TypedConsumerAdmin
-class TAO_Event_Serv_Export TAO_CEC_TypedConsumerAdmin
+class TAO_Event_Export TAO_CEC_TypedConsumerAdmin
   : public POA_CosTypedEventChannelAdmin::TypedConsumerAdmin
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
index d0ee1cfa917..3eac4f3f572 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
@@ -12,7 +12,7 @@
 #define TAO_CEC_TYPEDEVENT_H_
 #include /**/ "ace/pre.h"
 
-#include "event_serv_export.h"
+#include "event_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -34,7 +34,7 @@
 
 class TAO_CEC_ProxyPushSupplier;
 
-class TAO_Event_Serv_Export TAO_CEC_TypedEvent
+class TAO_Event_Export TAO_CEC_TypedEvent
 {
 public:
   /// constructors...
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 1119ef34170..6db51475183 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -23,9 +23,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "CEC_Defaults.h"
-#include "event_serv_export.h"
+#include "event_export.h"
 
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
 
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/NVList.h"
@@ -50,7 +50,7 @@
  * an easy mechanism to extend the attributes without requiring
  * changes in the EC constructor.
  */
-class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel_Attributes
+class TAO_Event_Export TAO_CEC_TypedEventChannel_Attributes
 {
 public:
   /**
@@ -105,7 +105,7 @@ private:
 class TAO_CEC_Operation_Params;
 
 //Class TAO_CEC_TypedEventChannel
-class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTypedEventChannelAdmin::TypedEventChannel
+class TAO_Event_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTypedEventChannelAdmin::TypedEventChannel
 {
 public:
 
@@ -322,7 +322,7 @@ private:
 };
 
 
-class TAO_Event_Serv_Export TAO_CEC_Param
+class TAO_Event_Export TAO_CEC_Param
 {
 public:
   /// Constructor
@@ -341,7 +341,7 @@ private:
 };
 
 
-class TAO_Event_Serv_Export TAO_CEC_Operation_Params
+class TAO_Event_Export TAO_CEC_Operation_Params
 {
   /// constructor
   TAO_CEC_Operation_Params (CORBA::ULong num_params);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index de3210df73b..3ae216f6a4b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -16,21 +16,20 @@
 #define TAO_CEC_TYPEDPROXYPUSHCONSUMER_H_
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
-#include "event_serv_export.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 class TAO_CEC_TypedEvent;
 class TAO_CEC_TypedEventChannel;
 class TAO_CEC_DynamicImplementationServer;
 
 //Class TAO_CEC_TypedProxyPushConsumer
-class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer
+class TAO_Event_Export TAO_CEC_TypedProxyPushConsumer
   : public virtual POA_CosTypedEventChannelAdmin::TypedProxyPushConsumer
 {
 public:
@@ -148,7 +147,7 @@ private:
  * the reference count on the proxy, eliminating the need to hold
  * mutexes during long operations.
  */
-class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer_Guard
+class TAO_Event_Export TAO_CEC_TypedProxyPushConsumer_Guard
 {
 public:
   /// Constructor
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index ac42bd0ca8b..7f0d3002bc8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -19,20 +19,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h"
 
 #include "CEC_TypedProxyPushConsumer.h"
 
 class TAO_CEC_TypedEventChannel;
 
 //Class TAO_CEC_TypedSupplierAdmin
-class  TAO_Event_Serv_Export TAO_CEC_TypedSupplierAdmin
+class  TAO_Event_Export TAO_CEC_TypedSupplierAdmin
   : public POA_CosTypedEventChannelAdmin::TypedSupplierAdmin
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am b/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am
new file mode 100644
index 00000000000..4e1ad8fc3fb
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am
@@ -0,0 +1,42 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's CosEvent Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_CosEvent.la
+
+libTAO_CosEvent_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_CosEvent_la_SOURCES = \
+        ConsumerAdmin_i.cpp \
+        EventChannel_i.cpp \
+        ProxyPushConsumer_i.cpp \
+        ProxyPushSupplier_i.cpp \
+        SupplierAdmin_i.cpp
+
+noinst_HEADERS = \
+        ConsumerAdmin_i.h \
+        EventChannel_i.h \
+        ProxyPushConsumer_i.h \
+        ProxyPushSupplier_i.h \
+        SupplierAdmin_i.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index 890cf8c78fc..476c061dc99 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosLifeCycle) : orbsvcslib, core, naming, portableserver {
+project(CosLifeCycle) : orbsvcslib, core, naming {
   sharedname   = TAO_CosLifeCycle
-  idlflags    += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h
+  idlflags    += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h
   dynamicflags = TAO_LIFECYCLE_BUILD_DLL
   tagchecks   += LifeCycle
   pch_header   =
@@ -22,7 +22,4 @@ project(CosLifeCycle) : orbsvcslib, core, naming, portableserver {
       LifeCycleServiceS.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index d84a404cbb4..4c8b075c744 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -1,11 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, iorinterceptor {
+project : orbsvcslib, core, naming, iormanip, portablegroup, ami {
   sharedname   = TAO_CosLoadBalancing
-  idlflags    += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h
+  idlflags    += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h
   dynamicflags = TAO_LOADBALANCING_BUILD_DLL
   tagchecks   += CosLoadBalancing
+  avoids      += minimum_corba
 
   IDL_Files {
     CosLoadBalancing.idl
@@ -45,7 +46,4 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba,
       LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index 9a79a63353b..86c088dc574 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,80 +1,28 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNaming) : orbsvcslib, core {
+project(CosNaming) : orbsvcslib, core, messaging, svc_utils, iortable {
   sharedname   = TAO_CosNaming
+  idlflags    += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h
   dynamicflags = TAO_NAMING_BUILD_DLL
-
-  idlflags    += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
-
-  IDL_Files {
-    CosNaming.idl
-  }
-
-  Source_Files {
-    CosNamingC.cpp
-    Naming/Naming_Client.cpp
-  }
-
-  Header_Files {
-    CosNamingC.h
-    Naming/Naming_Client.h
-  }
-
-  Inline_Files {
-    CosNamingC.inl
-  }
-
-  Template_Files {
-  }
- 
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files{
-    CosNaming.rc
-  }
-}
-
-
-project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver {
-  sharedname   = TAO_CosNaming_Skel
-  dynamicflags = TAO_NAMING_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CosNamingS.cpp
-  }
-
-  Header_Files {
-    CosNamingS.h
-  }
-
-  Inline_Files {
-    CosNamingS.inl
-  }
-
-  Template_Files {
-  }
-}
- 
-
-project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging, svc_utils, iortable {
-  sharedname   = TAO_CosNaming_Serv
-  dynamicflags = TAO_NAMING_SERV_BUILD_DLL
   tagchecks   += Naming
+  libs += TAO_Messaging
+  after += Messaging
 
   IDL_Files {
+    CosNaming.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
     Naming {
+      CosNamingC.cpp
+      CosNamingS.cpp
       Naming/Entries.cpp
       Naming/Flat_File_Persistence.cpp
       Naming/Hash_Naming_Context.cpp
       Naming/Naming_Context_Interface.cpp
       Naming/Naming_Loader.cpp
-      Naming/Naming_Server.cpp
+      Naming/Naming_Utils.cpp
       Naming/Persistent_Context_Index.cpp
       Naming/Persistent_Entries.cpp
       Naming/Persistent_Naming_Context.cpp
@@ -84,12 +32,8 @@ project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging, svc_utils, i
       Naming/Transient_Naming_Context.cpp
     }
   }
- 
+  
   Header_Files {
-    Naming/naming_export.h
-    Naming/Naming_Server.h
-  }
-
-  Template_Files {
+	Naming/naming_export.h
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index fc66a4e7789..da02aae1353 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,13 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNotification) : orbsvcslib, core, event {
+project(CosNotification) : orbsvcslib, core, svc_utils, etcl, dynamicany {
   sharedname   = TAO_CosNotification
-  dynamicflags = TAO_NOTIFY_BUILD_DLL
+  // Warning : The idlflags must match exactly those used in CosEvent, because
+  //           we don't know which project will actually generate the IDL.
+  //           For this reason we also just use the event_export.h and macros for
+  //           both services.
+  idlflags    += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h
 
-  idlflags    += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
+  // Set both DLL flags because of the shared idl files
+  dynamicflags = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL
+
+  tagchecks   += Notify
 
   IDL_Files {
+    CosEventComm.idl
+    CosEventChannelAdmin.idl
     CosNotification.idl
     CosNotifyComm.idl
     CosNotifyFilter.idl
@@ -16,96 +25,27 @@ project(CosNotification) : orbsvcslib, core, event {
     Event_Forwarder.idl
   }
 
-  Source_Files {
-    CosNotificationC.cpp
-    CosNotifyCommC.cpp
-    CosNotifyFilterC.cpp
-    CosNotifyChannelAdminC.cpp
-    NotifyExtC.cpp
-    Event_ForwarderC.cpp
-    Notify/Notify_Extensions.cpp
-  }
-
-  Header_Files {
-    CosNotificationC.h
-    CosNotifyCommC.h
-    CosNotifyFilterC.h
-    CosNotifyChannelAdminC.h
-    NotifyExtC.h
-    Event_ForwarderC.h
-    Notify/Notify_Extensions.h
-  }
-
-  Inline_Files {
-    CosNotificationC.inl
-    CosNotifyCommC.inl
-    CosNotifyFilterC.inl
-    CosNotifyChannelAdminC.inl
-    NotifyExtC.inl
-    Event_ForwarderC.inl
-  }
-
-  Template_Files {
-  }
- 
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files{
-    CosNotification.rc
-  }
-}
-
-
-project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, portableserver {
-  sharedname   = TAO_CosNotification_Skel
-  dynamicflags = TAO_NOTIFY_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CosNotificationS.cpp
-    CosNotifyCommS.cpp
-    CosNotifyFilterS.cpp
-    CosNotifyChannelAdminS.cpp
-    NotifyExtS.cpp
-    Event_ForwarderS.cpp
-  }
-
-  Header_Files {
-    CosNotificationS.h
-    CosNotifyCommS.h
-    CosNotifyFilterS.h
-    CosNotifyChannelAdminS.h
-    NotifyExtS.h
-    Event_ForwarderS.h
-  }
-
-  Inline_Files {
-    CosNotificationS.inl
-    CosNotifyCommS.inl
-    CosNotifyFilterS.inl
-    CosNotifyChannelAdminS.inl
-    NotifyExtS.inl
-    Event_ForwarderS.inl
-  }
-
-  Template_Files {
-  }
-}
-
-project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany, etcl {
-  sharedname   = TAO_CosNotification_Serv
-  dynamicflags = TAO_NOTIFY_SERV_BUILD_DLL
-  tagchecks   += Notify
-
-  IDL_Files {
-  }
-
   // The following could be simplified if RT stuff was
   // put into another subdirectory.
 
   Source_Files(ORBSVCS_COMPONENTS) {
     Notify {
+      CosEventCommC.cpp
+      CosEventCommS.cpp
+      CosEventChannelAdminC.cpp
+      CosEventChannelAdminS.cpp
+      CosNotificationC.cpp
+      CosNotificationS.cpp
+      CosNotifyCommC.cpp
+      CosNotifyCommS.cpp
+      CosNotifyFilterC.cpp
+      CosNotifyFilterS.cpp
+      CosNotifyChannelAdminC.cpp
+      CosNotifyChannelAdminS.cpp
+      NotifyExtC.cpp
+      NotifyExtS.cpp
+      Event_ForwarderC.cpp
+      Event_ForwarderS.cpp
       Notify/Admin.cpp
       Notify/AdminProperties.cpp
       Notify/Buffering_Strategy.cpp
@@ -138,6 +78,7 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany,
       Notify/Notify_Default_EMO_Factory.cpp
       Notify/Notify_Default_POA_Factory.cpp
       Notify/Notify_EventChannelFactory_i.cpp
+      Notify/Notify_Extensions.cpp
       Notify/Object.cpp
       Notify/Peer.cpp
       Notify/POA_Helper.cpp
@@ -176,7 +117,4 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany,
       Notify/Structured/StructuredPushSupplier.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl
index b792ae547ff..db0a937548b 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl
@@ -306,8 +306,6 @@ module CosNotifyChannelAdmin
       raises(CosEventChannelAdmin::AlreadyConnected);
   };
 
-#ifdef TAO_HAS_NOTIFY_PULL_INTERFACES
-
   /**
    * @interface ProxyPullSupplier
    *
@@ -535,7 +533,6 @@ module CosNotifyChannelAdmin
     void resume_connection()
       raises(ConnectionAlreadyActive, NotConnected);
   };
-#endif /* TAO_HAS_NOTIFY_PULL_INTERFACES */
 
   /**
    * @interface ProxyPushSupplier
diff --git a/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl b/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl
index e5787489790..ae841bf6106 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl
+++ b/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl
@@ -289,9 +289,7 @@ module CosNotifyComm
     void disconnect_sequence_push_consumer();
   };
 
-#ifdef TAO_HAS_NOTIFY_PULL_INTERFACES
-
-/**
+  /**
    * @interface SequencePullConsumer
    *
    * @brief Defines the interface used by pull-style consumers that
@@ -356,8 +354,6 @@ module CosNotifyComm
     void disconnect_sequence_pull_supplier();
   };
 
-#endif /* TAO_HAS_NOTIFY_PULL_INTERFACES */
-
   /**
    * @interface SequencePushSupplier
    *
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index fb763f50750..d452d9bbe33 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -3,7 +3,7 @@
 
 project(CosProperty) : orbsvcslib, core, portableserver {
   sharedname   = TAO_CosProperty
-  idlflags    += -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h
+  idlflags    += -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h
   dynamicflags = TAO_PROPERTY_BUILD_DLL
   tagchecks   += Property
   pch_header   =
@@ -20,7 +20,4 @@ project(CosProperty) : orbsvcslib, core, portableserver {
       Property
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index f2e902b1e3f..5ff59656a4f 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTime) : orbsvcslib, core, portableserver {
+project(CosTime) : orbsvcslib, core, naming {
   sharedname   = TAO_CosTime
-  idlflags    += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h
+  idlflags    += -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h
   dynamicflags = TAO_TIME_BUILD_DLL
   tagchecks   += Time
 
@@ -18,7 +18,4 @@ project(CosTime) : orbsvcslib, core, portableserver {
       Time
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 9965e4208f0..20e679e0ddb 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,95 +1,29 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTrading) : orbsvcslib, core {
+project(CosTrading) : orbsvcslib, core, dynamicany, svc_utils {
   sharedname   = TAO_CosTrading
+  idlflags    += -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h
   dynamicflags = TAO_TRADING_BUILD_DLL
-
-  idlflags    += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
-
-  IDL_Files {
-    CosTrading.idl
-    CosTradingRepos.idl
-    CosTradingDynamic.idl
-  }
-
-  Source_Files {
-    CosTradingC.cpp
-    CosTradingReposC.cpp
-    CosTradingDynamicC.cpp
-  }
-
-  Header_Files {
-    CosTradingC.h
-    CosTradingReposC.h
-    CosTradingDynamicC.h
-  }
-
-  Inline_Files {
-    CosTradingC.inl
-    CosTradingReposC.inl
-    CosTradingDynamicC.inl
-  }
-
-  Template_Files {
-  }
-
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files {
-    CosTrading.rc
-  }
-}
-
-
-project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
-  sharedname   = TAO_CosTrading_Skel
-  dynamicflags = TAO_TRADING_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CosTradingS.cpp
-    CosTradingReposS.cpp
-    CosTradingDynamicS.cpp
-  }
-
-  Header_Files {
-    CosTradingS.h
-    CosTradingReposS.h
-    CosTradingDynamicS.h
-  }
-
-  Inline_Files {
-    CosTradingS.inl
-    CosTradingReposS.inl
-    CosTradingDynamicS.inl
-  }
-
-  Template_Files {
-  }
-}
-
-
-project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils {
-  sharedname   = TAO_CosTrading_Serv
-  dynamicflags = TAO_TRADING_SERV_BUILD_DLL
   tagchecks   += Trader
   pch_header   =
   pch_source   =
 
   IDL_Files {
+    CosTrading.idl
+    CosTradingRepos.idl
+    CosTradingDynamic.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
     Trader {
+      CosTradingC.cpp
+      CosTradingS.cpp
+      CosTradingReposC.cpp
+      CosTradingReposS.cpp
+      CosTradingDynamicC.cpp
+      CosTradingDynamicS.cpp
       Trader
     }
   }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index caa107460b7..c1a703820bd 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -3,78 +3,24 @@
 
 project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
   sharedname   = TAO_DsEventLogAdmin
+  idlflags    += -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=Log/eventlog_export.h
   dynamicflags = TAO_EVENTLOG_BUILD_DLL
-
-  idlflags    += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
-
-  IDL_Files {
-    DsEventLogAdmin.idl
-  }
-
-  Source_Files {
-    DsEventLogAdminC.cpp
-  }
-
-  Header_Files {
-    DsEventLogAdminC.h
-  }
-
-  Inline_Files {
-    DsEventLogAdminC.inl
-  }
-
-  Template_Files {
-  }
-
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files {
-    DsEventLogAdmin.rc
-  }
-}
-
-project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_skel, event_skel, portableserver {
-  sharedname   = TAO_DsEventLogAdmin_Skel
-  dynamicflags = TAO_EVENTLOG_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DsEventLogAdminS.cpp
-  }
-
-  Header_Files {
-    DsEventLogAdminS.h
-  }
-
-  Inline_Files {
-    DsEventLogAdminS.inl
-  }
-
-  Template_Files {
-  }
-}
-
-project(DsEventLogAdmin_Serv) : orbsvcslib, core, dseventlogadmin_skel, dslogadmin_serv, event_serv {
-  sharedname   = TAO_DsEventLogAdmin_Serv
-  dynamicflags = TAO_EVENTLOG_SERV_BUILD_DLL
   tagchecks   += EventLog
+  pch_header   =
+  pch_source   =
 
   IDL_Files {
+    DsEventLogAdmin.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
     DsEventLogAdmin {
-      Log/EventLogConsumer.cpp
+      DsEventLogAdminC.cpp
+      DsEventLogAdminS.cpp
       Log/EventLogFactory_i.cpp
-      Log/EventLogNotification.cpp
       Log/EventLog_i.cpp
+      Log/EventLogConsumer.cpp
+      Log/EventLogNotification.cpp
     }
   }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index 7ebf84be185..6f147ab0a53 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -1,95 +1,35 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsLogAdmin) : orbsvcslib, core {
+project(DsLogAdmin) : orbsvcslib, core, etcl, naming, dynamicany {
   sharedname   = TAO_DsLogAdmin
+  idlflags    += -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h
   dynamicflags = TAO_LOG_BUILD_DLL
-
-  idlflags    += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
+  tagchecks   += Log
+  pch_header   =
+  pch_source   =
 
   IDL_Files {
     DsLogAdmin.idl
     DsLogNotification.idl
   }
 
-  Source_Files {
-    DsLogAdminC.cpp
-    DsLogNotificationC.cpp
-  }
-
-  Header_Files {
-    DsLogAdminC.h
-    DsLogNotificationC.h
-  }
-
-  Inline_Files {
-    DsLogAdminC.inl
-    DsLogNotificationC.inl
-  }
-
-  Template_Files {
-  }
-    
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files {
-    DsLogAdmin.rc
-  }
-}
-
-
-project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver {
-  sharedname   = TAO_DsLogAdmin_Skel
-  dynamicflags = TAO_LOG_SKEL_BUILD_DLL
-
-  IDL_Files {
-  } 
-
-  Source_Files {
-    DsLogAdminS.cpp
-    DsLogNotificationS.cpp
-  }
-
-  Header_Files {
-    DsLogAdminS.h
-    DsLogNotificationS.h
-  }
-
-  Inline_Files {
-    DsLogAdminS.inl
-    DsLogNotificationS.inl
-  }
-
-  Template_Files {
-  }
-}
-
-
-project(DsLogAdmin_Serv) : orbsvcslib, core, dslogadmin_skel, dynamicany, etcl, svc_utils {
-  sharedname   = TAO_DsLogAdmin_Serv
-  dynamicflags = TAO_LOG_SERV_BUILD_DLL
-  tagchecks   += Log
-
-  IDL_Files {
-  }
-
   Source_Files(ORBSVCS_COMPONENTS) {
     DsLogAdmin {
+      DsLogAdminC.cpp
+      DsLogAdminS.cpp
+      DsLogNotificationC.cpp
+      DsLogNotificationS.cpp
+      Log/PersistStore.cpp
+      Log/LogRecordStore.cpp
       Log/BasicLogFactory_i.cpp
-      Log/BasicLog_i.cpp
       Log/Iterator_i.cpp
+      Log/BasicLog_i.cpp
+      Log/Log_i.cpp
       Log/LogMgr_i.cpp
-      Log/LogNotification.cpp
-      Log/LogRecordStore.cpp
-      Log/Log_Constraint_Interpreter.cpp
       Log/Log_Constraint_Visitors.cpp
-      Log/Log_i.cpp
-      Log/PersistStore.cpp
+      Log/Log_Constraint_Interpreter.cpp
+      Log/LogNotification.cpp
     }
   }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index 4c0b1ad5ae5..dbf23ddfcc1 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -1,81 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification {
+project(DsNotifyLogAdmin) : orbsvcslib, core, dseventlogadmin, notification {
   sharedname   = TAO_DsNotifyLogAdmin
+  idlflags    += -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log/notifylog_export.h
   dynamicflags = TAO_NOTIFYLOG_BUILD_DLL
-
-  idlflags    += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
-
-  IDL_Files {
-    DsNotifyLogAdmin.idl
-  }
-
-  Source_Files {
-    DsNotifyLogAdminC.cpp
-  }
-
-  Header_Files {
-    DsNotifyLogAdminC.h
-  }
-
-  Inline_Files {
-    DsNotifyLogAdminC.inl
-  }
-
-  Template_Files {
-  }
-
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files {
-    DsNotifyLogAdmin.rc
-  }
-}
-
-project(DsNotifyLogAdmin_Skel) : orbsvcslib, core, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver {
-  sharedname   = TAO_DsNotifyLogAdmin_Skel
-  dynamicflags = TAO_NOTIFYLOG_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DsNotifyLogAdminS.cpp
-  }
-
-  Header_Files {
-    DsNotifyLogAdminS.h
-  }
-
-  Inline_Files {
-    DsNotifyLogAdminS.inl
-  }   
-
-  Template_Files {
-  }
-}
-
-
-project(DsNotifyLogAdmin_Serv) : orbsvcslib, core, dsnotifylogadmin_skel, dslogadmin_serv {
-  sharedname   = TAO_DsNotifyLogAdmin_Serv
-  dynamicflags = TAO_NOTIFYLOG_SERV_BUILD_DLL
   tagchecks   += Log
+  pch_header   =
+  pch_source   =
 
   IDL_Files {
+    DsNotifyLogAdmin.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
     DsNotifyLogAdmin {
-      Log/NotifyLogConsumer.cpp
+      DsNotifyLogAdminC.cpp
+      DsNotifyLogAdminS.cpp
       Log/NotifyLogFactory_i.cpp
-      Log/NotifyLogNotification.cpp
       Log/NotifyLog_i.cpp
+      Log/NotifyLogConsumer.cpp
+      Log/NotifyLogNotification.cpp
     }
   }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc
index 64d99791382..9d8b3841373 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL.mpc
+++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc
@@ -14,7 +14,4 @@ project(ETCL) : orbsvcslib, core {
   Source_Files {
     ETCL
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index 0e781c19364..6c49661a2b5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "ace/Sched_Params.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "Memory_Pools.h"
 
 #include "Dispatching_Modules.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index 03869de539b..459feed2c99 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -23,9 +23,9 @@
 
 #include "ace/Reactor_Notification_Strategy.h"
 #include "tao/Timeprobe.h"
-#include "orbsvcs/Event/ReactorTask.h"
-#include "orbsvcs/Event/Event_Manip.h"
-#include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/ReactorTask.h"
+#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
 
 // ************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index 6a3a4298e83..cc1ae3e6bd7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include /**/ "event_export.h"
-#include "orbsvcs/RtecUDPAdminC.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
index 533e6ba7391..eb356e86e3c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
@@ -13,7 +13,7 @@
 #include /**/ "ace/pre.h"
 
 #include /**/ "event_export.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 #include "EC_Lifetime_Utils.h"
 #include "ace/Auto_Ptr.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index 80c73e8db91..324a485eaf6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -21,7 +21,7 @@
 
 #include /**/ "event_export.h"
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 #include "tao/Environment.h"
 
 #include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index f8441511cf4..ee28910bbf3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -16,7 +16,7 @@
 
 #include /**/ "event_export.h"
 
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/INET_Addr.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 5c52c8e7b3c..80f6a1cd40f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_Mcast_EH.h"
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
 #include "ace/Unbounded_Set.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 25f55f68033..f62de40073a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -26,7 +26,7 @@
 #include "ace/Array_Base.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 #include /**/ "event_export.h"
 #include "ECG_Adapters.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index 773e41b0041..d76f722ade2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -9,7 +9,7 @@
 #include "ECG_Mcast_EH.h"
 #include "ECG_UDP_EH.h"
 
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index 5f7a01f5346..4d29843669b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -20,8 +20,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/ORB.h"
-#include "tao/PolicyC.h"
-
 
 #include "ace/Event_Handler.h"
 
@@ -68,9 +66,9 @@ public:
   /// Constructor.  It does not assume ownership of the @a event_channel
   /// parameter.
   TAO_ECG_Reactive_ConsumerEC_Control (const ACE_Time_Value &rate,
-                                       const ACE_Time_Value &timeout,
-                                       TAO_EC_Gateway_IIOP* gateway,
-                                       CORBA::ORB_ptr orb);
+                                                const ACE_Time_Value &timeout,
+                                                TAO_EC_Gateway_IIOP* gateway,
+                                                CORBA::ORB_ptr orb);
 
   /// Destructor.
   virtual ~TAO_ECG_Reactive_ConsumerEC_Control (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
index c24dacb2872..16a43c799d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
@@ -20,7 +20,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/ORB.h"
-#include "tao/PolicyC.h"
 
 #include "ace/Event_Handler.h"
 
@@ -72,9 +71,9 @@ public:
   /// Constructor.  It does not assume ownership of the @a event_channel
   /// parameter.
   TAO_ECG_Reconnect_ConsumerEC_Control (const ACE_Time_Value &rate,
-                                        const ACE_Time_Value &timeout,
-                                        TAO_EC_Gateway_IIOP* gateway,
-                                        CORBA::ORB_ptr orb);
+                                                const ACE_Time_Value &timeout,
+                                                TAO_EC_Gateway_IIOP* gateway,
+                                                CORBA::ORB_ptr orb);
 
   /// Destructor.
   virtual ~TAO_ECG_Reconnect_ConsumerEC_Control (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index 502b3a555d9..b71c9fbe8bf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -12,7 +12,7 @@
 #define TAO_ECG_SIMPLE_ADDRESS_SERVER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 #include "EC_Lifetime_Utils_T.h"
 #include "ace/INET_Addr.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index 434bbd649a7..79c24624b7e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -38,7 +38,7 @@ TAO_ECG_UDP_Out_Endpoint::is_loopback (const ACE_INET_Addr& from)
 
   if (this->ifs_ == 0)
     {
-      ACE::get_ip_interfaces (this->if_count_, this->ifs_);
+      ACE_Sock_Connect::get_ip_interfaces (this->if_count_, this->ifs_);
     }
 
   for (ACE_INET_Addr* i = this->ifs_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 0fdccc40c53..075682e983e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 #include "ace/SString.h"
 
 #if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 68090d4b7aa..8e142825d7a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -37,13 +37,13 @@
 #define TAO_ECG_UDP_RECEIVER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 #include /**/ "event_export.h"
 
 #include "ECG_Adapters.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index d111b4d8470..d25efcb56ca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -9,8 +9,8 @@
  *
  */
 
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 #include "tao/CDR.h"
 
 #if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 00b1a6181b2..ee872d01530 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -38,14 +38,14 @@
 #define TAO_ECG_UDP_SENDER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "event_export.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 #include "EC_Lifetime_Utils.h"
 #include "EC_Lifetime_Utils_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 7eb7b9fac4f..6bfc17ea60f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -15,8 +15,8 @@
 #include "EC_Reactive_SupplierControl.h"
 #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug
 
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index b1b7b1ca222..193b672ec46 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "EC_Basic_Filter_Builder.h"
 #include "EC_Type_Filter.h"
 #include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index d27e7203e8a..1b846220c81 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -4,9 +4,9 @@
 #include "EC_ProxySupplier.h"
 #include "EC_ProxyConsumer.h"
 #include "EC_Event_Channel_Base.h"
-#include "orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_ConsumerAdmin.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 60b5edadb24..909dad88229 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 61adaf515d7..9d33bbecd68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -19,13 +19,13 @@
 #include "EC_Reactive_ConsumerControl.h"
 #include "EC_Reactive_SupplierControl.h"
 
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
-#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Read.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
-#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
-#include "orbsvcs/ESF/ESF_Delayed_Command.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 853b7e04a93..a14c68925e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index dfbe23bfd05..d028e06a00d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 54ea96405e4..bae7d4eb094 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 113c5a7b1ad..067e33340cf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
 #include /**/ "event_export.h"
 #include "ace/Task.h"
 #include "ace/Message_Block.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 44d548e8693..dd0799e5752 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -27,7 +27,7 @@
 
 #include "EC_Defaults.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 template<class> class TAO_ESF_Worker;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index ac2f8c4988c..123a78382a0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index 33c8c9cfb7a..be40d293ce0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 8ef8d8c7ef0..a97cd55b4ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway.h"
 
 ACE_RCSID (Event, 
            EC_Gateway, 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index ff55b4ca46f..a8863961edb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -19,8 +19,8 @@
 
 #include /**/ "event_export.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 /**
  * @class TAO_EC_Gateway
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index 91e25f95e96..6202e72db2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
-#include "orbsvcs/Event/ECG_Defaults.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "EC_Gateway_IIOP_Factory.h"
 #include "ECG_ConsumerEC_Control.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 06f2d805dfa..058fc1b4696 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -22,9 +22,9 @@
 #include /**/ "event_export.h"
 #include "EC_Gateway.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
 
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index eb368de2dbb..8e4347a7bc7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
-#include "orbsvcs/Event/ECG_Defaults.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index cb8453bdef8..80835d4dde4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "EC_Gateway_Sched.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 ACE_RCSID (Event, 
            EC_Gateway_sched, 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index 3ab5e935271..c207596ae00 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -19,7 +19,7 @@
 #include /**/ "ace/pre.h"
 
 #include "EC_Gateway_IIOP.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "sched_event_export.h"
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index 2ad2a374996..b1a36867648 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -5,8 +5,8 @@
 #include "EC_ProxySupplier.h"
 #include "EC_QOS_Info.h"
 
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "tao/ORB_Constants.h"
 
 #include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
index ec54bc03226..abd145b2b3f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -25,7 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "rtkokyu_event_export.h"
 
 #include "ace/Thread_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index a40af3f6c2a..0dc7d4e18a0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -5,7 +5,7 @@
 #include "EC_Kokyu_Scheduling.h"
 #include "EC_Kokyu_Filter_Builder.h"
 #include "EC_Event_Channel_Base.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index 55d64cdb2c9..5c1cd2b04d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "rtkokyu_event_export.h"
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 5fce1a7cab8..fd9ebe4715b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "EC_Kokyu_Filter.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "EC_Kokyu_Filter_Builder.h"
 #include "EC_Type_Filter.h"
 #include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index 5eb6ef5dc35..f07a37c374c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "rtkokyu_event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
index 8efb85c2d98..39c2d42020b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -18,7 +18,7 @@
 #include /**/ "ace/pre.h"
 
 #include /**/ "event_export.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "tao/PortableServer/PortableServerC.h"
 #include "tao/ORB.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index e9df4b4298e..841bd6656c7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -14,8 +14,8 @@
 #include "EC_ConsumerControl.h"
 #include "EC_SupplierControl.h"
 #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 3149420a6f1..6b0af4e85dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -6,7 +6,7 @@
 #include "EC_ProxyConsumer.h"
 #include "EC_ConsumerAdmin.h"
 #include "EC_SupplierAdmin.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "ace/Auto_Ptr.h"
 
 #if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 5bca0bf2172..6d33cfea8c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +30,7 @@
 #include "ace/RB_Tree.h"
 #include "ace/Map_Manager.h"
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 1eb2794a909..e0add81915f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -7,9 +7,9 @@
 #include "EC_Scheduling_Strategy.h"
 #include "EC_QOS_Info.h"
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
 
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Per_Supplier_Filter.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index ed97744f809..8a3879662f4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "EC_Prefix_Filter_Builder.h"
 #include "EC_Type_Filter.h"
 #include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 53f7634ce00..ade0f194676 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -5,8 +5,8 @@
 #include "EC_Event_Channel_Base.h"
 #include "EC_QOS_Info.h"
 
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 
 #include "ace/Sched_Params.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index 717fad35865..b8156a664e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "sched_event_export.h"
 
 #include "ace/Thread_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index a8a1fee8960..45bed1bbf9c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "sched_event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 75718ee9895..82a0162f440 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -19,7 +19,7 @@
 
 #include /**/ "event_export.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index ea22992bf90..00d0b81e4a6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -8,8 +8,8 @@
 #include "EC_Scheduling_Strategy.h"
 #include "EC_ConsumerControl.h"
 #include "EC_SupplierAdmin.h"
-#include "orbsvcs/ESF/ESF_RefCount_Guard.h"
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
 #include "ace/Reverse_Lock_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 552383c96d9..590d5c61190 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 #include "EC_Filter.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
index dce214ba29d..559b3497f8b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
@@ -9,7 +9,7 @@
 #define EC_PROXY_DISCONNECTOR__H_
 
 #include /**/ "event_export.h"
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
 #include "ace/Auto_Functor.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index 0fbc4fe9290..25a37802392 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecBaseC.h"
+#include "orbsvcs/orbsvcs/RtecBaseC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 26f9df5c53a..06929bcf071 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -23,10 +23,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 #include "tao/ORB.h"
-#include "tao/PolicyC.h"
 
 #include "ace/Event_Handler.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index 6ae7fb8594c..f1885974944 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -19,14 +19,13 @@
 
 #include "EC_SupplierControl.h"
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/ORB.h"
-#include "tao/PolicyC.h"
 
 #include "ace/Event_Handler.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 0199dec1957..92a0da41ec3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -5,7 +5,7 @@
 #include "EC_Priority_Scheduling.h"
 #include "EC_Sched_Filter_Builder.h"
 #include "EC_Event_Channel_Base.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index c1093401be5..f556b0f1d8b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "sched_event_export.h"
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 6b2815e4897..5e153f1bcb1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "EC_Sched_Filter.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "EC_Sched_Filter_Builder.h"
 #include "EC_Type_Filter.h"
 #include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 29c94f4f892..b89992dcba1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -19,8 +19,8 @@
 
 #include /**/ "event_export.h"
 
-#include "orbsvcs/RtecBaseC.h"
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecBaseC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 39d04fec297..585fd0076e3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -4,9 +4,9 @@
 #include "EC_ProxyConsumer.h"
 #include "EC_ProxySupplier.h"
 #include "EC_Event_Channel_Base.h"
-#include "orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_SupplierAdmin.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 91572785bc2..47956d2f32c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index b4318075078..0d80ad03c9e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -17,8 +17,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index 88a25804797..534752a9eaf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index e4e812f95b9..dba117af1c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -4,8 +4,8 @@
 #include "EC_Timeout_Generator.h"
 #include "EC_Event_Channel_Base.h"
 #include "EC_ProxySupplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Timeout_Filter.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 4373aef1b62..fdbe46377ab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -2,7 +2,7 @@
 
 #include "EC_Timeout_Generator.h"
 #include "EC_Timeout_Filter.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Timeout_Generator.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index 37374a6f760..f037d3df588 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_UDP_Admin.h"
+#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h"
 
 ACE_RCSID (Event, 
            EC_UDP_Admin, 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 5cccfec538c..89588a49864 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -16,7 +16,7 @@
 #define TAO_EC_UDP_ADMIN_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 #include /**/ "event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 65bbe15ddd5..9360d98f57e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -2,15 +2,15 @@
 
 #include "ace/Service_Config.h"
 #include "ace/Auto_Ptr.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Event_Utilities.h"
-
-#include "orbsvcs/Event/Dispatching_Modules.h"
-#include "orbsvcs/Event/Memory_Pools.h"
-#include "orbsvcs/Event/EC_Gateway.h"
-#include "orbsvcs/Event/Module_Factory.h"
-#include "orbsvcs/Event/Event_Manip.h"
-#include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+
+#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h"
+#include "orbsvcs/orbsvcs/Event/Memory_Pools.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
 
 #if !defined (__ACE_INLINE__)
 #include "Event_Channel.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 30e0d418536..a6c4709a9c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -40,11 +40,11 @@
 
 #include "tao/Timeprobe.h"
 
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Event/Local_ESTypes.h"
-#include "orbsvcs/Event/Timer_Module.h"
-#include "orbsvcs/Event/ReactorTask.h"
-#include "orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Local_ESTypes.h"
+#include "orbsvcs/orbsvcs/Event/Timer_Module.h"
+#include "orbsvcs/orbsvcs/Event/ReactorTask.h"
+#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
 
 // ************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp
index 0d8e97cb479..de495fe73e4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp
@@ -8,7 +8,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
 
 #if !defined (__ACE_INLINE__)
 #include "Event_Manip.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
index b78511867b5..b087dc2ce4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
@@ -21,7 +21,7 @@
 #define TAO_EC_EVENT_MANIP_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
 #include "old_event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index 60d8ac8c459..a7490392d68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -22,14 +22,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event_Service_Constants.h"
-
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 #define ACE_DEFAULT_EVENT_CHANNEL_TYPE 0
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Makefile.am b/TAO/orbsvcs/orbsvcs/Event/Makefile.am
new file mode 100644
index 00000000000..1b362fdb7e9
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Event/Makefile.am
@@ -0,0 +1,163 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Event Channel library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Event.la
+
+libTAO_Event_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Event_la_SOURCES = \
+        BCU.cpp \
+        Dispatching_Modules.cpp \
+        EC_Basic_Factory.cpp \
+        EC_Basic_Filter_Builder.cpp \
+        EC_Busy_Lock.cpp \
+        EC_Command.cpp \
+        EC_Conjunction_Filter.cpp \
+        EC_ConsumerAdmin.cpp \
+        EC_Disjunction_Filter.cpp \
+        EC_Dispatching.cpp \
+        EC_Reactive_Dispatching.cpp \
+        EC_Event_Channel.cpp \
+        EC_Event_Channel_Base.cpp \
+        EC_Factory.cpp \
+        EC_Filter.cpp \
+        EC_Filter_Builder.cpp \
+        EC_Gateway.cpp \
+        EC_Gateway_UDP.cpp \
+        EC_UDP_Out_Endpoint.cpp \
+        ECG_Mcast_EH.cpp \
+        EC_Null_Factory.cpp \
+        EC_ObserverStrategy.cpp \
+        EC_Per_Supplier_Filter.cpp \
+        EC_ProxyConsumer.cpp \
+        EC_Default_ProxyConsumer.cpp \
+        EC_ProxyPushSupplier_Set.cpp \
+        EC_ProxyPushSupplier_Set_T.cpp \
+        EC_ProxySupplier.cpp \
+        EC_Default_ProxySupplier.cpp \
+        EC_QOS_Info.cpp \
+        EC_Reactive_Timeout_Generator.cpp \
+        EC_SupplierAdmin.cpp \
+        EC_SupplierFiltering.cpp \
+        EC_Timeout_Filter.cpp \
+        EC_Timeout_Generator.cpp \
+        EC_Type_Filter.cpp \
+        EC_UDP_Admin.cpp \
+        Event_Channel.cpp \
+        Event_Manip.cpp \
+        GPlot_File.cpp \
+        Local_ESTypes.cpp \
+        Memory_Pools.cpp \
+        Module_Factory.cpp \
+        RT_Task.cpp \
+        ReactorTask.cpp \
+        Timer_Module.cpp
+
+noinst_HEADERS = \
+        BCU.h \
+        Debug_Macros.h \
+        Dispatching_Modules.h \
+        Dispatching_Modules.i \
+        EC_Basic_Factory.h \
+        EC_Basic_Factory.i \
+        EC_Basic_Filter_Builder.h \
+        EC_Basic_Filter_Builder.i \
+        EC_Busy_Lock.h \
+        EC_Busy_Lock.i \
+        EC_Command.h \
+        EC_Command.i \
+        EC_Conjunction_Filter.h \
+        EC_Conjunction_Filter.i \
+        EC_ConsumerAdmin.h \
+        EC_ConsumerAdmin.i \
+        EC_Disjunction_Filter.h \
+        EC_Disjunction_Filter.i \
+        EC_Dispatching.h \
+        EC_Dispatching.i \
+        EC_Event_Channel.h \
+        EC_Event_Channel_Base.h \
+        EC_Event_Channel.i \
+        EC_Event_Channel_Base.i \
+        EC_Factory.h \
+        EC_Factory.i \
+        EC_Filter.h \
+        EC_Filter.i \
+        EC_Filter_Builder.h \
+        EC_Filter_Builder.i \
+        EC_Gateway.h \
+        EC_Gateway_UDP.h \
+        EC_Gateway_UDP.i \
+        EC_UDP_Out_Endpoint.h \
+        EC_UDP_Out_Endpoint.i \
+        EC_Null_Factory.h \
+        EC_Null_Factory.i \
+        EC_ObserverStrategy.h \
+        EC_ObserverStrategy.i \
+        EC_Per_Supplier_Filter.h \
+        EC_Per_Supplier_Filter.i \
+        EC_ProxyConsumer.h \
+        EC_ProxyConsumer.i \
+        EC_Default_ProxyConsumer.h \
+        EC_Default_ProxyConsumer.i \
+        EC_ProxyPushSupplier_Set.h \
+        EC_ProxyPushSupplier_Set.i \
+        EC_ProxyPushSupplier_Set_T.h \
+        EC_ProxyPushSupplier_Set_T.i \
+        EC_ProxySupplier.h \
+        EC_ProxySupplier.i \
+        EC_Default_ProxySupplier.h \
+        EC_Default_ProxySupplier.i \
+        EC_QOS_Info.h \
+        EC_QOS_Info.i \
+        EC_Reactive_Timeout_Generator.h \
+        EC_Reactive_Timeout_Generator.i \
+        EC_SupplierAdmin.h \
+        EC_SupplierAdmin.i \
+        EC_SupplierFiltering.h \
+        EC_SupplierFiltering.i \
+        EC_Timeout_Filter.h \
+        EC_Timeout_Filter.i \
+        EC_Timeout_Generator.h \
+        EC_Timeout_Generator.i \
+        EC_Type_Filter.h \
+        EC_Type_Filter.i \
+        EC_UDP_Admin.h \
+        Event_Channel.h \
+        Event_Channel.i \
+        Fast_Reactor.h \
+        GPlot_File.h \
+        GPlot_File.i \
+        Local_ESTypes.h \
+        Local_ESTypes.i \
+        Memory_Pools.h \
+        Memory_Pools.i \
+        Module_Factory.h \
+        RT_Task.h \
+        RT_Task.i \
+        ReactorTask.h \
+        Timer_Module.h \
+        Timer_Module.i
+
+EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
index 282d4786003..b35af5eb52f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/Dispatching_Modules.h"
-#include "orbsvcs/Event/Timer_Module.h"
-#include "orbsvcs/Event/Event_Channel.h"
-#include "orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h"
+#include "orbsvcs/orbsvcs/Event/Timer_Module.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index 951a933d70f..cc9677c430c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ace/Sched_Params.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 #include "RT_Task.h"
 #include "Debug_Macros.h"
 #include "Event_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
index 6bb34db4910..9cbf1d10a7e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
@@ -26,7 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "old_event_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
index 92451aa9c6e..ca449ff4800 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/High_Res_Timer.h"
 #include "tao/Timeprobe.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 
 #include "ReactorTask.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
index 6416bfa411e..de8d73e8625 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Functor.h"
 
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 #include "ReactorTask.h"
 #include "Timer_Module.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
index 2b93e920c66..e28f0cc74ea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
@@ -13,8 +13,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event/RT_Task.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/RT_Task.h"
 
 class ACE_Command_Base;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
index 075adda129a..2c97ce537d8 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 /// This is the number of events a consumer can subscribe to.
 const int ACE_ES_MAX_SUBSCRIPTIONS = 32;
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 3d45c411eaf..29b41b32d45 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Event_Utilities.i"
+#include "orbsvcs/orbsvcs/Event_Utilities.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (orbsvcs, 
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
index 9bc493d5ea3..30d432cbdf9 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
@@ -16,8 +16,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #include "Event/event_export.h"
 
@@ -244,7 +244,7 @@ private:
 
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event_Utilities.i"
+#include "orbsvcs/orbsvcs/Event_Utilities.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index 895e3355141..67ffb9aa245 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -12,7 +12,7 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba
   }
 
   IDL_Files {
-    idlflags += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h
+    idlflags += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h
     FT_CORBA_ORB.idl
   }
 
@@ -24,9 +24,6 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba
       FaultTolerance/FT_IOGR_Property.cpp
     }
   }
-
-  Template_Files {
-  }
 }
 
 project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup {
@@ -52,9 +49,6 @@ project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup {
        FaultTolerance/FT_Service_Callbacks.cpp
     }
   }
-
-  Template_Files {
-  }
 }
 
 project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup {
@@ -76,7 +70,4 @@ project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup {
        FaultTolerance/FT_ServerService_Activate.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl
index 3290d1f2225..fd253ce9fec 100644
--- a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl
+++ b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl
@@ -13,9 +13,9 @@
 #ifndef TAO_FTRT_GROUPMANAGER_IDL
 #define TAO_FTRT_GROUPMANAGER_IDL
 
-#include "orbsvcs/RtecEventChannelAdmin.idl"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl"
 #include "orb.idl"
-#include "orbsvcs/CosNaming.idl"
+#include "orbsvcs/orbsvcs/CosNaming.idl"
 #include "FTRT.idl"
 
 module FTRT
diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
index e9529e48959..64c0009937c 100644
--- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
@@ -11,18 +11,18 @@
 //  FT_Replica.idl
 
 // The next include is TAO specific.
-#include "orbsvcs/FT_CORBA_ORB.idl"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl"
 
 #define FT_USES_PORTABLE_GROUP
 
 #ifdef FT_USES_PORTABLE_GROUP
 # include "orbsvcs/orbsvcs/PortableGroup.idl"
 #else // FT_USES_PORTABLE_GROUP
-#include "orbsvcs/CosNaming.idl" // 98-10-19.idl
+#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl
 #endif // FT_USES_PORTABLE_GROUP
 
-#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl
-#include "orbsvcs/CosNotifyFilter.idl"
+#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl
+#include "orbsvcs/orbsvcs/CosNotifyFilter.idl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl
index b783eb46ace..194b6183e5f 100644
--- a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl
@@ -22,9 +22,9 @@
 
 #pragma prefix "omg.org"
 
-#include "orbsvcs/FT_CORBA.idl"
-#include "orbsvcs/FT_Replica.idl"
-#include "orbsvcs/PortableGroup.idl"
+#include "orbsvcs/orbsvcs/FT_CORBA.idl"
+#include "orbsvcs/orbsvcs/FT_Replica.idl"
+#include "orbsvcs/orbsvcs/PortableGroup.idl"
 
 module FT
 {
diff --git a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl
index bb1d839f388..de0e071b58a 100644
--- a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl
@@ -17,16 +17,16 @@
 
 ///////////////////////////////
 // TAO specific includes
-#include "orbsvcs/FT_CORBA_ORB.idl"
-#include "orbsvcs/FT_Replica.idl"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl"
+#include "orbsvcs/orbsvcs/FT_Replica.idl"
 // end of TAO specific includes
 ///////////////////////////////
 
-#include "orbsvcs/CosNaming.idl" // 98-10-19.idl
-#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl
+#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl
+#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl
 
 // added to OMG version:
-#include "orbsvcs/CosNotifyFilter.idl"
+#include "orbsvcs/orbsvcs/CosNotifyFilter.idl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl
index 8f36d6b135a..73d47a48b52 100644
--- a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl
@@ -15,10 +15,10 @@
 #ifndef _FT_REPLICATION_MANAGER_IDL_
 #define _FT_REPLICATION_MANAGER_IDL_
 
-#include "orbsvcs/PortableGroup.idl"
-#include "orbsvcs/FT_CORBA.idl"
-#include "orbsvcs/FT_Replica.idl"
-#include "orbsvcs/FT_Notifier.idl"
+#include "orbsvcs/orbsvcs/PortableGroup.idl"
+#include "orbsvcs/orbsvcs/FT_CORBA.idl"
+#include "orbsvcs/orbsvcs/FT_Replica.idl"
+#include "orbsvcs/orbsvcs/FT_Notifier.idl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index 48d2ca9189c..1b34fde8571 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -1,11 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup, minimum_corba {
+project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup {
   sharedname   = TAO_FaultTolerance
-  idlflags    += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
+  idlflags    += -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_BUILD_DLL
   tagchecks   += FaultTolerance
+  avoids      += minimum_corba
 
   IDL_Files {
     FT_CORBA.idl
@@ -30,7 +31,4 @@ project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup, m
       FT_ReplicationManagerC.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog b/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog
index b96cc14f6bc..aea5194b472 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog
@@ -1,10 +1,3 @@
-Fri Sep  3 13:57:11 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-	* FT_Endpoint_Selector_Factory.cpp:
-
-  	  Include "tao/SystemException.h" instead of "tao/Exception.h" to
-	  pull CORBA::SystemException class declaration.
-
 Thu Aug 28 07:37:49 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* FT_Invocation_Endpoint_Selectors.cpp:
@@ -14,8 +7,8 @@ Thu Aug 28 07:37:49 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 Thu Jul 10 11:20:52 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* orbsvcs/orbsvcs/Makefile.FaulTolerance: Added new files.
-
-	* orbsvcs/orbsvcs/FT_CORBA_ORB.idl: Make the IDL spec compatible.
+	
+	* orbsvcs/orbsvcs/FT_CORBA_ORB.idl: Make the IDL spec compatible. 
 
 Thu Jul 10 11:09:25 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
@@ -29,14 +22,14 @@ Thu Jul 10 11:09:25 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 	* orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp:
 	* orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h: Register the
 	  server side and client side interceptors through the
-	  initializer.
+	  initializer. 
 
 	* orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp:
 	* orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h: The latest specs
 	  changed the attribute in FTRequestDurationPolicy from
 	  request_duration_policy to
 	  request_duration_policy_value. Changed the accesor to match the
-	  IDL file.
+	  IDL file. 
 
 	* orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
 	* orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h: Removed
@@ -55,3 +48,5 @@ Thu Jul 10 11:09:25 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 
 	* tao/PortableServer/ServantBase.cpp: The effect of the above change.
+	
+
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index c59cd08d228..a02b8ba4a14 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -5,7 +5,7 @@
 #include "FT_ClientORBInitializer.h"
 #include "FT_ClientPolicyFactory.h"
 #include "FT_ClientRequest_Interceptor.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Constants.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 7da3391fdd8..1f86d5f03dc 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -4,7 +4,7 @@
 
 #include "FT_ClientPolicyFactory.h"
 #include "FT_ClientPolicy_i.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/PolicyC.h"
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index f9e93824f1c..48a3e1bdea8 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -14,7 +14,7 @@
 #define TAO_FT_CLIENTPOLICY_I_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 719ae0c489d..e61ed2037e8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "FT_ClientRequest_Interceptor.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 
 #include "tao/CORBA_String.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index bd37bc897c2..12aa20f5d9f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -2,14 +2,10 @@
 
 #include "FT_Endpoint_Selector_Factory.h"
 #include "FT_Invocation_Endpoint_Selectors.h"
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 #include "tao/Environment.h"
 
-
-ACE_RCSID (FaultTolerance,
-           FT_Endpoint_Selector_Factory,
-           "$Id$")
-
+ACE_RCSID(FaultTolerance, FT_Endpoint_Selector_Factory, "$Id$")
 
 TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void)
   :ft_endpoint_selector_ (0)
@@ -40,7 +36,6 @@ TAO_FT_Endpoint_Selector_Factory::get_selector (
           ACE_NEW_THROW_EX (ft_endpoint_selector_,
                             TAO_FT_Invocation_Endpoint_Selector (),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index 94d4b522b89..a80b43b1978 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -24,7 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/IORManipulation/IORManip_Loader.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/IOPC.h"
 #include "FT_ORB_Utils_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 728f608a449..fd8e7e29908 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -6,7 +6,7 @@
 #include "FT_ServerPolicyFactory.h"
 #include "FT_ServerRequest_Interceptor.h"
 #include "tao/ORB_Constants.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index e06536ee5f6..126a9b4d1b0 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -4,7 +4,7 @@
 
 #include "FT_ServerPolicyFactory.h"
 #include "FT_ServerPolicy_i.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/PolicyC.h"
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index c2fcc4cab2a..5441291f6fc 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -14,7 +14,7 @@
 #define TAO_FT_SERVERPOLICY_I_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 07785dbf0f1..95703574f92 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -6,7 +6,7 @@
 #include "tao/DynamicC.h"
 #include "tao/Typecode.h"
 #include "tao/CDR.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index b4f496ea24f..8d6d3873e53 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -21,7 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Service_Callbacks.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 
 class TAO_Profile;
 class TAO_MProfile;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index 4b2c6020f5c..693d2fb5c50 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -1,10 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming, minimum_corba {
+project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming {
   sharedname   = TAO_FtRtEvent
+  avoids      += minimum_corba
 
-  idlflags     += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
+  idlflags     += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h
   dynamicflags = TAO_FTRTEVENT_BUILD_DLL
   tagchecks    = FtRtEvent
 
@@ -32,9 +33,6 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming, minimum_cor
       FtRtEvent/Utils
     }
   }
-
-  Template_Files {
-  }
 }
 
 project (FTRT_ClientORB) :  messaging, orbsvcslib, core {
@@ -51,20 +49,15 @@ project (FTRT_ClientORB) :  messaging, orbsvcslib, core {
       FtRtEvent/ClientORB
     }
   }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
 }
 
-project (FTRT_EventChannel) :  orbsvcslib, core, ftrtevent, utils, corba_messaging {
+project (FTRT_EventChannel) :  orbsvcslib, ftrtevent, utils {
   sharedname   = TAO_FTRT_EventChannel
   dynamicflags = TAO_FTRTEC_BUILD_DLL
   tagchecks    = FTRT_EventChannel
   includes    += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel
   after       += FTORB_Utils
+  requires    += corba_messaging
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
index 07caec84c43..d385490ef76 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
@@ -15,7 +15,7 @@
 
 #include "UpdateableHandler.h"
 #include "Replication_Strategy.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
index 5cb5792d3c1..055b3ea22cc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
@@ -15,7 +15,7 @@
 
 #include "ace/Task.h"
 #include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/FTRT_GroupManagerC.h"
+#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h"
 #include "Replication_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index fa2c3cf0dbd..bc27837b85d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "FTEC_ConsumerAdmin.h"
 #include "FTEC_ProxySupplier.h"
 #include "ProxySupplierStateWorker.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
index 267162a8b4b..78cd609596a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
@@ -17,7 +17,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
 #include "FT_ProxyAdmin_T.h"
 #include "ProxySupplierStateWorker.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index ff7d20f47ff..961289f2e6e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -13,7 +13,7 @@
 #define FTEC_EVENT_CHANNEL_H
 
 #include "ftrtec_export.h"
-#include "orbsvcs/FtRtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index 5c9c7f79053..d452581b1bd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -11,7 +11,7 @@
 #include "IOGR_Maker.h"
 #include "Replication_Service.h"
 #include "../Utils/Safe_InputCDR.h"
-#include "orbsvcs/FtRtecEventCommC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventCommC.h"
 
 
 ACE_RCSID (EventChannel,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index 4ddb93d6450..2f021715f21 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -13,8 +13,8 @@
 #define TAO_FTEC_EVENT_CHANNEL_H
 
 #include "ace/Synch_T.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "FTEC_Factory.h"
 #include "FTEC_Group_Manager.h"
 #include "IOGR_Maker.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
index b46188a9458..f49851fc591 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
 #include "FTEC_Event_Channel.h"
 #include "FTEC_Factory.h"
 #include "FTEC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
index d253716dba1..f66743e06b8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
@@ -12,7 +12,7 @@
 #ifndef FTEC_FACTORY_H
 #define FTEC_FACTORY_H
 
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
index f2720fa1393..e41fc061fe2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
@@ -13,7 +13,7 @@
 #ifndef TAO_FTEC_GROUP_MANAGER_H
 #define TAO_FTEC_GROUP_MANAGER_H
 
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "FTEC_Fault_Listener.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index 0522671688a..71555d8e463 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -12,9 +12,9 @@
 #ifndef TAO_FTEC_PROXYCONSUMER_H
 #define TAO_FTEC_PROXYCONSUMER_H
 
-#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h"
 #include "ace/SString.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "Request_Context_Repository.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
index a1ca15aeaff..00214efb221 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -12,9 +12,9 @@
 
 #ifndef TAO_FTEC_PROXYSUPPLIER_H
 #define TAO_FTEC_PROXYSUPPLIER_H
-#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h"
 #include "ace/SString.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "Request_Context_Repository.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index b67a0fe6a3a..c78245ef4d0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "FTEC_SupplierAdmin.h"
 #include "FTEC_ProxyConsumer.h"
 #include "tao/Stub.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
index 9bbdca262ed..86cabee49b7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h"
 
 class TAO_FTEC_Event_Channel_Impl;
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
index 01d02f86e00..a3b2cb066fd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
@@ -15,7 +15,7 @@
 #include /**/ "ace/pre.h"
 #include "tao/corba.h"
 #include "tao/PortableServer/Servant_Base.h"
-#include "orbsvcs/FtRtecEventCommC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventCommC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
index 10d93e3705d..bdee43cd7a7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
@@ -16,7 +16,7 @@
 #include "ace/Task.h"
 #include "ace/Reactor.h"
 
-#include "orbsvcs/FTRT_GroupManagerC.h"
+#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index f228a360c5f..b0fcba2ef7c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -11,7 +11,7 @@
 #include "tao/Object_KeyC.h"
 #include "tao/ORB_Constants.h"
 
-#include "orbsvcs/FTRTC.h"
+#include "orbsvcs/orbsvcs/FTRTC.h"
 
 ACE_RCSID (EventChannel,
            ForwardCtrlServerInterceptor,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index ce5ea538e26..3b3a0efc522 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "FtEventServiceInterceptor.h"
 #include "Request_Context_Repository.h"
 #include "../Utils/Safe_InputCDR.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 4607ee70075..2c58dcad192 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -16,7 +16,7 @@
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 #include "tao/ORB.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index 574a89bf1c8..f7eddb4ff98 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -13,7 +13,7 @@
 #ifndef GROUPINFOPUBLISHER_H
 #define GROUPINFOPUBLISHER_H
 
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "tao/PortableServer/PortableServerC.h"
 #include "ace/Vector_T.h"
 #include "ace/Singleton.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index 03ff6faf180..2b474626ac6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include "../Utils/resolve_init.h"
 #include "../Utils/Safe_InputCDR.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "GroupInfoPublisher.h"
 
 ACE_RCSID (EventChannel,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
index 99619a369d3..a34c696e523 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
@@ -13,7 +13,7 @@
 #ifndef IOGR_MAKER_H
 #define IOGR_MAKER_H
 
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/IORManipulation/IORManipulation.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
index 0fb06766859..d5c4578016e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
@@ -14,9 +14,9 @@
 #define IDENTIFICATION_SERVICE_H
 
 #include "ace/Service_Object.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/FTRTC.h"
-#include "orbsvcs/FtRtecEventCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/FTRTC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventCommC.h"
 #include "ftrtec_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index 8b5b14f8acd..fce0d28a993 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -12,7 +12,7 @@
 #ifndef OBJECTGROUPMANAGERHANDLER_H
 #define OBJECTGROUPMANAGERHANDLER_H
 
-#include "orbsvcs/FTRT_GroupManagerS.h"
+#include "orbsvcs/orbsvcs/FTRT_GroupManagerS.h"
 #include "ace/Auto_Event.h"
 
 class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
index 7869ab38378..a9c60538ae2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "ProxyConsumerStateWorker.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
 
 ACE_RCSID (EventChannel,
            ProxyConsumerStateWorker,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
index 772fd16538e..1de276bb2c6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
@@ -13,8 +13,8 @@
 #ifndef PROXYCONSUMERSTATEWORKER_H
 #define PROXYCONSUMERSTATEWORKER_H
 
-#include "orbsvcs/Event/EC_SupplierAdmin.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 #include "FTEC_ProxyConsumer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
index cb455699293..0a0e2d732a0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "ProxySupplierStateWorker.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h"
 
 ACE_RCSID (EventChannel,
            ProxySupplierStateWorker,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
index aa6681719de..01158edeb08 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
@@ -13,8 +13,8 @@
 #ifndef PROXYSUPPLIERSTATEWORKER_H
 #define PROXYSUPPLIERSTATEWORKER_H
 
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 #include "FTEC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index 24615e80cc4..cc204aca9a3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -13,7 +13,7 @@
 #ifndef REPLCATION_SERVICE_H
 #define REPLCATION_SERVICE_H
 
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "FTEC_Become_Primary_Listener.h"
 #include "tao/PortableInterceptorC.h"
 #include "ace/Service_Object.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
index 7ed955e2d11..40a4eee3bc5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -12,7 +12,7 @@
 
 #ifndef REPLICATION_STRATEGY_H
 #define REPLICATION_STRATEGY_H
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "tao/PortableInterceptorC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
index 158b43ea297..f8aa835afa9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
@@ -13,7 +13,7 @@
 #ifndef REQUEST_CONTEXT_REPOSITORY_H
 #define REQUEST_CONTEXT_REPOSITORY_H
 
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "tao/PortableInterceptorC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 1a890399027..0fd88f14e61 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/CDR.h"
 #include "Set_Update_Interceptor.h"
-#include "orbsvcs/FTRTC.h"
+#include "orbsvcs/orbsvcs/FTRTC.h"
 #include "Request_Context_Repository.h"
 
 ACE_RCSID (EventChannel,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
index a1ba493264f..07f61e9e461 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
@@ -12,7 +12,7 @@
 
 #ifndef UPDATEABLEHANDLER_H
 #define UPDATEABLEHANDLER_H
-#include "orbsvcs/FTRTS.h"
+#include "orbsvcs/orbsvcs/FTRTS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index f68d1cdcde8..38c23229766 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -2,7 +2,7 @@
 #include "activate_with_id.h"
 #include "UUID.h"
 #include "resolve_init.h"
-#include "orbsvcs/FtRtecEventCommS.h"
+#include "orbsvcs/orbsvcs/FtRtecEventCommS.h"
 #include "tao/ORB_Core.h"
 
 ACE_RCSID (Utils,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
index 9cafa79f8f8..bc4a9139dfc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -13,8 +13,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 namespace TAO_FTRTEC
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl
index 866640ef114..234f59d2480 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl
@@ -13,7 +13,7 @@
 #ifndef TAO_FTRTEC_EVENTCHANNELADMIN_IDL
 #define TAO_FTRTEC_EVENTCHANNELADMIN_IDL
 
-#include "orbsvcs/RtecEventChannelAdmin.idl"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl"
 #include "FTRT.idl"
 #include "FTRT_GroupManager.idl"
 #include "FtRtecEventComm.idl"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl
index a1406158952..6d44c9ba90b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl
+++ b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl
@@ -13,7 +13,7 @@
 #ifndef FTRTECEVNETCOMM_H
 #define FTRTECEVNETCOMM_H
 
-#include "orbsvcs/RtecEventComm.idl"
+#include "orbsvcs/orbsvcs/RtecEventComm.idl"
 
 module FtRtecEventComm {
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc
index 2cd7439e464..dbc1d9dd9e5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -14,7 +14,4 @@ project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, mi
       IFRService
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index b98aa19dc88..be0914d8d92 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -143,8 +143,7 @@ TAO_Contained_i::id_i (const char *id
        == 0)
     {
       // Repository id already exists.
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, 
-                                   CORBA::COMPLETED_NO));
+      ACE_THROW (CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO));
     }
 
   // Get the old id.
@@ -249,8 +248,7 @@ TAO_Contained_i::name_i (const char *name
 
   if (exists)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
-                                   CORBA::COMPLETED_NO));
+      ACE_THROW (CORBA::BAD_PARAM (3, CORBA::COMPLETED_NO));
     }
 
   // Reset the local name.
@@ -534,7 +532,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
     {
       if (my_repo.in () != new_container)
         {
-          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, 
+          ACE_THROW (CORBA::BAD_PARAM (4, 
                                        CORBA::COMPLETED_NO));
         }
 
@@ -560,8 +558,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
 
       if (my_repo.in () != your_repo.in ())
         {
-          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                       CORBA::COMPLETED_NO));
+          ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO));
         }
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
@@ -872,8 +869,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                           CORBA::COMPLETED_NO));
+              ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO));
             }
         }
         case CORBA::dk_Operation:
@@ -937,8 +933,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                           CORBA::COMPLETED_NO));
+              ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO));
             }
         }
         case CORBA::dk_Value:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index ff57fd226d8..03e213e0989 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -2590,7 +2590,7 @@ TAO_Container_i::create_value_common (
                 }
               else
                 {
-                  ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 12,
+                  ACE_THROW_RETURN (CORBA::BAD_PARAM (12,
                                                       CORBA::COMPLETED_NO),
                                     path);
                 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 547f64f983b..4a3b9f3067d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -332,7 +332,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
           if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY 
               && kind != CORBA::tk_void)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
+              ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
                                                   CORBA::COMPLETED_NO),
                                 0);
             }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index e5dffde6134..f4aa04e4953 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -4,10 +4,10 @@
 #include "IDLType_i.h"
 #include "Container_i.h"
 #include "Contained_i.h"
-#include "orbsvcs/IFRService/ComponentRepository_i.h"
-#include "orbsvcs/IFRService/Options.h"
-#include "orbsvcs/IFRService/IFR_ComponentsS.h"
-#include "orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h"
+#include "orbsvcs/orbsvcs/IFRService/Options.h"
+#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
 #include "tao/IORTable/IORTable.h"
 #include "tao/ORB_Core.h"
 #include "tao/default_ports.h"
@@ -576,7 +576,7 @@ TAO_IFR_Service_Utils::valid_container (
 
   if (error_flag == 1)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
+      ACE_THROW (CORBA::BAD_PARAM (4,
                                    CORBA::COMPLETED_NO));
     }
 }
@@ -616,7 +616,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id,
                                          holder)
        == 0)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2,
+      ACE_THROW (CORBA::BAD_PARAM (2,
                                    CORBA::COMPLETED_NO));
     }
 }
@@ -663,7 +663,7 @@ TAO_IFR_Service_Utils::name_exists (
 
           if ((*checker) (member_name.fast_rep ()) != 0)
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
+              ACE_THROW (CORBA::BAD_PARAM (3,
                                            CORBA::COMPLETED_NO));
             }
         }
@@ -808,7 +808,7 @@ TAO_IFR_Service_Utils::check_subsection (
 
       if ((*checker) (entry_name.fast_rep ()) != 0)
         {
-          ACE_THROW (CORBA::BAD_PARAM (3,
+          ACE_THROW (CORBA::BAD_PARAM (5,
                                        CORBA::COMPLETED_NO));
           return;
         }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index 7e313b4f5e8..6b16fabefcf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -281,7 +281,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
 
           if (def_kind != CORBA::dk_AbstractInterface)
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 11,
+              ACE_THROW (CORBA::BAD_PARAM (11,
                                            CORBA::COMPLETED_NO));
             }
         }
@@ -763,7 +763,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   // Oneway operations cannot have a non-void return type.
   if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
                                           CORBA::COMPLETED_NO),
                         CORBA::OperationDef::_nil ());
     }
@@ -838,7 +838,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
       // Oneway operations cannot throw any user exceptions.
       if (mode == CORBA::OP_ONEWAY)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
+          ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
                                               CORBA::COMPLETED_NO),
                             CORBA::OperationDef::_nil ());
         }
@@ -1250,7 +1250,7 @@ TAO_InterfaceDef_i::check_inherited (const char *name,
 
       if (inherited_name == name)
         {
-          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 5,
+          ACE_THROW (CORBA::BAD_PARAM (5,
                                        CORBA::COMPLETED_NO));
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index 542d0f31a68..f97acafd52f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -38,8 +38,7 @@ void
 TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+  ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
 }
 
 CORBA::TypeCode_ptr
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index c57bd56ef5e..f46dc8889ab 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -49,8 +49,7 @@ void
 TAO_Repository_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+  ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
 }
 
 CORBA::Contained_ptr
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index 719a56c6e52..c5cf819239f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -270,7 +270,7 @@ TAO_ValueDef_i::supported_interfaces_i (
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 12,
+              ACE_THROW (CORBA::BAD_PARAM (12,
                                            CORBA::COMPLETED_NO));
               return;
             }
@@ -1027,7 +1027,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
           if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY 
               && kind != CORBA::tk_void)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
+              ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
                                                   CORBA::COMPLETED_NO),
                                 0);
             }
@@ -1647,7 +1647,7 @@ TAO_ValueDef_i::create_operation_i (
   // Oneway operations cannot have a non-void return type.
   if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
                                           CORBA::COMPLETED_NO),
                         CORBA::OperationDef::_nil ());
     }
@@ -1684,7 +1684,7 @@ TAO_ValueDef_i::create_operation_i (
           // Oneway operations cannot have INOUT or OUT parameters.
           if (mode == CORBA::OP_ONEWAY && params[i].mode != CORBA::PARAM_IN)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
+              ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
                                                   CORBA::COMPLETED_NO),
                                 CORBA::OperationDef::_nil ());
             }
@@ -1722,7 +1722,7 @@ TAO_ValueDef_i::create_operation_i (
       // Oneway operations cannot throw any user exceptions.
       if (mode == CORBA::OP_ONEWAY)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
+          ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
                                               CORBA::COMPLETED_NO),
                             CORBA::OperationDef::_nil ());
         }
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 9d4e1856309..36f93806e53 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -41,10 +41,7 @@ TAO_IOR_Multicast::TAO_IOR_Multicast (const char *ior,
 
 TAO_IOR_Multicast::~TAO_IOR_Multicast (void)
 {
-  if (this->mcast_dgram_.leave (this->mcast_addr_) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "%p\n", "leave"));
-    }
+  this->mcast_dgram_.leave (this->mcast_addr_);
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index 863106d7487..9d26c3665cb 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -23,7 +23,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/svc_utils_export.h"
+#include "orbsvcs/orbsvcs/svc_utils_export.h"
 #include "tao/ORB.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index 3032e0d46e6..a7c6b501515 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -4,11 +4,10 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
-#include "ace/os_include/sys/os_pstat.h"
-#include "ace/os_include/sys/os_loadavg.h"
-#if defined(__NetBSD__)
-#include <sys/sysctl.h>
-#endif
+
+#if defined (ACE_HAS_SYS_LOADAVG_H)
+# include <sys/loadavg.h>
+#endif /* ACE_HAS_SYS_LOADAVG_H */
 
 ACE_RCSID (LoadBalancing,
            LB_CPU_Load_Average_Monitor,
@@ -162,33 +161,6 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
   else
     ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);  // Correct exception?
 
-#elif defined (__NetBSD__)
-
-  double loadavg[1];
-
-  const int samples = ::getloadavg (loadavg, 1);
-
-  if (samples == 1)
-    {
-      int mib[2], num_processors;
-      size_t len;
-
-      mib[0] = CTL_HW;
-      mib[1] = HW_NCPU;
-      len = sizeof(num_processors);
-
-      sysctl(mib, 2, &num_processors, &len, NULL, 0);
-
-      ACE_ASSERT (num_processors > 0);
-
-      if (num_processors > 0)
-        load = loadavg[0] / num_processors;
-      else
-        ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);  // Correct exception?
-    }
-  else
-    ACE_THROW_RETURN (CORBA::TRANSIENT (), 0);  // Correct exception?
-
 #elif defined (hpux)
 
   struct pst_dynamic psd;
@@ -209,7 +181,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif
 
-#if defined (WINDOWS) || defined (linux) || defined (sun) || defined (hpux) || defined(__NetBSD__)
+#if defined (WINDOWS) || defined (linux) || defined (sun) || defined (hpux)
 
   CosLoadBalancing::LoadList * tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -235,6 +207,6 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (load);
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 
-#endif  /* WINDOWS || linux || sun || hpux  || __NetBSD__ */
+#endif  /* WINDOWS || linux || sun || hpux */
 
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
index ce0e3b6e62c..d680e65932a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -16,13 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index ec895f1af36..e639d21a88b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -4,7 +4,10 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
-#include "ace/os_include/sys/os_loadavg.h"
+
+#if defined (ACE_HAS_SYS_LOADAVG_H)
+# include <sys/loadavg.h>
+#endif /* ACE_HAS_SYS_LOADAVG_H */
 
 ACE_RCSID (LoadBalancing,
            LB_CPU_Utilization_Monitor,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index 6ad66ee8ada..fab93d1af5f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -17,13 +17,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index 4d960d74884..224294591bc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/LB_ORTC.h"
+#include "orbsvcs/orbsvcs/LB_ORTC.h"
 
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index fd3240d0bcd..374198c8aac 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -1,6 +1,6 @@
 #include "LB_ClientRequestInterceptor.h"
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 
 ACE_RCSID (LoadBalancing,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
index 0f290d8412b..166d3037734 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/LB_ORTC.h"
+#include "orbsvcs/orbsvcs/LB_ORTC.h"
 
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 7252318027a..537a3dcbdaf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 #include "tao/LocalObject.h"
 #include "tao/IORInterceptor/IORInterceptorC.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 11c0c402b90..97b11bfb4df 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -2,7 +2,7 @@
 #include "LB_LoadMap.h"
 #include "LB_Random.h"
 
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index 478b6d22b63..0ae1886cd3b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -22,7 +22,7 @@
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index 5c356ef3b41..bec59e2725f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -16,13 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 
 class TAO_LoadBalancing_Export TAO_LB_LoadAlert
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
index 78eeeb187f6..8b4effbc06d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
@@ -1,5 +1,5 @@
 #include "LB_LoadAlertInfo.h"
-#include "orbsvcs/PortableGroup/PG_Operators.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h"
 
 ACE_RCSID (LoadBalancing,
            LB_LoadAlertInfo,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
index 6736448e92c..069c924c021 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
index 620ec2d3acb..de57de3dc2a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
@@ -24,8 +24,8 @@
 
 #include "LB_LoadAlertInfo.h"
 
-#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index 0768f411ac2..00ca3154c3d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -13,7 +13,7 @@
 #ifndef TAO_LB_LOAD_ALERT_REPLY_HANDLER_H
 #define TAO_LB_LOAD_ALERT_REPLY_HANDLER_H
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index a9865acf8b7..d6da83152c8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -2,7 +2,7 @@
 #include "LB_LoadMap.h"
 #include "LB_Random.h"
 
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index fc69de65e4a..8f50a617e19 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -23,7 +23,7 @@
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
index ebfbb3b6cb7..1ca35de22bf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
@@ -16,16 +16,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
-#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 32d63b54f0f..e70d2ef5c7c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -8,8 +8,8 @@
 #include "LB_LeastLoaded.h"
 #include "LB_conf.h"
 
-#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
 
 #include "tao/Messaging/Messaging.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index 06b190c4e4b..fc9477c0cb2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -28,11 +28,11 @@
 #include "LB_LoadListMap.h"
 #include "LB_Pull_Handler.h"
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
-#include "orbsvcs/PortableGroup/PG_PropertyManager.h"
-#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
-#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
 
 
 class TAO_LoadBalancing_Export TAO_LB_LoadManager
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
index 6e5778f4a55..1ff00d58bc6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
@@ -16,16 +16,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
-#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 8f0cc83f219..a247293b071 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -3,7 +3,7 @@
 #include "LB_LoadMap.h"
 #include "LB_Random.h"
 
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index 522d574ea3c..1587d889b3f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -23,7 +23,7 @@
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
index b99c5437779..9bda59cc806 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
@@ -16,13 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h
index 02b8f12adeb..46dd23539e5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h
@@ -16,14 +16,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index 245fc0552b1..9f59c099b0f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -2,7 +2,7 @@
 #include "LB_IORInterceptor.h"
 #include "LB_ServerRequestInterceptor.h"
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 #include "tao/ORB_Constants.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index d7bab7a8e98..6ca2b5b8597 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/LB_ORTC.h"
+#include "orbsvcs/orbsvcs/LB_ORTC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,7 +28,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 #include "ace/Array_Base.h"
 #include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index 2f03027c78a..7eb9eb88c72 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index 6e8c1db4288..82e408654ff 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -2,7 +2,7 @@
 
 #include "LB_RoundRobin.h"
 
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index c244a697157..934e92a7d1c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -22,9 +22,9 @@
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/LoadBalancing/LB_Location_Index_Map.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h"
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 /**
  * @class TAO_LB_RoundRobin_Strategy
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index a03a561f291..4a7d114122e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -18,7 +18,7 @@
 
 #include "ace/config-all.h"
 
-#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 2a96caf9700..9d6f39e6fb5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/Log/BasicLogFactory_i.h"
+#include "orbsvcs/orbsvcs/Log/BasicLogFactory_i.h"
 
 ACE_RCSID (Log,
            BasicLogFactory_i,
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index 3b97e456f6e..bc0f66de571 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -19,14 +19,14 @@
 #define TAO_TLS_BASICLOGFACTORY_I_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/BasicLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/BasicLog_i.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -42,7 +42,7 @@
  *
  * @brief The BasicLogFactory is a factory that is used to create event-unaware Logs.
  */
-class TAO_Log_Serv_Export TAO_BasicLogFactory_i : 
+class TAO_Log_Export TAO_BasicLogFactory_i : 
   public POA_DsLogAdmin::BasicLogFactory,
   public TAO_LogMgr_i
 {
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index dfcb7dbc492..17499a8b671 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/BasicLog_i.h"
+#include "orbsvcs/orbsvcs/Log/BasicLog_i.h"
 
-#include "orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
 
 ACE_RCSID (Log,
            BasicLog_i,
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 6b95fe6fcd2..b6f837e2de6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -21,14 +21,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Log/Log_i.h"
-#include "log_serv_export.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "log_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -48,7 +48,7 @@ class TAO_LogMgr_i;
  *
  * The class supports the @c destroy> method to destroy the Log.
  */
-class TAO_Log_Serv_Export TAO_BasicLog_i :
+class TAO_Log_Export TAO_BasicLog_i :
   public TAO_Log_i,
   public POA_DsLogAdmin::BasicLog,
   public virtual PortableServer::RefCountServantBase
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index 04187810399..f00ce56edef 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/EventLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/EventLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
 
 ACE_RCSID (Log,
            EventLogConsumer,
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
index fd1db823fcb..933bcc1c2e4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -19,18 +19,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-#include "orbsvcs/DsEventLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
 
-#include "eventlog_serv_export.h"
+#include "eventlog_export.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 800174ac1e9..08550f254e5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/EventLogFactory_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/EventLogNotification.h"
+#include "orbsvcs/orbsvcs/Log/EventLogFactory_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/EventLogNotification.h"
 #include "ace/Auto_Ptr.h"
 
 ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
index ebc24764275..8c708aeefed 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -20,17 +20,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/DsLogAdminS.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "EventLog_i.h"
 
 #if defined(_MSC_VER)
@@ -48,7 +48,7 @@ class TAO_EventLogNotification;
  *
  * @brief The EventLogFactory is a factory that is used to create EventLogs which are event-aware.
  */
-class TAO_EventLog_Serv_Export TAO_EventLogFactory_i :
+class TAO_EventLog_Export TAO_EventLogFactory_i :
   public POA_DsEventLogAdmin::EventLogFactory,
   public TAO_LogMgr_i
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 7efe128c8b3..9dfb1fa5c5a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/EventLogNotification.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/EventLogNotification.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
 ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index b31e7afea54..582b9eaa533 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -20,17 +20,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/DsEventLogAdminS.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "eventlog_serv_export.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -44,7 +43,7 @@
  *
  * @brief Used to forward log generated events to a logging server.
  */
-class TAO_EventLog_Serv_Export TAO_EventLogNotification :
+class TAO_EventLog_Export TAO_EventLogNotification :
   public TAO_LogNotification,
   public POA_CosEventComm::PushSupplier
 {
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index a76aeb0ada8..76e5f3afd74 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/EventLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/EventLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
 
 ACE_RCSID (Log,
            EventLog_i,
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index c4c3faacc3a..f4fb4b15618 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -20,19 +20,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-#include "orbsvcs/DsEventLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/Log/EventLogConsumer.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/Log/EventLogConsumer.h"
 
-#include "eventlog_serv_export.h"
+#include "eventlog_export.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index fcbf59d24e0..ac4780e1dcc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -1,8 +1,8 @@
 #include "Iterator_i.h"
 
-#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
-#include "orbsvcs/Log/Log_Constraint_Visitors.h"
-#include "orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
 
 ACE_RCSID (Log,
            Iterator_i,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 4c3c004f333..e192849618c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -19,13 +19,13 @@
 #define TAO_TLS_ITERATOR_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Log/LogRecordStore.h"
+#include "orbsvcs/orbsvcs/Log/LogRecordStore.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -41,7 +41,7 @@
  *
  * @brief Iterator to get LogRecords for the log via a query.
  */
-class TAO_Log_Serv_Export TAO_Iterator_i : 
+class TAO_Log_Export TAO_Iterator_i : 
   public POA_DsLogAdmin::Iterator,
   public virtual PortableServer::RefCountServantBase
 {
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index b5618c41cb2..9c3eb6dd47a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -5,7 +5,6 @@ ACE_RCSID (Log,
            "$Id$")
 
 TAO_LogMgr_i::TAO_LogMgr_i (void)
-  : max_id_ (0)
 {
   // No-Op.
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index ce07c14d6c8..111c961ecb6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -18,15 +18,15 @@
 #define TAO_TLS_LOGMGR_I_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
 
-#include "log_serv_export.h"
+#include "log_export.h"
 
 /**
  * @class TAO_LogMgr_i
@@ -36,7 +36,7 @@
  * This factory base class is used to maintain a list of logs 
  * created by it. Logs can also be removed from the list.
  */
-class TAO_Log_Serv_Export TAO_LogMgr_i : public virtual POA_DsLogAdmin::LogMgr
+class TAO_Log_Export TAO_LogMgr_i : public virtual POA_DsLogAdmin::LogMgr
 {
 public:
 
@@ -73,6 +73,7 @@ public:
  /// remove the given entry from the hash table.
  int remove (DsLogAdmin::LogId id);
 
+
 protected:
 
   /// Define the HASHMAP.
@@ -88,6 +89,5 @@ protected:
   /// A list of the current log ids.
   DsLogAdmin::LogIdList logid_list_;
 };
-
 #include /**/ "ace/post.h"
 #endif /* TAO_TLS_LOGMGR_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 0a99e274bcf..697e70aa687 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
 
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_sys_time.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
index 057140a1c75..763ddace35c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
@@ -18,15 +18,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/DsLogNotificationS.h"
+#include "orbsvcs/orbsvcs/DsLogNotificationS.h"
 
-#include "log_serv_export.h"
+#include "log_export.h"
 
 
 /**
@@ -37,7 +37,7 @@
  * This implementation attempts to conform to the telecom
  * logging specification.
  */
-class TAO_Log_Serv_Export TAO_LogNotification
+class TAO_Log_Export TAO_LogNotification
 {
 
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index ddbb9953e8b..74038ad3d20 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -1,8 +1,8 @@
-#include "orbsvcs/Log/LogRecordStore.h"
+#include "orbsvcs/orbsvcs/Log/LogRecordStore.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
-#include "orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h"
 #include "ace/OS_NS_sys_time.h"
 
 ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 55025c60e81..c016786c432 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -19,17 +19,17 @@
 #define TAO_LOG_RECORD_STORE_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
 #include "ace/Containers.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
-#include "log_serv_export.h"
+#include "log_export.h"
 
 #define LOG_DEFAULT_MAX_REC_LIST_LEN 30
 
@@ -44,7 +44,7 @@
  * entries. Other features include searching by time ranges.
  * @@ pradeep: The ACE_RB_Tree will come later.
  */
-class TAO_Log_Serv_Export TAO_LogRecordStore
+class TAO_Log_Export TAO_LogRecordStore
 {
  public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
index 0cac5583e9d..7416e66f0cb 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
@@ -30,7 +30,7 @@
 #include "orbsvcs/DsLogAdminC.h"
 #include "ace/Containers.h"
 #include "ace/Hash_Map_Manager.h"
-#include "log_serv_export.h"
+#include "log_export.h"
 #include "PersistStore.h"
 
 #define PERSISTENT_LOG_FILE_NAME "LOG.DATA"
@@ -48,7 +48,7 @@
  * entries. Other features include searching by time ranges.
  * @@ pradeep: The ACE_RB_Tree will come later.
  */
-class TAO_Log_Serv_Export TAO_LogRecordStore
+class TAO_Log_Export TAO_LogRecordStore
 {
  public:
   // = Initialization and termination methods
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index 7fd1a319398..e365b351982 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -19,15 +19,15 @@
 #define TAO_LOG_CONSTRAINT_INTERPRETER_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/ETCL/ETCL_Interpreter.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/DsLogAdminC.h"
-#include "log_serv_export.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
+#include "log_export.h"
 
 class TAO_Log_Constraint_Visitor;
 
@@ -36,7 +36,7 @@ class TAO_Log_Constraint_Visitor;
  *
  * @brief "ETCL" Interpreter for the Log queries.
  */
-class TAO_Log_Serv_Export TAO_Log_Constraint_Interpreter :
+class TAO_Log_Export TAO_Log_Constraint_Interpreter :
   public TAO_ETCL_Interpreter
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 59f18a7d98f..66c6fc561f9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -1,7 +1,7 @@
 #include "Log_Constraint_Visitors.h"
 
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/ETCL/ETCL_y.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h"
 
 #include "tao/DynamicAny/DynArray_i.h"
 #include "tao/DynamicAny/DynSequence_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
index abba100cb81..4a4866e222f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
@@ -26,12 +26,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
-#include "orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
 
 #include "tao/Typecode.h"
 
-#include "log_serv_export.h"
+#include "log_export.h"
 
 class TAO_ETCL_Constraint;
 class TAO_ETCL_Literal_Constraint;
@@ -42,7 +42,7 @@ class TAO_Log_Property_Constraint;
  *
  * @brief "ETCL" Visitor for the Log queries.
  */
-class TAO_Log_Serv_Export TAO_Log_Constraint_Visitor :
+class TAO_Log_Export TAO_Log_Constraint_Visitor :
   public TAO_ETCL_Constraint_Visitor
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 0e1f1242ced..c98877f9f8e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -1,9 +1,9 @@
-#include "orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
 
-#include "orbsvcs/Log/Iterator_i.h"
-#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
-#include "orbsvcs/Log/Log_Constraint_Visitors.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/Iterator_i.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 249d1a7d460..2181e2d7e72 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -20,16 +20,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Log/LogRecordStore.h"
+#include "orbsvcs/orbsvcs/Log/LogRecordStore.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 #include "ace/Reactor.h"
-#include "log_serv_export.h"
+#include "log_export.h"
 
 /**
  * @class TAO_Log_i
@@ -39,7 +39,7 @@
  * This implementation attempts to conform to the telecom
  * logging specification.
  */
-class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log
+class TAO_Log_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log
 {
 
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 97c9bc2d6b2..7a79e1680f7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/NotifyLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
 
 ACE_RCSID (Log,
            NotifyLogConsumer,
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
index 927736b1caf..d20ae88f2dd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -18,16 +18,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/DsNotifyLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
 
-#include "notifylog_serv_export.h"
+#include "notifylog_export.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index c170bfc266a..e5119599284 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/NotifyLogFactory_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/NotifyLogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h"
 
 ACE_RCSID (Log,
            NotifyLogFactory_i,
@@ -185,12 +185,11 @@ TAO_NotifyLogFactory_i::create_with_id (
   ACE_CHECK_RETURN (notify_log._retn ());
 
   // Add to the Hash table..
-  if (hash_map_.bind (id, 
-                      DsNotifyLogAdmin::NotifyLog::_duplicate (notify_log.in ())) == -1)
+  if (hash_map_.bind (id, notify_log.in ()) == -1)
     ACE_THROW_RETURN (CORBA::INTERNAL (),
                       DsNotifyLogAdmin::NotifyLog::_nil ());
 
-  notifier_->object_creation (DsNotifyLogAdmin::NotifyLog::_duplicate (notify_log.in ()),
+  notifier_->object_creation (notify_log.in (),
                               id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index c0729d5d837..f887c674f94 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -18,14 +18,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsNotifyLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/DsLogAdminS.h"
-#include "orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
 #include "NotifyLog_i.h"
 
 #if defined(_MSC_VER)
@@ -43,7 +43,7 @@ class TAO_NotifyLogNotification;
  *
  * @brief The NotifyLogFactory is a factory that is used to create NotifyLogs which are event-aware.
  */
-class TAO_NotifyLog_Serv_Export TAO_NotifyLogFactory_i :
+class TAO_NotifyLog_Export TAO_NotifyLogFactory_i :
   public POA_DsNotifyLogAdmin::NotifyLogFactory,
   public TAO_LogMgr_i
 {
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index 53434e73a9b..8c161bff3ff 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/NotifyLogNotification.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
 ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
index 4f6b6849b8f..0dc5d4997e5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -20,17 +20,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsNotifyLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
-#include "notifylog_serv_export.h"
+#include "notifylog_export.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -44,7 +45,7 @@
  *
  * @brief Used to forward log generated events to a logging server.
  */
-class TAO_NotifyLog_Serv_Export TAO_NotifyLogNotification : 
+class TAO_NotifyLog_Export TAO_NotifyLogNotification : 
   public TAO_LogNotification, 
   public POA_CosNotifyComm::PushSupplier, 
   public PortableServer::RefCountServantBase
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index 88e58478c13..20bc3f9ea0a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/NotifyLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
 
 ACE_RCSID (Log,
            NotifyLog_i,
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 07f89fd6a98..63fbb632bd0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -19,17 +19,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/DsNotifyLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/Log/NotifyLogConsumer.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLogConsumer.h"
 
-#include "notifylog_serv_export.h"
+#include "notifylog_export.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -50,7 +50,7 @@ class TAO_NotifyLogFactory_i;
  * It is used to log events that pass through the EventChannel.
  * The class supports the @c destroy> method to destroy the Log.
  */
-class TAO_NotifyLog_Serv_Export TAO_NotifyLog_i : 
+class TAO_NotifyLog_Export TAO_NotifyLog_i : 
   public TAO_Log_i,
   public POA_DsNotifyLogAdmin::NotifyLog,
   public virtual PortableServer::RefCountServantBase
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
index 89e7127cfa0..bf08953799a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
@@ -3,7 +3,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_sys_time.h"
 
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_sys_time.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
index 6945a77b6b0..883b65d21a9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
@@ -17,16 +17,15 @@
 #define TAO_PERSIST_STORE_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 #include "tao/Typecode.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
 #include "ace/Mutex.h"
-#include "log_serv_export.h"
 
 #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250
 
@@ -47,7 +46,7 @@ struct PersistentData
  * This implementation is to serve for illustration purposes.
  */
 
-class TAO_Log_Serv_Export TAO_PersistStore
+class TAO_Log_Export TAO_PersistStore
 {
  public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index 018bc2388e4..69a8009f059 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -1,16 +1,16 @@
-#include "orbsvcs/Log/RTEventLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Dispatching.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/Event/EC_SupplierAdmin.h"
-#include "orbsvcs/Event/EC_Timeout_Generator.h"
-#include "orbsvcs/Event/EC_ObserverStrategy.h"
-#include "orbsvcs/Event/EC_ConsumerControl.h"
-#include "orbsvcs/Event/EC_SupplierControl.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h"
+#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
index 76e3dc1583f..1fd91e51bca 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -19,17 +19,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RTEventLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Factory.h"
-#include "orbsvcs/Event/EC_Defaults.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Defaults.h"
 
 #include "rteventlog_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index 022ff15dfb6..12d794c9a4f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -1,25 +1,25 @@
-#include "orbsvcs/Log/RTEventLogFactory_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/RTEventLogNotification.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Event/Module_Factory.h"
-#include "orbsvcs/Event/Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
 
 #include "ace/Auto_Ptr.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ConsumerAdmin.i"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index 42b25823cbb..5be76ec71b9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -18,17 +18,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RTEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/DsLogAdminS.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "RTEventLog_i.h"
 #include "rteventlog_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index 50bf6175c89..5d4a3788101 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -1,22 +1,22 @@
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/RTEventLogNotification.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_Dispatching.h"
-#include "orbsvcs/Event/EC_Filter_Builder.h"
-#include "orbsvcs/Event/EC_QOS_Info.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
-#include "orbsvcs/Event/EC_ConsumerControl.h"
-#include "orbsvcs/ESF/ESF_RefCount_Guard.h"
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/orbsvcs/Event/EC_Filter_Builder.h"
+#include "orbsvcs/orbsvcs/Event/EC_QOS_Info.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
 ACE_RCSID (Log,
            RTEventLogNotification,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
index b6f1718cbce..2ae3fd2ad6c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -20,18 +20,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/RTEventLogAdminS.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h"
 
 #include "rteventlog_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 84fc071fcc6..68d87cd2f20 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -1,16 +1,16 @@
-#include "orbsvcs/Log/RTEventLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Dispatching.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/Event/EC_SupplierAdmin.h"
-#include "orbsvcs/Event/EC_Timeout_Generator.h"
-#include "orbsvcs/Event/EC_ObserverStrategy.h"
-#include "orbsvcs/Event/EC_ConsumerControl.h"
-#include "orbsvcs/Event/EC_SupplierControl.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h"
+#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index 3601e347781..622b25ff925 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -18,18 +18,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RTEventLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Factory.h"
-#include "orbsvcs/Event/EC_Defaults.h"
-#include "orbsvcs/Log/RTEventLogConsumer.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Defaults.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLogConsumer.h"
 
 #include "rteventlog_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index c00cb3b5580..8e67d9dd58e 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -1,104 +1,239 @@
 ##  Process this file with automake to create Makefile.in
 
-includedir = @includedir@/orbsvcs
-
 ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
 TAO_ROOT = $(top_srcdir)
 TAO_BUILDDIR = $(top_builddir)
-
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_builddir)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 
-## Makefile.CosNaming.am 
+## Makefile.Svc_Utils.am 
 
 BUILT_SOURCES = \
+  TimeBaseS_T.cpp \
+  TimeBaseC.cpp \
+  TimeBaseS.cpp \
+  TimeBaseC.h \
+  TimeBaseS.h \
+  TimeBaseS_T.h \
+  TimeBaseC.inl \
+  TimeBaseS.inl \
+  TimeBaseS_T.inl
+
+CLEANFILES = \
+  TimeBaseS_T.cpp \
+  TimeBaseC.cpp \
+  TimeBaseS.cpp \
+  TimeBaseC.h \
+  TimeBaseS.h \
+  TimeBaseS_T.h \
+  TimeBaseC.inl \
+  TimeBaseS.inl \
+  TimeBaseS_T.inl
+
+TimeBaseS_T.cpp TimeBaseC.cpp TimeBaseS.cpp TimeBaseC.h TimeBaseS.h TimeBaseS_T.h TimeBaseC.inl TimeBaseS.inl TimeBaseS_T.inl: TimeBase.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(srcdir)/TimeBase.idl
+
+BUILT_SOURCES += \
+  RtecBaseS_T.cpp \
+  RtecBaseC.cpp \
+  RtecBaseS.cpp \
+  RtecBaseC.h \
+  RtecBaseS.h \
+  RtecBaseS_T.h \
+  RtecBaseC.inl \
+  RtecBaseS.inl \
+  RtecBaseS_T.inl
+
+CLEANFILES += \
+  RtecBaseS_T.cpp \
+  RtecBaseC.cpp \
+  RtecBaseS.cpp \
+  RtecBaseC.h \
+  RtecBaseS.h \
+  RtecBaseS_T.h \
+  RtecBaseC.inl \
+  RtecBaseS.inl \
+  RtecBaseS_T.inl
+
+RtecBaseS_T.cpp RtecBaseC.cpp RtecBaseS.cpp RtecBaseC.h RtecBaseS.h RtecBaseS_T.h RtecBaseC.inl RtecBaseS.inl RtecBaseS_T.inl: RtecBase.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(srcdir)/RtecBase.idl
+
+lib_LTLIBRARIES = libTAO_Svc_Utils.la
+
+libTAO_Svc_Utils_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_SVC_UTILS_BUILD_DLL
+
+libTAO_Svc_Utils_la_SOURCES = \
+  TimeBaseC.cpp \
+  TimeBaseS.cpp \
+  RtecBaseC.cpp \
+  RtecBaseS.cpp \
+  Time_Utilities.cpp \
+  IOR_Multicast.cpp
+
+libTAO_Svc_Utils_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_Svc_Utils_la_LIBADD = \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS = \
+  TimeBaseS_T.h \
+  Channel_Clients_T.h \
+  TimeBaseC.h \
+  TimeBaseS.h \
+  RtecBaseS_T.h \
+  RtecBaseC.h \
+  RtecBaseS.h \
+  Time_Utilities.h \
+  IOR_Multicast.h \
+  TimeBaseS_T.inl \
+  Channel_Clients_T.i \
+  TimeBaseC.inl \
+  TimeBaseS.inl \
+  RtecBaseS_T.inl \
+  RtecBaseC.inl \
+  RtecBaseS.inl \
+  Time_Utilities.i \
+  TimeBaseS_T.cpp \
+  RtecBaseS_T.cpp \
+  Channel_Clients_T.cpp
+
+
+## Makefile.CosNaming.am 
+
+BUILT_SOURCES += \
   CosNamingS_T.cpp \
-  CosNamingC.inl \
-  CosNamingS_T.inl \
   CosNamingC.cpp \
+  CosNamingS.cpp \
   CosNamingC.h \
-  CosNamingS_T.h
+  CosNamingS.h \
+  CosNamingS_T.h \
+  CosNamingC.inl \
+  CosNamingS.inl \
+  CosNamingS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   CosNamingS_T.cpp \
-  CosNamingC.inl \
-  CosNamingS_T.inl \
   CosNamingC.cpp \
+  CosNamingS.cpp \
   CosNamingC.h \
+  CosNamingS.h \
   CosNamingS_T.h \
-  CosNaming-stamp
+  CosNamingC.inl \
+  CosNamingS.inl \
+  CosNamingS_T.inl
 
-CosNamingS_T.cpp CosNamingC.inl CosNamingS_T.inl CosNamingC.cpp CosNamingC.h CosNamingS_T.h: CosNaming-stamp
+CosNamingS_T.cpp CosNamingC.cpp CosNamingS.cpp CosNamingC.h CosNamingS.h CosNamingS_T.h CosNamingC.inl CosNamingS.inl CosNamingS_T.inl: CosNaming.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h $(srcdir)/CosNaming.idl
 
-CosNaming-stamp: $(srcdir)/CosNaming.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl
-	@touch $@
+Naming = \
+  CosNamingC.cpp \
+  CosNamingS.cpp \
+  Naming/Entries.cpp \
+  Naming/Flat_File_Persistence.cpp \
+  Naming/Hash_Naming_Context.cpp \
+  Naming/Naming_Context_Interface.cpp \
+  Naming/Naming_Loader.cpp \
+  Naming/Naming_Utils.cpp \
+  Naming/Persistent_Context_Index.cpp \
+  Naming/Persistent_Entries.cpp \
+  Naming/Persistent_Naming_Context.cpp \
+  Naming/Storable.cpp \
+  Naming/Storable_Naming_Context.cpp \
+  Naming/Storable_Naming_Context_Activator.cpp \
+  Naming/Transient_Naming_Context.cpp
 
-lib_LTLIBRARIES = libTAO_CosNaming.la
+lib_LTLIBRARIES += libTAO_CosNaming.la
 
 libTAO_CosNaming_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_NAMING_BUILD_DLL
 
 libTAO_CosNaming_la_SOURCES = \
-  CosNamingC.cpp \
-  Naming/Naming_Client.cpp
+  $(Naming)
 
 libTAO_CosNaming_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_CosNaming_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS = \
-  CosNamingC.h \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Naming/naming_export.h \
+  Channel_Clients_T.h \
   CosNamingS_T.h \
-  Naming/Naming_Client.h \
-  CosNamingC.inl \
+  Naming/Transient_Naming_Context.h \
+  Naming/Entries.h \
+  Naming/Persistent_Context_Index.h \
+  Naming/Naming_Loader.h \
+  Naming/Naming_Context_Interface.h \
+  Naming/Storable_Naming_Context_Activator.h \
+  Naming/Naming_Utils.h \
+  Naming/Flat_File_Persistence.h \
+  Naming/Storable.h \
+  Naming/Hash_Naming_Context.h \
+  CosNamingC.h \
+  CosNamingS.h \
+  Naming/Persistent_Naming_Context.h \
+  Naming/Storable_Naming_Context.h \
+  Naming/Persistent_Entries.h \
+  Channel_Clients_T.i \
   CosNamingS_T.inl \
+  Naming/Storable.inl \
+  CosNamingC.inl \
+  CosNamingS.inl \
   CosNamingS_T.cpp \
-  CosNaming.idl
+  Channel_Clients_T.cpp
 
-EXTRA_DIST = \
-  CosNaming.rc
 
 ## Makefile.CosProperty.am 
 
 BUILT_SOURCES += \
   CosPropertyServiceS_T.cpp \
-  CosPropertyServiceC.inl \
-  CosPropertyServiceS.inl \
-  CosPropertyServiceS_T.inl \
   CosPropertyServiceC.cpp \
   CosPropertyServiceS.cpp \
   CosPropertyServiceC.h \
   CosPropertyServiceS.h \
-  CosPropertyServiceS_T.h
+  CosPropertyServiceS_T.h \
+  CosPropertyServiceC.inl \
+  CosPropertyServiceS.inl \
+  CosPropertyServiceS_T.inl
 
 CLEANFILES += \
   CosPropertyServiceS_T.cpp \
-  CosPropertyServiceC.inl \
-  CosPropertyServiceS.inl \
-  CosPropertyServiceS_T.inl \
   CosPropertyServiceC.cpp \
   CosPropertyServiceS.cpp \
   CosPropertyServiceC.h \
   CosPropertyServiceS.h \
   CosPropertyServiceS_T.h \
-  CosPropertyService-stamp
-
-CosPropertyServiceS_T.cpp CosPropertyServiceC.inl CosPropertyServiceS.inl CosPropertyServiceS_T.inl CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceC.h CosPropertyServiceS.h CosPropertyServiceS_T.h: CosPropertyService-stamp
+  CosPropertyServiceC.inl \
+  CosPropertyServiceS.inl \
+  CosPropertyServiceS_T.inl
 
-CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosPropertyService.idl
-	@touch $@
+CosPropertyServiceS_T.cpp CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceC.h CosPropertyServiceS.h CosPropertyServiceS_T.h CosPropertyServiceC.inl CosPropertyServiceS.inl CosPropertyServiceS_T.inl: CosPropertyService.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h $(srcdir)/CosPropertyService.idl
 
 Property = \
   CosPropertyServiceC.cpp \
@@ -112,8 +247,6 @@ libTAO_CosProperty_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_PROPERTY_BUILD_DLL
 
 libTAO_CosProperty_la_SOURCES = \
@@ -123,120 +256,112 @@ libTAO_CosProperty_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_CosProperty_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosPropertyServiceC.h \
-  CosPropertyServiceS.h \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
   CosPropertyServiceS_T.h \
+  Channel_Clients_T.h \
   Property/CosPropertyService_i.h \
-  CosPropertyServiceC.inl \
-  CosPropertyServiceS.inl \
+  CosPropertyServiceC.h \
+  CosPropertyServiceS.h \
   CosPropertyServiceS_T.inl \
+  Channel_Clients_T.i \
   CosPropertyServiceS_T.cpp \
-  CosPropertyService.idl
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  CosProperty.rc
 
 ## Makefile.AV.am 
 
 BUILT_SOURCES += \
   AVStreamsS_T.cpp \
-  AVStreamsC.inl \
-  AVStreamsS.inl \
-  AVStreamsS_T.inl \
   AVStreamsC.cpp \
   AVStreamsS.cpp \
   AVStreamsC.h \
   AVStreamsS.h \
-  AVStreamsS_T.h
+  AVStreamsS_T.h \
+  AVStreamsC.inl \
+  AVStreamsS.inl \
+  AVStreamsS_T.inl
 
 CLEANFILES += \
   AVStreamsS_T.cpp \
-  AVStreamsC.inl \
-  AVStreamsS.inl \
-  AVStreamsS_T.inl \
   AVStreamsC.cpp \
   AVStreamsS.cpp \
   AVStreamsC.h \
   AVStreamsS.h \
   AVStreamsS_T.h \
-  AVStreams-stamp
-
-AVStreamsS_T.cpp AVStreamsC.inl AVStreamsS.inl AVStreamsS_T.inl AVStreamsC.cpp AVStreamsS.cpp AVStreamsC.h AVStreamsS.h AVStreamsS_T.h: AVStreams-stamp
+  AVStreamsC.inl \
+  AVStreamsS.inl \
+  AVStreamsS_T.inl
 
-AVStreams-stamp: $(srcdir)/AVStreams.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl
-	@touch $@
+AVStreamsS_T.cpp AVStreamsC.cpp AVStreamsS.cpp AVStreamsC.h AVStreamsS.h AVStreamsS_T.h AVStreamsC.inl AVStreamsS.inl AVStreamsS_T.inl: AVStreams.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h $(srcdir)/AVStreams.idl
 
 BUILT_SOURCES += \
   Null_MediaCtrlS_T.cpp \
-  Null_MediaCtrlC.inl \
-  Null_MediaCtrlS.inl \
-  Null_MediaCtrlS_T.inl \
   Null_MediaCtrlC.cpp \
   Null_MediaCtrlS.cpp \
-  Null_MediaCtrlC.h \
-  Null_MediaCtrlS.h \
-  Null_MediaCtrlS_T.h
+  Null_MediaCtrlS_T.h \
+  Null_MediaCtrlC.inl \
+  Null_MediaCtrlS.inl \
+  Null_MediaCtrlS_T.inl
 
 CLEANFILES += \
   Null_MediaCtrlS_T.cpp \
-  Null_MediaCtrlC.inl \
-  Null_MediaCtrlS.inl \
-  Null_MediaCtrlS_T.inl \
   Null_MediaCtrlC.cpp \
   Null_MediaCtrlS.cpp \
-  Null_MediaCtrlC.h \
-  Null_MediaCtrlS.h \
   Null_MediaCtrlS_T.h \
-  Null_MediaCtrl-stamp
-
-Null_MediaCtrlS_T.cpp Null_MediaCtrlC.inl Null_MediaCtrlS.inl Null_MediaCtrlS_T.inl Null_MediaCtrlC.cpp Null_MediaCtrlS.cpp Null_MediaCtrlC.h Null_MediaCtrlS.h Null_MediaCtrlS_T.h: Null_MediaCtrl-stamp
+  Null_MediaCtrlC.inl \
+  Null_MediaCtrlS.inl \
+  Null_MediaCtrlS_T.inl
 
-Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl
-	@touch $@
+Null_MediaCtrlS_T.cpp Null_MediaCtrlC.cpp Null_MediaCtrlS.cpp Null_MediaCtrlS_T.h Null_MediaCtrlC.inl Null_MediaCtrlS.inl Null_MediaCtrlS_T.inl: Null_MediaCtrl.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl
 
 BUILT_SOURCES += \
   sfpS_T.cpp \
-  sfpC.inl \
-  sfpS.inl \
-  sfpS_T.inl \
   sfpC.cpp \
   sfpS.cpp \
   sfpC.h \
   sfpS.h \
-  sfpS_T.h
+  sfpS_T.h \
+  sfpC.inl \
+  sfpS.inl \
+  sfpS_T.inl
 
 CLEANFILES += \
   sfpS_T.cpp \
-  sfpC.inl \
-  sfpS.inl \
-  sfpS_T.inl \
   sfpC.cpp \
   sfpS.cpp \
   sfpC.h \
   sfpS.h \
   sfpS_T.h \
-  sfp-stamp
-
-sfpS_T.cpp sfpC.inl sfpS.inl sfpS_T.inl sfpC.cpp sfpS.cpp sfpC.h sfpS.h sfpS_T.h: sfp-stamp
+  sfpC.inl \
+  sfpS.inl \
+  sfpS_T.inl
 
-sfp-stamp: $(srcdir)/sfp.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl
-	@touch $@
+sfpS_T.cpp sfpC.cpp sfpS.cpp sfpC.h sfpS.h sfpS_T.h sfpC.inl sfpS.inl sfpS_T.inl: sfp.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h $(srcdir)/sfp.idl
 
 AV = \
+  AVStreamsC.cpp \
+  AVStreamsS.cpp \
+  Null_MediaCtrlC.cpp \
+  Null_MediaCtrlS.cpp \
+  sfpC.cpp \
+  sfpS.cpp \
   AV/AVStreams_i.cpp \
   AV/AV_Core.cpp \
   AV/Endpoint_Strategy.cpp \
   AV/Fill_ACE_QoS.cpp \
   AV/FlowSpec_Entry.cpp \
   AV/MCast.cpp \
+  AV/md5c.cpp \
   AV/Policy.cpp \
   AV/Protocol_Factory.cpp \
   AV/QoS_UDP.cpp \
@@ -244,20 +369,13 @@ AV = \
   AV/RTCP_Channel.cpp \
   AV/RTCP_Packet.cpp \
   AV/RTP.cpp \
-  AV/SCTP_SEQ.cpp \
   AV/TCP.cpp \
   AV/Transport.cpp \
   AV/UDP.cpp \
   AV/default_resource.cpp \
-  AV/md5c.cpp \
   AV/media_timer.cpp \
   AV/sfp.cpp \
-  AVStreamsC.cpp \
-  AVStreamsS.cpp \
-  Null_MediaCtrlC.cpp \
-  Null_MediaCtrlS.cpp \
-  sfpC.cpp \
-  sfpS.cpp
+  AV/SCTP_SEQ.cpp
 
 lib_LTLIBRARIES += libTAO_AV.la
 
@@ -266,8 +384,6 @@ libTAO_AV_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_AV_BUILD_DLL
 
 libTAO_AV_la_SOURCES = \
@@ -277,13 +393,26 @@ libTAO_AV_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_AV_la_LIBADD = \
-  libTAO_CosNaming.la \
-  libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_CosProperty.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  AV/TCP.h \
+  AV/Transport.h \
+  sfpC.h \
+  sfpS.h \
+  AVStreamsC.h \
+  AVStreamsS.h \
+  Channel_Clients_T.h \
   AV/AVStreams_i.h \
   AV/AV_Core.h \
   AV/AV_export.h \
@@ -293,6 +422,7 @@ nobase_include_HEADERS += \
   AV/FlowSpec_Entry.h \
   AV/Flows_T.h \
   AV/MCast.h \
+  AV/md5.h \
   AV/Policy.h \
   AV/Protocol_Factory.h \
   AV/QoS_UDP.h \
@@ -301,95 +431,74 @@ nobase_include_HEADERS += \
   AV/RTCP_Packet.h \
   AV/RTP.h \
   AV/Resource_Factory.h \
-  AV/SCTP_SEQ.h \
-  AV/TCP.h \
-  AV/Transport.h \
   AV/UDP.h \
   AV/default_resource.h \
   AV/global.h \
-  AV/md5.h \
   AV/media_timer.h \
   AV/ntp-time.h \
   AV/sfp.h \
-  AVStreamsC.h \
-  AVStreamsS.h \
-  AVStreamsS_T.h \
-  Channel_Clients_T.h \
-  Null_MediaCtrlC.h \
-  Null_MediaCtrlS.h \
+  AV/SCTP_SEQ.h \
   Null_MediaCtrlS_T.h \
-  sfpC.h \
-  sfpS.h \
+  AVStreamsS_T.h \
   sfpS_T.h \
-  AV/AVStreams_i.i \
-  AV/FlowSpec_Entry.i \
-  AV/MCast.i \
-  AV/Policy.i \
   AV/QoS_UDP.i \
   AV/Transport.i \
+  sfpC.inl \
+  sfpS.inl \
   AV/UDP.i \
+  AV/AVStreams_i.i \
+  AV/Policy.i \
+  AV/FlowSpec_Entry.i \
+  AV/MCast.i \
   AVStreamsC.inl \
   AVStreamsS.inl \
-  AVStreamsS_T.inl \
-  Channel_Clients_T.i \
-  Null_MediaCtrlC.inl \
-  Null_MediaCtrlS.inl \
   Null_MediaCtrlS_T.inl \
-  sfpC.inl \
-  sfpS.inl \
+  AVStreamsS_T.inl \
   sfpS_T.inl \
-  AV/Endpoint_Strategy_T.cpp \
-  AV/Flows_T.cpp \
+  Channel_Clients_T.i \
   AVStreamsS_T.cpp \
-  Channel_Clients_T.cpp \
   Null_MediaCtrlS_T.cpp \
   sfpS_T.cpp \
-  AVStreams.idl \
-  Null_MediaCtrl.idl \
-  sfp.idl
+  Channel_Clients_T.cpp \
+  AV/Endpoint_Strategy_T.cpp \
+  AV/Flows_T.cpp
 
-EXTRA_DIST += \
-  AV.rc
 
 ## Makefile.CosConcurrency.am 
 
 BUILT_SOURCES += \
   CosConcurrencyControlS_T.cpp \
-  CosConcurrencyControlC.inl \
-  CosConcurrencyControlS.inl \
-  CosConcurrencyControlS_T.inl \
   CosConcurrencyControlC.cpp \
   CosConcurrencyControlS.cpp \
   CosConcurrencyControlC.h \
   CosConcurrencyControlS.h \
-  CosConcurrencyControlS_T.h
+  CosConcurrencyControlS_T.h \
+  CosConcurrencyControlC.inl \
+  CosConcurrencyControlS.inl \
+  CosConcurrencyControlS_T.inl
 
 CLEANFILES += \
   CosConcurrencyControlS_T.cpp \
-  CosConcurrencyControlC.inl \
-  CosConcurrencyControlS.inl \
-  CosConcurrencyControlS_T.inl \
   CosConcurrencyControlC.cpp \
   CosConcurrencyControlS.cpp \
   CosConcurrencyControlC.h \
   CosConcurrencyControlS.h \
   CosConcurrencyControlS_T.h \
-  CosConcurrencyControl-stamp
-
-CosConcurrencyControlS_T.cpp CosConcurrencyControlC.inl CosConcurrencyControlS.inl CosConcurrencyControlS_T.inl CosConcurrencyControlC.cpp CosConcurrencyControlS.cpp CosConcurrencyControlC.h CosConcurrencyControlS.h CosConcurrencyControlS_T.h: CosConcurrencyControl-stamp
+  CosConcurrencyControlC.inl \
+  CosConcurrencyControlS.inl \
+  CosConcurrencyControlS_T.inl
 
-CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl
-	@touch $@
+CosConcurrencyControlS_T.cpp CosConcurrencyControlC.cpp CosConcurrencyControlS.cpp CosConcurrencyControlC.h CosConcurrencyControlS.h CosConcurrencyControlS_T.h CosConcurrencyControlC.inl CosConcurrencyControlS.inl CosConcurrencyControlS_T.inl: CosConcurrencyControl.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl
 
 Concurrency = \
-  Concurrency/CC_Lock.cpp \
+  CosConcurrencyControlC.cpp \
+  CosConcurrencyControlS.cpp \
   Concurrency/CC_LockSet.cpp \
+  Concurrency/CC_Lock.cpp \
   Concurrency/CC_LockSetFactory.cpp \
   Concurrency/Concurrency_Loader.cpp \
-  Concurrency/Concurrency_Utils.cpp \
-  CosConcurrencyControlC.cpp \
-  CosConcurrencyControlS.cpp
+  Concurrency/Concurrency_Utils.cpp
 
 lib_LTLIBRARIES += libTAO_CosConcurrency.la
 
@@ -398,8 +507,6 @@ libTAO_CosConcurrency_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_CONCURRENCY_BUILD_DLL
 
 libTAO_CosConcurrency_la_SOURCES = \
@@ -409,351 +516,101 @@ libTAO_CosConcurrency_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_CosConcurrency_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Concurrency/CC_Lock.h \
-  Concurrency/CC_LockSet.h \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Channel_Clients_T.h \
+  CosConcurrencyControlS_T.h \
   Concurrency/CC_LockSetFactory.h \
-  Concurrency/Concurrency_Loader.h \
-  Concurrency/Concurrency_Utils.h \
   CosConcurrencyControlC.h \
   CosConcurrencyControlS.h \
-  CosConcurrencyControlS_T.h \
-  CosConcurrencyControlC.inl \
-  CosConcurrencyControlS.inl \
+  Concurrency/Concurrency_Utils.h \
+  Concurrency/CC_LockSet.h \
+  Concurrency/Concurrency_Loader.h \
+  Concurrency/CC_Lock.h \
+  Channel_Clients_T.i \
   CosConcurrencyControlS_T.inl \
   CosConcurrencyControlS_T.cpp \
-  CosConcurrencyControl.idl
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  CosConcurrency.rc
 
 ## Makefile.CosEvent.am 
 
-if !BUILD_MINIMUM_CORBA
-
-BUILT_SOURCES += \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminC.inl \
-  CosEventChannelAdminS_T.inl \
-  CosEventChannelAdminC.cpp \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminS_T.h
-
-CLEANFILES += \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminC.inl \
-  CosEventChannelAdminS_T.inl \
-  CosEventChannelAdminC.cpp \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdmin-stamp
-
-CosEventChannelAdminS_T.cpp CosEventChannelAdminC.inl CosEventChannelAdminS_T.inl CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminS_T.h: CosEventChannelAdmin-stamp
-
-CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosEventCommS_T.cpp \
-  CosEventCommC.inl \
-  CosEventCommS_T.inl \
-  CosEventCommC.cpp \
-  CosEventCommC.h \
-  CosEventCommS_T.h
-
-CLEANFILES += \
-  CosEventCommS_T.cpp \
-  CosEventCommC.inl \
-  CosEventCommS_T.inl \
-  CosEventCommC.cpp \
-  CosEventCommC.h \
-  CosEventCommS_T.h \
-  CosEventComm-stamp
-
-CosEventCommS_T.cpp CosEventCommC.inl CosEventCommS_T.inl CosEventCommC.cpp CosEventCommC.h CosEventCommS_T.h: CosEventComm-stamp
-
-CosEventComm-stamp: $(srcdir)/CosEventComm.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosTypedEventChannelAdminS_T.cpp \
-  CosTypedEventChannelAdminC.inl \
-  CosTypedEventChannelAdminS_T.inl \
-  CosTypedEventChannelAdminC.cpp \
-  CosTypedEventChannelAdminC.h \
-  CosTypedEventChannelAdminS_T.h
-
-CLEANFILES += \
-  CosTypedEventChannelAdminS_T.cpp \
-  CosTypedEventChannelAdminC.inl \
-  CosTypedEventChannelAdminS_T.inl \
-  CosTypedEventChannelAdminC.cpp \
-  CosTypedEventChannelAdminC.h \
-  CosTypedEventChannelAdminS_T.h \
-  CosTypedEventChannelAdmin-stamp
-
-CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS_T.inl CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminS_T.h: CosTypedEventChannelAdmin-stamp
-
-CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl
-	@touch $@
-
 BUILT_SOURCES += \
   CosTypedEventCommS_T.cpp \
-  CosTypedEventCommC.inl \
-  CosTypedEventCommS_T.inl \
   CosTypedEventCommC.cpp \
+  CosTypedEventCommS.cpp \
   CosTypedEventCommC.h \
-  CosTypedEventCommS_T.h
+  CosTypedEventCommS.h \
+  CosTypedEventCommS_T.h \
+  CosTypedEventCommC.inl \
+  CosTypedEventCommS.inl \
+  CosTypedEventCommS_T.inl
 
 CLEANFILES += \
   CosTypedEventCommS_T.cpp \
-  CosTypedEventCommC.inl \
-  CosTypedEventCommS_T.inl \
   CosTypedEventCommC.cpp \
+  CosTypedEventCommS.cpp \
   CosTypedEventCommC.h \
+  CosTypedEventCommS.h \
   CosTypedEventCommS_T.h \
-  CosTypedEventComm-stamp
-
-CosTypedEventCommS_T.cpp CosTypedEventCommC.inl CosTypedEventCommS_T.inl CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommS_T.h: CosTypedEventComm-stamp
-
-CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl
-	@touch $@
+  CosTypedEventCommC.inl \
+  CosTypedEventCommS.inl \
+  CosTypedEventCommS_T.inl
 
-lib_LTLIBRARIES += libTAO_CosEvent.la
+CosTypedEventCommS_T.cpp CosTypedEventCommC.cpp CosTypedEventCommS.cpp CosTypedEventCommC.h CosTypedEventCommS.h CosTypedEventCommS_T.h CosTypedEventCommC.inl CosTypedEventCommS.inl CosTypedEventCommS_T.inl: CosTypedEventComm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosTypedEventComm.idl
 
-libTAO_CosEvent_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENT_BUILD_DLL
-
-libTAO_CosEvent_la_SOURCES = \
-  CosEventChannelAdminC.cpp \
-  CosEventCommC.cpp \
+BUILT_SOURCES += \
+  CosTypedEventChannelAdminS_T.cpp \
   CosTypedEventChannelAdminC.cpp \
-  CosTypedEventCommC.cpp
-
-libTAO_CosEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosEvent_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminS_T.h \
-  CosEventCommC.h \
-  CosEventCommS_T.h \
+  CosTypedEventChannelAdminS.cpp \
   CosTypedEventChannelAdminC.h \
+  CosTypedEventChannelAdminS.h \
   CosTypedEventChannelAdminS_T.h \
-  CosTypedEventCommC.h \
-  CosTypedEventCommS_T.h \
-  CosEventChannelAdminC.inl \
-  CosEventChannelAdminS_T.inl \
-  CosEventCommC.inl \
-  CosEventCommS_T.inl \
   CosTypedEventChannelAdminC.inl \
-  CosTypedEventChannelAdminS_T.inl \
-  CosTypedEventCommC.inl \
-  CosTypedEventCommS_T.inl \
-  CosEventChannelAdminS_T.cpp \
-  CosEventCommS_T.cpp \
-  CosTypedEventChannelAdminS_T.cpp \
-  CosTypedEventCommS_T.cpp \
-  CosEventChannelAdmin.idl \
-  CosEventComm.idl \
-  CosTypedEventChannelAdmin.idl \
-  CosTypedEventComm.idl
-
-endif !BUILD_MINIMUM_CORBA
-
-EXTRA_DIST += \
-  CosEvent.rc
-
-## Makefile.Svc_Utils.am 
-
-BUILT_SOURCES += \
-  RtecBaseS_T.cpp \
-  RtecBaseC.inl \
-  RtecBaseS.inl \
-  RtecBaseS_T.inl \
-  RtecBaseC.cpp \
-  RtecBaseS.cpp \
-  RtecBaseC.h \
-  RtecBaseS.h \
-  RtecBaseS_T.h
-
-CLEANFILES += \
-  RtecBaseS_T.cpp \
-  RtecBaseC.inl \
-  RtecBaseS.inl \
-  RtecBaseS_T.inl \
-  RtecBaseC.cpp \
-  RtecBaseS.cpp \
-  RtecBaseC.h \
-  RtecBaseS.h \
-  RtecBaseS_T.h \
-  RtecBase-stamp
-
-RtecBaseS_T.cpp RtecBaseC.inl RtecBaseS.inl RtecBaseS_T.inl RtecBaseC.cpp RtecBaseS.cpp RtecBaseC.h RtecBaseS.h RtecBaseS_T.h: RtecBase-stamp
-
-RtecBase-stamp: $(srcdir)/RtecBase.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TimeBaseS_T.cpp \
-  TimeBaseC.inl \
-  TimeBaseS.inl \
-  TimeBaseS_T.inl \
-  TimeBaseC.cpp \
-  TimeBaseS.cpp \
-  TimeBaseC.h \
-  TimeBaseS.h \
-  TimeBaseS_T.h
+  CosTypedEventChannelAdminS.inl \
+  CosTypedEventChannelAdminS_T.inl
 
 CLEANFILES += \
-  TimeBaseS_T.cpp \
-  TimeBaseC.inl \
-  TimeBaseS.inl \
-  TimeBaseS_T.inl \
-  TimeBaseC.cpp \
-  TimeBaseS.cpp \
-  TimeBaseC.h \
-  TimeBaseS.h \
-  TimeBaseS_T.h \
-  TimeBase-stamp
-
-TimeBaseS_T.cpp TimeBaseC.inl TimeBaseS.inl TimeBaseS_T.inl TimeBaseC.cpp TimeBaseS.cpp TimeBaseC.h TimeBaseS.h TimeBaseS_T.h: TimeBase-stamp
-
-TimeBase-stamp: $(srcdir)/TimeBase.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Svc_Utils.la
-
-libTAO_Svc_Utils_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_SVC_UTILS_BUILD_DLL
-
-libTAO_Svc_Utils_la_SOURCES = \
-  IOR_Multicast.cpp \
-  RtecBaseC.cpp \
-  RtecBaseS.cpp \
-  Shutdown_Utilities.cpp \
-  TimeBaseC.cpp \
-  TimeBaseS.cpp \
-  Time_Utilities.cpp
-
-libTAO_Svc_Utils_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Svc_Utils_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IOR_Multicast.h \
-  RtecBaseC.h \
-  RtecBaseS.h \
-  RtecBaseS_T.h \
-  Shutdown_Utilities.h \
-  TimeBaseC.h \
-  TimeBaseS.h \
-  TimeBaseS_T.h \
-  Time_Utilities.h \
-  RtecBaseC.inl \
-  RtecBaseS.inl \
-  RtecBaseS_T.inl \
-  TimeBaseC.inl \
-  TimeBaseS.inl \
-  TimeBaseS_T.inl \
-  Time_Utilities.i \
-  RtecBaseS_T.cpp \
-  TimeBaseS_T.cpp \
-  RtecBase.idl \
-  TimeBase.idl
-
-EXTRA_DIST += \
-  Svc_Utils.rc
-
-## Makefile.CosEvent_Skel.am 
-
-if !BUILD_MINIMUM_CORBA
-
-lib_LTLIBRARIES += libTAO_CosEvent_Skel.la
-
-libTAO_CosEvent_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENT_SKEL_BUILD_DLL
-
-libTAO_CosEvent_Skel_la_SOURCES = \
-  CosEventChannelAdminS.cpp \
-  CosEventCommS.cpp \
+  CosTypedEventChannelAdminS_T.cpp \
+  CosTypedEventChannelAdminC.cpp \
   CosTypedEventChannelAdminS.cpp \
-  CosTypedEventCommS.cpp
-
-libTAO_CosEvent_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosEvent_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
+  CosTypedEventChannelAdminC.h \
   CosTypedEventChannelAdminS.h \
-  CosTypedEventCommS.h \
-  CosEventChannelAdminS.inl \
-  CosEventCommS.inl \
+  CosTypedEventChannelAdminS_T.h \
+  CosTypedEventChannelAdminC.inl \
   CosTypedEventChannelAdminS.inl \
-  CosTypedEventCommS.inl
-
-endif !BUILD_MINIMUM_CORBA
+  CosTypedEventChannelAdminS_T.inl
 
-EXTRA_DIST += \
-  CosEvent_Skel.rc
-
-## Makefile.CosEvent_Serv.am 
-
-if !BUILD_MINIMUM_CORBA
+CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS_T.h CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.inl: CosTypedEventChannelAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosTypedEventChannelAdmin.idl
 
 CosEvent = \
+  CosTypedEventCommC.cpp \
+  CosTypedEventChannelAdminC.cpp \
+  CosTypedEventCommS.cpp \
+  CosTypedEventChannelAdminS.cpp \
+  CosEvent/CEC_TypedEvent.cpp \
+  CosEvent/CEC_TypedEventChannel.cpp \
+  CosEvent/CEC_TypedProxyPushConsumer.cpp \
+  CosEvent/CEC_TypedConsumerAdmin.cpp \
+  CosEvent/CEC_TypedSupplierAdmin.cpp \
+  CosEvent/CEC_DynamicImplementation.cpp \
+  CosEventCommC.cpp \
+  CosEventChannelAdminC.cpp \
+  CosEventCommS.cpp \
+  CosEventChannelAdminS.cpp \
   CosEvent/CEC_ConsumerAdmin.cpp \
   CosEvent/CEC_ConsumerControl.cpp \
   CosEvent/CEC_Default_Factory.cpp \
   CosEvent/CEC_Dispatching.cpp \
   CosEvent/CEC_Dispatching_Task.cpp \
-  CosEvent/CEC_DynamicImplementation.cpp \
   CosEvent/CEC_EventChannel.cpp \
   CosEvent/CEC_Event_Loader.cpp \
   CosEvent/CEC_Factory.cpp \
@@ -767,160 +624,172 @@ CosEvent = \
   CosEvent/CEC_Reactive_Pulling_Strategy.cpp \
   CosEvent/CEC_Reactive_SupplierControl.cpp \
   CosEvent/CEC_SupplierAdmin.cpp \
-  CosEvent/CEC_SupplierControl.cpp \
-  CosEvent/CEC_TypedConsumerAdmin.cpp \
-  CosEvent/CEC_TypedEvent.cpp \
-  CosEvent/CEC_TypedEventChannel.cpp \
-  CosEvent/CEC_TypedProxyPushConsumer.cpp \
-  CosEvent/CEC_TypedSupplierAdmin.cpp
+  CosEvent/CEC_SupplierControl.cpp
 
-lib_LTLIBRARIES += libTAO_CosEvent_Serv.la
+lib_LTLIBRARIES += libTAO_CosEvent.la
 
-libTAO_CosEvent_Serv_la_CPPFLAGS = \
+libTAO_CosEvent_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
   -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENT_SERV_BUILD_DLL
+  -DTAO_EVENT_BUILD_DLL -DTAO_NOTIFY_BUILD_DLL
 
-libTAO_CosEvent_Serv_la_SOURCES = \
+libTAO_CosEvent_la_SOURCES = \
   $(CosEvent)
 
-libTAO_CosEvent_Serv_la_LDFLAGS = \
+libTAO_CosEvent_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_CosEvent_Serv_la_LIBADD = \
-  libTAO_Svc_Utils.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosEvent/CEC_ConsumerAdmin.h \
+libTAO_CosEvent_la_LIBADD = \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IFR_Client.la \
+ $(top_builddir)/tao/libTAO_DynamicInterface.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la 
+
+noinst_HEADERS += \
+  CosEvent/CEC_Factory.h \
+  CosEvent/CEC_Pulling_Strategy.h \
+  CosEvent/CEC_DynamicImplementation.h \
   CosEvent/CEC_ConsumerControl.h \
-  CosEvent/CEC_Default_Factory.h \
+  CosTypedEventChannelAdminC.h \
+  CosTypedEventCommC.h \
+  CosTypedEventChannelAdminS.h \
+  CosTypedEventCommS.h \
   CosEvent/CEC_Dispatching.h \
-  CosEvent/CEC_Dispatching_Task.h \
-  CosEvent/CEC_DynamicImplementation.h \
-  CosEvent/CEC_EventChannel.h \
-  CosEvent/CEC_Event_Loader.h \
-  CosEvent/CEC_Factory.h \
-  CosEvent/CEC_MT_Dispatching.h \
-  CosEvent/CEC_ProxyPullConsumer.h \
-  CosEvent/CEC_ProxyPullSupplier.h \
-  CosEvent/CEC_ProxyPushConsumer.h \
+  CosEvent/CEC_ConsumerAdmin.h \
   CosEvent/CEC_ProxyPushSupplier.h \
-  CosEvent/CEC_Pulling_Strategy.h \
-  CosEvent/CEC_Reactive_ConsumerControl.h \
-  CosEvent/CEC_Reactive_Pulling_Strategy.h \
-  CosEvent/CEC_Reactive_SupplierControl.h \
-  CosEvent/CEC_SupplierAdmin.h \
-  CosEvent/CEC_SupplierControl.h \
+  CosEvent/CEC_ProxyPushConsumer.h \
+  CosEventChannelAdminC.h \
   CosEvent/CEC_TypedConsumerAdmin.h \
+  CosEventChannelAdminS.h \
+  CosEvent/CEC_EventChannel.h \
+  CosEventCommC.h \
+  CosEventCommS.h \
+  CosEvent/CEC_SupplierAdmin.h \
+  CosEvent/CEC_ProxyPullSupplier.h \
+  CosEvent/CEC_ProxyPullConsumer.h \
   CosEvent/CEC_TypedEvent.h \
   CosEvent/CEC_TypedEventChannel.h \
-  CosEvent/CEC_TypedProxyPushConsumer.h \
+  CosEvent/CEC_Reactive_SupplierControl.h \
   CosEvent/CEC_TypedSupplierAdmin.h \
-  CosEvent/CEC_ConsumerAdmin.i \
+  CosEvent/CEC_Default_Factory.h \
+  CosEvent/CEC_TypedProxyPushConsumer.h \
+  CosEvent/CEC_SupplierControl.h \
+  CosEvent/CEC_Dispatching_Task.h \
+  CosEvent/CEC_Reactive_ConsumerControl.h \
+  CosEvent/CEC_Event_Loader.h \
+  CosEvent/CEC_Reactive_Pulling_Strategy.h \
+  CosEvent/CEC_MT_Dispatching.h \
+  CosTypedEventChannelAdminS_T.h \
+  CosEventChannelAdminS_T.h \
+  Channel_Clients_T.h \
+  CosTypedEventCommS_T.h \
+  CosEventCommS_T.h \
+  CosEvent/CEC_Factory.i \
+  CosEvent/CEC_Pulling_Strategy.i \
+  CosEvent/CEC_DynamicImplementation.i \
   CosEvent/CEC_ConsumerControl.i \
-  CosEvent/CEC_Default_Factory.i \
+  CosTypedEventChannelAdminC.inl \
+  CosTypedEventCommC.inl \
+  CosTypedEventChannelAdminS.inl \
+  CosTypedEventCommS.inl \
   CosEvent/CEC_Dispatching.i \
-  CosEvent/CEC_Dispatching_Task.i \
-  CosEvent/CEC_DynamicImplementation.i \
-  CosEvent/CEC_EventChannel.i \
-  CosEvent/CEC_Factory.i \
-  CosEvent/CEC_MT_Dispatching.i \
-  CosEvent/CEC_ProxyPullConsumer.i \
-  CosEvent/CEC_ProxyPullSupplier.i \
-  CosEvent/CEC_ProxyPushConsumer.i \
+  CosEvent/CEC_ConsumerAdmin.i \
   CosEvent/CEC_ProxyPushSupplier.i \
-  CosEvent/CEC_Pulling_Strategy.i \
-  CosEvent/CEC_Reactive_ConsumerControl.i \
-  CosEvent/CEC_Reactive_Pulling_Strategy.i \
-  CosEvent/CEC_Reactive_SupplierControl.i \
-  CosEvent/CEC_SupplierAdmin.i \
-  CosEvent/CEC_SupplierControl.i \
+  CosEvent/CEC_ProxyPushConsumer.i \
+  CosEventChannelAdminC.inl \
   CosEvent/CEC_TypedConsumerAdmin.i \
+  CosEventChannelAdminS.inl \
+  CosEvent/CEC_EventChannel.i \
+  CosEventCommC.inl \
+  CosEventCommS.inl \
+  CosEvent/CEC_SupplierAdmin.i \
+  CosEvent/CEC_ProxyPullSupplier.i \
+  CosEvent/CEC_ProxyPullConsumer.i \
   CosEvent/CEC_TypedEvent.i \
   CosEvent/CEC_TypedEventChannel.i \
+  CosEvent/CEC_Reactive_SupplierControl.i \
+  CosEvent/CEC_TypedSupplierAdmin.i \
+  CosEvent/CEC_Default_Factory.i \
   CosEvent/CEC_TypedProxyPushConsumer.i \
-  CosEvent/CEC_TypedSupplierAdmin.i
-
-endif !BUILD_MINIMUM_CORBA
+  CosEvent/CEC_SupplierControl.i \
+  CosEvent/CEC_Dispatching_Task.i \
+  CosEvent/CEC_Reactive_ConsumerControl.i \
+  CosEvent/CEC_Reactive_Pulling_Strategy.i \
+  CosEvent/CEC_MT_Dispatching.i \
+  CosTypedEventChannelAdminS_T.inl \
+  CosEventChannelAdminS_T.inl \
+  Channel_Clients_T.i \
+  CosTypedEventCommS_T.inl \
+  CosEventCommS_T.inl \
+  CosTypedEventCommS_T.cpp \
+  CosTypedEventChannelAdminS_T.cpp \
+  CosEventCommS_T.cpp \
+  CosEventChannelAdminS_T.cpp \
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  CosEvent_Serv.rc
 
 ## Makefile.CosLifeCycle.am 
 
 BUILT_SOURCES += \
   CosLifeCycleS_T.cpp \
-  CosLifeCycleC.inl \
-  CosLifeCycleS.inl \
-  CosLifeCycleS_T.inl \
   CosLifeCycleC.cpp \
   CosLifeCycleS.cpp \
   CosLifeCycleC.h \
   CosLifeCycleS.h \
-  CosLifeCycleS_T.h
+  CosLifeCycleS_T.h \
+  CosLifeCycleC.inl \
+  CosLifeCycleS.inl \
+  CosLifeCycleS_T.inl
 
 CLEANFILES += \
   CosLifeCycleS_T.cpp \
-  CosLifeCycleC.inl \
-  CosLifeCycleS.inl \
-  CosLifeCycleS_T.inl \
   CosLifeCycleC.cpp \
   CosLifeCycleS.cpp \
   CosLifeCycleC.h \
   CosLifeCycleS.h \
   CosLifeCycleS_T.h \
-  CosLifeCycle-stamp
-
-CosLifeCycleS_T.cpp CosLifeCycleC.inl CosLifeCycleS.inl CosLifeCycleS_T.inl CosLifeCycleC.cpp CosLifeCycleS.cpp CosLifeCycleC.h CosLifeCycleS.h CosLifeCycleS_T.h: CosLifeCycle-stamp
+  CosLifeCycleC.inl \
+  CosLifeCycleS.inl \
+  CosLifeCycleS_T.inl
 
-CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl
-	@touch $@
+CosLifeCycleS_T.cpp CosLifeCycleC.cpp CosLifeCycleS.cpp CosLifeCycleC.h CosLifeCycleS.h CosLifeCycleS_T.h CosLifeCycleC.inl CosLifeCycleS.inl CosLifeCycleS_T.inl: CosLifeCycle.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl
 
 BUILT_SOURCES += \
   LifeCycleServiceS_T.cpp \
-  LifeCycleServiceC.inl \
-  LifeCycleServiceS.inl \
-  LifeCycleServiceS_T.inl \
   LifeCycleServiceC.cpp \
   LifeCycleServiceS.cpp \
   LifeCycleServiceC.h \
   LifeCycleServiceS.h \
-  LifeCycleServiceS_T.h
+  LifeCycleServiceS_T.h \
+  LifeCycleServiceC.inl \
+  LifeCycleServiceS.inl \
+  LifeCycleServiceS_T.inl
 
 CLEANFILES += \
   LifeCycleServiceS_T.cpp \
-  LifeCycleServiceC.inl \
-  LifeCycleServiceS.inl \
-  LifeCycleServiceS_T.inl \
   LifeCycleServiceC.cpp \
   LifeCycleServiceS.cpp \
   LifeCycleServiceC.h \
   LifeCycleServiceS.h \
   LifeCycleServiceS_T.h \
-  LifeCycleService-stamp
-
-LifeCycleServiceS_T.cpp LifeCycleServiceC.inl LifeCycleServiceS.inl LifeCycleServiceS_T.inl LifeCycleServiceC.cpp LifeCycleServiceS.cpp LifeCycleServiceC.h LifeCycleServiceS.h LifeCycleServiceS_T.h: LifeCycleService-stamp
+  LifeCycleServiceC.inl \
+  LifeCycleServiceS.inl \
+  LifeCycleServiceS_T.inl
 
-LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl
-	@touch $@
+LifeCycleServiceS_T.cpp LifeCycleServiceC.cpp LifeCycleServiceS.cpp LifeCycleServiceC.h LifeCycleServiceS.h LifeCycleServiceS_T.h LifeCycleServiceC.inl LifeCycleServiceS.inl LifeCycleServiceS_T.inl: LifeCycleService.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl
 
 LifeCycle = \
   CosLifeCycleC.cpp \
@@ -935,8 +804,6 @@ libTAO_CosLifeCycle_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_LIFECYCLE_BUILD_DLL
 
 libTAO_CosLifeCycle_la_SOURCES = \
@@ -946,97 +813,84 @@ libTAO_CosLifeCycle_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_CosLifeCycle_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosLifeCycleC.h \
-  CosLifeCycleS.h \
-  CosLifeCycleS_T.h \
-  LifeCycleServiceC.h \
-  LifeCycleServiceS.h \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
   LifeCycleServiceS_T.h \
-  CosLifeCycleC.inl \
-  CosLifeCycleS.inl \
-  CosLifeCycleS_T.inl \
-  LifeCycleServiceC.inl \
-  LifeCycleServiceS.inl \
+  Channel_Clients_T.h \
+  CosLifeCycleS_T.h \
   LifeCycleServiceS_T.inl \
+  Channel_Clients_T.i \
+  CosLifeCycleS_T.inl \
   CosLifeCycleS_T.cpp \
   LifeCycleServiceS_T.cpp \
-  CosLifeCycle.idl \
-  LifeCycleService.idl
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  CosLifeCycle.rc
 
 ## Makefile.FTORB_Utils.am 
 
-if !BUILD_MINIMUM_CORBA
+BUILT_SOURCES += \
+  PortableGroup_Simple_DSS_T.cpp \
+  PortableGroup_Simple_DSC.cpp \
+  PortableGroup_Simple_DSC.h \
+  PortableGroup_Simple_DSS.h \
+  PortableGroup_Simple_DSS_T.h \
+  PortableGroup_Simple_DSC.inl \
+  PortableGroup_Simple_DSS.inl \
+  PortableGroup_Simple_DSS_T.inl
+
+CLEANFILES += \
+  PortableGroup_Simple_DSS_T.cpp \
+  PortableGroup_Simple_DSC.cpp \
+  PortableGroup_Simple_DSC.h \
+  PortableGroup_Simple_DSS.h \
+  PortableGroup_Simple_DSS_T.h \
+  PortableGroup_Simple_DSC.inl \
+  PortableGroup_Simple_DSS.inl \
+  PortableGroup_Simple_DSS_T.inl
+
+PortableGroup_Simple_DSS_T.cpp PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSS.h PortableGroup_Simple_DSS_T.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl: PortableGroup_Simple_DS.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/PortableGroup_Simple_DS.idl
 
 BUILT_SOURCES += \
   FT_CORBA_ORBS_T.cpp \
-  FT_CORBA_ORBC.inl \
-  FT_CORBA_ORBS.inl \
-  FT_CORBA_ORBS_T.inl \
   FT_CORBA_ORBC.cpp \
   FT_CORBA_ORBS.cpp \
   FT_CORBA_ORBC.h \
   FT_CORBA_ORBS.h \
-  FT_CORBA_ORBS_T.h
+  FT_CORBA_ORBS_T.h \
+  FT_CORBA_ORBC.inl \
+  FT_CORBA_ORBS.inl \
+  FT_CORBA_ORBS_T.inl
 
 CLEANFILES += \
   FT_CORBA_ORBS_T.cpp \
-  FT_CORBA_ORBC.inl \
-  FT_CORBA_ORBS.inl \
-  FT_CORBA_ORBS_T.inl \
   FT_CORBA_ORBC.cpp \
   FT_CORBA_ORBS.cpp \
   FT_CORBA_ORBC.h \
   FT_CORBA_ORBS.h \
   FT_CORBA_ORBS_T.h \
-  FT_CORBA_ORB-stamp
-
-FT_CORBA_ORBS_T.cpp FT_CORBA_ORBC.inl FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.inl FT_CORBA_ORBC.cpp FT_CORBA_ORBS.cpp FT_CORBA_ORBC.h FT_CORBA_ORBS.h FT_CORBA_ORBS_T.h: FT_CORBA_ORB-stamp
-
-FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableGroup_Simple_DSS_T.cpp \
-  PortableGroup_Simple_DSC.inl \
-  PortableGroup_Simple_DSS.inl \
-  PortableGroup_Simple_DSS_T.inl \
-  PortableGroup_Simple_DSC.cpp \
-  PortableGroup_Simple_DSC.h \
-  PortableGroup_Simple_DSS.h \
-  PortableGroup_Simple_DSS_T.h
-
-CLEANFILES += \
-  PortableGroup_Simple_DSS_T.cpp \
-  PortableGroup_Simple_DSC.inl \
-  PortableGroup_Simple_DSS.inl \
-  PortableGroup_Simple_DSS_T.inl \
-  PortableGroup_Simple_DSC.cpp \
-  PortableGroup_Simple_DSC.h \
-  PortableGroup_Simple_DSS.h \
-  PortableGroup_Simple_DSS_T.h \
-  PortableGroup_Simple_DS-stamp
-
-PortableGroup_Simple_DSS_T.cpp PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSS.h PortableGroup_Simple_DSS_T.h: PortableGroup_Simple_DS-stamp
+  FT_CORBA_ORBC.inl \
+  FT_CORBA_ORBS.inl \
+  FT_CORBA_ORBS_T.inl
 
-PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/PortableGroup_Simple_DS.idl
-	@touch $@
+FT_CORBA_ORBS_T.cpp FT_CORBA_ORBC.cpp FT_CORBA_ORBS.cpp FT_CORBA_ORBC.h FT_CORBA_ORBS.h FT_CORBA_ORBS_T.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.inl: FT_CORBA_ORB.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl
 
 FTORB_Utils = \
+  PortableGroup_Simple_DSC.cpp \
   FT_CORBA_ORBC.cpp \
   FT_CORBA_ORBS.cpp \
-  FaultTolerance/FT_IOGR_Property.cpp \
-  PortableGroup_Simple_DSC.cpp
+  FaultTolerance/FT_IOGR_Property.cpp
 
 lib_LTLIBRARIES += libTAO_FTORB_Utils.la
 
@@ -1045,8 +899,6 @@ libTAO_FTORB_Utils_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_FT_ORB_UTILS_BUILD_DLL
 
 libTAO_FTORB_Utils_la_SOURCES = \
@@ -1056,94 +908,90 @@ libTAO_FTORB_Utils_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_FTORB_Utils_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FT_CORBA_ORBC.h \
-  FT_CORBA_ORBS.h \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORManip.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Channel_Clients_T.h \
+  PortableGroup_Simple_DSS_T.h \
   FT_CORBA_ORBS_T.h \
   FaultTolerance/FT_IOGR_Property.h \
-  PortableGroup_Simple_DSC.h \
-  PortableGroup_Simple_DSS_T.h \
-  FT_CORBA_ORBC.inl \
-  FT_CORBA_ORBS.inl \
+  FT_CORBA_ORBC.h \
+  FT_CORBA_ORBS.h \
+  Channel_Clients_T.i \
+  PortableGroup_Simple_DSS_T.inl \
   FT_CORBA_ORBS_T.inl \
   FaultTolerance/FT_IOGR_Property.i \
-  PortableGroup_Simple_DSC.inl \
-  PortableGroup_Simple_DSS_T.inl \
-  FT_CORBA_ORBS_T.cpp \
+  FT_CORBA_ORBC.inl \
+  FT_CORBA_ORBS.inl \
   PortableGroup_Simple_DSS_T.cpp \
-  FT_CORBA_ORB.idl \
-  PortableGroup_Simple_DS.idl
+  FT_CORBA_ORBS_T.cpp \
+  Channel_Clients_T.cpp
 
-endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.PortableGroup.am 
 
-if !BUILD_MINIMUM_CORBA
+BUILT_SOURCES += \
+  miopS_T.cpp \
+  miopC.cpp \
+  miopS.cpp \
+  miopC.h \
+  miopS.h \
+  miopS_T.h \
+  miopC.inl \
+  miopS.inl \
+  miopS_T.inl
+
+CLEANFILES += \
+  miopS_T.cpp \
+  miopC.cpp \
+  miopS.cpp \
+  miopC.h \
+  miopS.h \
+  miopS_T.h \
+  miopC.inl \
+  miopS.inl \
+  miopS_T.inl
+
+miopS_T.cpp miopC.cpp miopS.cpp miopC.h miopS.h miopS_T.h miopC.inl miopS.inl miopS_T.inl: miop.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h $(srcdir)/miop.idl
 
 BUILT_SOURCES += \
   PortableGroupS_T.cpp \
-  PortableGroupC.inl \
-  PortableGroupS.inl \
-  PortableGroupS_T.inl \
   PortableGroupC.cpp \
   PortableGroupS.cpp \
   PortableGroupC.h \
   PortableGroupS.h \
-  PortableGroupS_T.h
+  PortableGroupS_T.h \
+  PortableGroupC.inl \
+  PortableGroupS.inl \
+  PortableGroupS_T.inl
 
 CLEANFILES += \
   PortableGroupS_T.cpp \
-  PortableGroupC.inl \
-  PortableGroupS.inl \
-  PortableGroupS_T.inl \
   PortableGroupC.cpp \
   PortableGroupS.cpp \
   PortableGroupC.h \
   PortableGroupS.h \
   PortableGroupS_T.h \
-  PortableGroup-stamp
-
-PortableGroupS_T.cpp PortableGroupC.inl PortableGroupS.inl PortableGroupS_T.inl PortableGroupC.cpp PortableGroupS.cpp PortableGroupC.h PortableGroupS.h PortableGroupS_T.h: PortableGroup-stamp
-
-PortableGroup-stamp: $(srcdir)/PortableGroup.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl
-	@touch $@
+  PortableGroupC.inl \
+  PortableGroupS.inl \
+  PortableGroupS_T.inl
 
-BUILT_SOURCES += \
-  miopS_T.cpp \
-  miopC.inl \
-  miopS.inl \
-  miopS_T.inl \
-  miopC.cpp \
-  miopS.cpp \
-  miopC.h \
-  miopS.h \
-  miopS_T.h
+PortableGroupS_T.cpp PortableGroupC.cpp PortableGroupS.cpp PortableGroupC.h PortableGroupS.h PortableGroupS_T.h PortableGroupC.inl PortableGroupS.inl PortableGroupS_T.inl: PortableGroup.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl
 
-CLEANFILES += \
-  miopS_T.cpp \
-  miopC.inl \
-  miopS.inl \
-  miopS_T.inl \
+PortableGroup = \
   miopC.cpp \
   miopS.cpp \
-  miopC.h \
-  miopS.h \
-  miopS_T.h \
-  miop-stamp
-
-miopS_T.cpp miopC.inl miopS.inl miopS_T.inl miopC.cpp miopS.cpp miopC.h miopS.h miopS_T.h: miop-stamp
-
-miop-stamp: $(srcdir)/miop.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl
-	@touch $@
-
-PortableGroup = \
+  PortableGroupC.cpp \
+  PortableGroupS.cpp \
+  PortableGroup_Simple_DSC.cpp \
   PortableGroup/PG_Default_Property_Validator.cpp \
   PortableGroup/PG_FactoryRegistry.cpp \
   PortableGroup/PG_Factory_Map.cpp \
@@ -1151,15 +999,15 @@ PortableGroup = \
   PortableGroup/PG_GenericFactory.cpp \
   PortableGroup/PG_Group_Factory.cpp \
   PortableGroup/PG_Group_Guard.cpp \
+  PortableGroup/PG_Null_Property_Validator.cpp \
   PortableGroup/PG_Location_Equal_To.cpp \
   PortableGroup/PG_Location_Hash.cpp \
   PortableGroup/PG_Location_Map.cpp \
   PortableGroup/PG_MemberInfo.cpp \
-  PortableGroup/PG_Null_Property_Validator.cpp \
+  PortableGroup/PG_Object_Group_Manipulator.cpp \
   PortableGroup/PG_ObjectGroupManager.cpp \
   PortableGroup/PG_ObjectGroup_Map.cpp \
   PortableGroup/PG_Object_Group.cpp \
-  PortableGroup/PG_Object_Group_Manipulator.cpp \
   PortableGroup/PG_Operators.cpp \
   PortableGroup/PG_Properties_Encoder.cpp \
   PortableGroup/PG_Properties_Support.cpp \
@@ -1168,10 +1016,11 @@ PortableGroup = \
   PortableGroup/PG_Property_Utils.cpp \
   PortableGroup/PG_Utils.cpp \
   PortableGroup/POA_Hooks.cpp \
-  PortableGroup/PortableGroup_Acceptor_Registry.cpp \
   PortableGroup/PortableGroup_Loader.cpp \
+  PortableGroup/PortableGroup_Acceptor_Registry.cpp \
   PortableGroup/PortableGroup_ORBInitializer.cpp \
   PortableGroup/PortableGroup_Request_Dispatcher.cpp \
+  PortableGroup/UIPMC_Transport.cpp \
   PortableGroup/Portable_Group_Map.cpp \
   PortableGroup/UIPMC_Acceptor.cpp \
   PortableGroup/UIPMC_Connection_Handler.cpp \
@@ -1180,13 +1029,7 @@ PortableGroup = \
   PortableGroup/UIPMC_Factory.cpp \
   PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp \
   PortableGroup/UIPMC_Profile.cpp \
-  PortableGroup/UIPMC_Transport.cpp \
-  PortableGroup/UIPMC_Wait_Never.cpp \
-  PortableGroupC.cpp \
-  PortableGroupS.cpp \
-  PortableGroup_Simple_DSC.cpp \
-  miopC.cpp \
-  miopS.cpp
+  PortableGroup/UIPMC_Wait_Never.cpp
 
 lib_LTLIBRARIES += libTAO_PortableGroup.la
 
@@ -1195,8 +1038,6 @@ libTAO_PortableGroup_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_PORTABLEGROUP_BUILD_DLL
 
 libTAO_PortableGroup_la_SOURCES = \
@@ -1206,174 +1047,161 @@ libTAO_PortableGroup_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_PortableGroup_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  PortableGroup/PG_Default_Property_Validator.h \
-  PortableGroup/PG_FactoryRegistry.h \
+ $(top_builddir)/tao/libTAO_IORManip.la \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
   PortableGroup/PG_Factory_Map.h \
-  PortableGroup/PG_Factory_Set.h \
-  PortableGroup/PG_GenericFactory.h \
+  PortableGroup/PG_Location_Map.h \
   PortableGroup/PG_Group_Factory.h \
-  PortableGroup/PG_Group_Guard.h \
-  PortableGroup/PG_Location_Equal_To.h \
+  PortableGroup/PG_PropertyManager.h \
+  PortableGroup/PG_Null_Property_Validator.h \
+  PortableGroupC.h \
+  PortableGroupS.h \
+  miopC.h \
+  PortableGroup/PG_Object_Group.h \
+  PortableGroup/UIPMC_Acceptor.h \
+  PortableGroup/PortableGroup_ORBInitializer.h \
+  miopS.h \
+  PortableGroup/UIPMC_Endpoint.h \
+  PortableGroup/PG_Factory_Set.h \
+  PortableGroup/PG_Operators.h \
   PortableGroup/PG_Location_Hash.h \
-  PortableGroup/PG_Location_Map.h \
+  PortableGroup/PG_Group_Guard.h \
+  PortableGroup/UIPMC_Transport.h \
+  PortableGroup/PG_Utils.h \
   PortableGroup/PG_MemberInfo.h \
-  PortableGroup/PG_Null_Property_Validator.h \
+  PortableGroup/Portable_Group_Map.h \
+  PortableGroup/PG_Properties_Support.h \
+  PortableGroup/UIPMC_Wait_Never.h \
   PortableGroup/PG_ObjectGroupManager.h \
+  PortableGroup/POA_Hooks.h \
+  PortableGroup/PG_FactoryRegistry.h \
+  PortableGroup/PG_GenericFactory.h \
+  PortableGroup/UIPMC_Factory.h \
   PortableGroup/PG_ObjectGroup_Map.h \
-  PortableGroup/PG_Object_Group.h \
-  PortableGroup/PG_Object_Group_Manipulator.h \
-  PortableGroup/PG_Operators.h \
+  PortableGroup/PG_Default_Property_Validator.h \
+  PortableGroup/UIPMC_Profile.h \
   PortableGroup/PG_Properties_Encoder.h \
-  PortableGroup/PG_Properties_Support.h \
-  PortableGroup/PG_PropertyManager.h \
+  PortableGroup/UIPMC_Message_Block_Data_Iterator.h \
+  PortableGroup/UIPMC_Connection_Handler.h \
   PortableGroup/PG_Property_Set.h \
-  PortableGroup/PG_Property_Utils.h \
-  PortableGroup/PG_Utils.h \
-  PortableGroup/POA_Hooks.h \
-  PortableGroup/PortableGroup_Acceptor_Registry.h \
   PortableGroup/PortableGroup_Loader.h \
-  PortableGroup/PortableGroup_ORBInitializer.h \
-  PortableGroup/PortableGroup_Request_Dispatcher.h \
-  PortableGroup/Portable_Group_Map.h \
-  PortableGroup/UIPMC_Acceptor.h \
-  PortableGroup/UIPMC_Connection_Handler.h \
+  PortableGroup/PG_Object_Group_Manipulator.h \
   PortableGroup/UIPMC_Connector.h \
-  PortableGroup/UIPMC_Endpoint.h \
-  PortableGroup/UIPMC_Factory.h \
-  PortableGroup/UIPMC_Message_Block_Data_Iterator.h \
-  PortableGroup/UIPMC_Profile.h \
-  PortableGroup/UIPMC_Transport.h \
-  PortableGroup/UIPMC_Wait_Never.h \
-  PortableGroupC.h \
-  PortableGroupS.h \
+  PortableGroup/PortableGroup_Request_Dispatcher.h \
+  PortableGroup/PG_Location_Equal_To.h \
+  PortableGroup/PG_Property_Utils.h \
+  PortableGroup/PortableGroup_Acceptor_Registry.h \
   PortableGroupS_T.h \
-  miopC.h \
-  miopS.h \
   miopS_T.h \
-  PortableGroup/PG_Location_Equal_To.inl \
-  PortableGroup/PG_Location_Hash.inl \
-  PortableGroup/PG_Properties_Encoder.inl \
+  Channel_Clients_T.h \
   PortableGroup/UIPMC_Acceptor.i \
-  PortableGroup/UIPMC_Connection_Handler.i \
+  miopS.inl \
   PortableGroup/UIPMC_Endpoint.i \
-  PortableGroup/UIPMC_Profile.i \
+  PortableGroup/PG_Location_Hash.inl \
   PortableGroup/UIPMC_Transport.i \
-  PortableGroupC.inl \
-  PortableGroupS.inl \
+  PortableGroup/UIPMC_Profile.i \
+  PortableGroup/PG_Properties_Encoder.inl \
+  PortableGroup/UIPMC_Connection_Handler.i \
+  PortableGroup/PG_Location_Equal_To.inl \
   PortableGroupS_T.inl \
-  miopC.inl \
-  miopS.inl \
   miopS_T.inl \
-  PortableGroupS_T.cpp \
+  Channel_Clients_T.i \
   miopS_T.cpp \
-  PortableGroup.idl \
-  miop.idl
-
-endif !BUILD_MINIMUM_CORBA
+  PortableGroupS_T.cpp \
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  PortableGroup.rc
 
 ## Makefile.CosLoadBalancing.am 
 
-if BUILD_AMI
-if !BUILD_MINIMUM_CORBA
-
 BUILT_SOURCES += \
   CosLoadBalancingS_T.cpp \
-  CosLoadBalancingC.inl \
-  CosLoadBalancingS.inl \
-  CosLoadBalancingS_T.inl \
   CosLoadBalancingC.cpp \
   CosLoadBalancingS.cpp \
   CosLoadBalancingC.h \
   CosLoadBalancingS.h \
-  CosLoadBalancingS_T.h
+  CosLoadBalancingS_T.h \
+  CosLoadBalancingC.inl \
+  CosLoadBalancingS.inl \
+  CosLoadBalancingS_T.inl
 
 CLEANFILES += \
   CosLoadBalancingS_T.cpp \
-  CosLoadBalancingC.inl \
-  CosLoadBalancingS.inl \
-  CosLoadBalancingS_T.inl \
   CosLoadBalancingC.cpp \
   CosLoadBalancingS.cpp \
   CosLoadBalancingC.h \
   CosLoadBalancingS.h \
   CosLoadBalancingS_T.h \
-  CosLoadBalancing-stamp
-
-CosLoadBalancingS_T.cpp CosLoadBalancingC.inl CosLoadBalancingS.inl CosLoadBalancingS_T.inl CosLoadBalancingC.cpp CosLoadBalancingS.cpp CosLoadBalancingC.h CosLoadBalancingS.h CosLoadBalancingS_T.h: CosLoadBalancing-stamp
+  CosLoadBalancingC.inl \
+  CosLoadBalancingS.inl \
+  CosLoadBalancingS_T.inl
 
-CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl
-	@touch $@
+CosLoadBalancingS_T.cpp CosLoadBalancingC.cpp CosLoadBalancingS.cpp CosLoadBalancingC.h CosLoadBalancingS.h CosLoadBalancingS_T.h CosLoadBalancingC.inl CosLoadBalancingS.inl CosLoadBalancingS_T.inl: CosLoadBalancing.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl
 
 BUILT_SOURCES += \
   LB_ORTS_T.cpp \
-  LB_ORTC.inl \
-  LB_ORTS.inl \
-  LB_ORTS_T.inl \
   LB_ORTC.cpp \
   LB_ORTC.h \
   LB_ORTS.h \
-  LB_ORTS_T.h
+  LB_ORTS_T.h \
+  LB_ORTC.inl \
+  LB_ORTS.inl \
+  LB_ORTS_T.inl
 
 CLEANFILES += \
   LB_ORTS_T.cpp \
-  LB_ORTC.inl \
-  LB_ORTS.inl \
-  LB_ORTS_T.inl \
   LB_ORTC.cpp \
   LB_ORTC.h \
   LB_ORTS.h \
   LB_ORTS_T.h \
-  LB_ORT-stamp
-
-LB_ORTS_T.cpp LB_ORTC.inl LB_ORTS.inl LB_ORTS_T.inl LB_ORTC.cpp LB_ORTC.h LB_ORTS.h LB_ORTS_T.h: LB_ORT-stamp
+  LB_ORTC.inl \
+  LB_ORTS.inl \
+  LB_ORTS_T.inl
 
-LB_ORT-stamp: $(srcdir)/LB_ORT.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl
-	@touch $@
+LB_ORTS_T.cpp LB_ORTC.cpp LB_ORTC.h LB_ORTS.h LB_ORTS_T.h LB_ORTC.inl LB_ORTS.inl LB_ORTS_T.inl: LB_ORT.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl
 
 CosLoadBalancing = \
   CosLoadBalancingC.cpp \
   CosLoadBalancingS.cpp \
   LB_ORTC.cpp \
-  LoadBalancing/LB_CPU_Load_Average_Monitor.cpp \
-  LoadBalancing/LB_CPU_Utilization_Monitor.cpp \
-  LoadBalancing/LB_ClientComponent.cpp \
-  LoadBalancing/LB_ClientORBInitializer.cpp \
-  LoadBalancing/LB_ClientRequestInterceptor.cpp \
-  LoadBalancing/LB_Component.cpp \
-  LoadBalancing/LB_IORInterceptor.cpp \
   LoadBalancing/LB_LeastLoaded.cpp \
+  LoadBalancing/LB_LoadMinimum.cpp \
+  LoadBalancing/LB_LoadAverage.cpp \
   LoadBalancing/LB_LoadAlert.cpp \
   LoadBalancing/LB_LoadAlertInfo.cpp \
   LoadBalancing/LB_LoadAlertMap.cpp \
   LoadBalancing/LB_LoadAlert_Handler.cpp \
-  LoadBalancing/LB_LoadAverage.cpp \
   LoadBalancing/LB_LoadListMap.cpp \
   LoadBalancing/LB_LoadManager.cpp \
   LoadBalancing/LB_LoadMap.cpp \
-  LoadBalancing/LB_LoadMinimum.cpp \
   LoadBalancing/LB_Location_Index_Map.cpp \
   LoadBalancing/LB_MemberLocator.cpp \
   LoadBalancing/LB_MonitorMap.cpp \
-  LoadBalancing/LB_ORBInitializer.cpp \
-  LoadBalancing/LB_ObjectReferenceFactory.cpp \
   LoadBalancing/LB_Pull_Handler.cpp \
   LoadBalancing/LB_Random.cpp \
   LoadBalancing/LB_RoundRobin.cpp \
-  LoadBalancing/LB_ServerRequestInterceptor.cpp
+  LoadBalancing/LB_ClientComponent.cpp \
+  LoadBalancing/LB_ClientORBInitializer.cpp \
+  LoadBalancing/LB_ClientRequestInterceptor.cpp \
+  LoadBalancing/LB_ServerRequestInterceptor.cpp \
+  LoadBalancing/LB_IORInterceptor.cpp \
+  LoadBalancing/LB_ObjectReferenceFactory.cpp \
+  LoadBalancing/LB_ORBInitializer.cpp \
+  LoadBalancing/LB_Component.cpp \
+  LoadBalancing/LB_CPU_Utilization_Monitor.cpp \
+  LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
 
 lib_LTLIBRARIES += libTAO_CosLoadBalancing.la
 
@@ -1382,8 +1210,6 @@ libTAO_CosLoadBalancing_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_LOADBALANCING_BUILD_DLL
 
 libTAO_CosLoadBalancing_la_SOURCES = \
@@ -1393,484 +1219,322 @@ libTAO_CosLoadBalancing_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_CosLoadBalancing_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosLoadBalancingC.h \
-  CosLoadBalancingS.h \
-  CosLoadBalancingS_T.h \
-  LB_ORTC.h \
-  LB_ORTS_T.h \
+ libTAO_PortableGroup.la \
+ $(top_builddir)/tao/libTAO_IORManip.la \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  LoadBalancing/LB_ObjectReferenceFactory.h \
+  LoadBalancing/LB_LoadAlertInfo.h \
+  LoadBalancing/LB_LoadMap.h \
+  LoadBalancing/LB_Component.h \
+  LoadBalancing/LB_LoadAverage.h \
   LoadBalancing/LB_CPU_Load_Average_Monitor.h \
-  LoadBalancing/LB_CPU_Utilization_Monitor.h \
-  LoadBalancing/LB_ClientComponent.h \
   LoadBalancing/LB_ClientORBInitializer.h \
+  LoadBalancing/LB_Pull_Handler.h \
   LoadBalancing/LB_ClientRequestInterceptor.h \
-  LoadBalancing/LB_Component.h \
-  LoadBalancing/LB_IORInterceptor.h \
-  LoadBalancing/LB_LeastLoaded.h \
-  LoadBalancing/LB_LoadAlert.h \
-  LoadBalancing/LB_LoadAlertInfo.h \
-  LoadBalancing/LB_LoadAlertMap.h \
-  LoadBalancing/LB_LoadAlert_Handler.h \
-  LoadBalancing/LB_LoadAverage.h \
-  LoadBalancing/LB_LoadListMap.h \
-  LoadBalancing/LB_LoadManager.h \
-  LoadBalancing/LB_LoadMap.h \
+  LoadBalancing/LB_CPU_Utilization_Monitor.h \
+  CosLoadBalancingC.h \
   LoadBalancing/LB_LoadMinimum.h \
-  LoadBalancing/LB_Location_Index_Map.h \
-  LoadBalancing/LB_MemberLocator.h \
-  LoadBalancing/LB_MonitorMap.h \
+  CosLoadBalancingS.h \
+  LoadBalancing/LB_RoundRobin.h \
   LoadBalancing/LB_ORBInitializer.h \
-  LoadBalancing/LB_ObjectReferenceFactory.h \
-  LoadBalancing/LB_Pull_Handler.h \
+  LoadBalancing/LB_MonitorMap.h \
+  LoadBalancing/LB_LoadAlert_Handler.h \
+  LoadBalancing/LB_LeastLoaded.h \
+  LoadBalancing/LB_LoadManager.h \
   LoadBalancing/LB_Random.h \
-  LoadBalancing/LB_RoundRobin.h \
   LoadBalancing/LB_ServerRequestInterceptor.h \
+  LoadBalancing/LB_Location_Index_Map.h \
+  LoadBalancing/LB_LoadAlertMap.h \
+  LoadBalancing/LB_LoadAlert.h \
+  LB_ORTC.h \
+  LoadBalancing/LB_ClientComponent.h \
+  LoadBalancing/LB_MemberLocator.h \
+  LoadBalancing/LB_IORInterceptor.h \
+  LoadBalancing/LB_LoadListMap.h \
+  Channel_Clients_T.h \
+  LB_ORTS_T.h \
+  CosLoadBalancingS_T.h \
+  LoadBalancing/LB_LoadAverage.inl \
   CosLoadBalancingC.inl \
+  LoadBalancing/LB_LoadMinimum.inl \
   CosLoadBalancingS.inl \
-  CosLoadBalancingS_T.inl \
-  LB_ORTC.inl \
-  LB_ORTS_T.inl \
   LoadBalancing/LB_LeastLoaded.inl \
   LoadBalancing/LB_LoadAlert.inl \
-  LoadBalancing/LB_LoadAverage.inl \
-  LoadBalancing/LB_LoadMinimum.inl \
+  LB_ORTC.inl \
+  Channel_Clients_T.i \
+  LB_ORTS_T.inl \
+  CosLoadBalancingS_T.inl \
   CosLoadBalancingS_T.cpp \
   LB_ORTS_T.cpp \
-  CosLoadBalancing.idl \
-  LB_ORT.idl
+  Channel_Clients_T.cpp
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_AMI
 
-EXTRA_DIST += \
-  CosLoadBalancing.rc
-
-## Makefile.CosNaming_Skel.am 
+## Makefile.ETCL.am 
 
-lib_LTLIBRARIES += libTAO_CosNaming_Skel.la
+lib_LTLIBRARIES += libTAO_ETCL.la
 
-libTAO_CosNaming_Skel_la_CPPFLAGS = \
+libTAO_ETCL_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_NAMING_SKEL_BUILD_DLL
+  -DTAO_ETCL_BUILD_DLL
 
-libTAO_CosNaming_Skel_la_SOURCES = \
-  CosNamingS.cpp
+libTAO_ETCL_la_SOURCES = \
+  ETCL/ETCL_l.cpp \
+  ETCL/ETCL_Constraint.cpp \
+  ETCL/ETCL_Interpreter.cpp \
+  ETCL/ETCL_y.cpp
 
-libTAO_CosNaming_Skel_la_LDFLAGS = \
+libTAO_ETCL_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_CosNaming_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosNamingS.h \
-  CosNamingS.inl
-
-EXTRA_DIST += \
-  CosNaming_Skel.rc
-
-## Makefile.CosNaming_Serv.am 
+libTAO_ETCL_la_LIBADD = \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
 
-Naming = \
-  Naming/Entries.cpp \
-  Naming/Flat_File_Persistence.cpp \
-  Naming/Hash_Naming_Context.cpp \
-  Naming/Naming_Context_Interface.cpp \
-  Naming/Naming_Loader.cpp \
-  Naming/Naming_Server.cpp \
-  Naming/Persistent_Context_Index.cpp \
-  Naming/Persistent_Entries.cpp \
-  Naming/Persistent_Naming_Context.cpp \
-  Naming/Storable.cpp \
-  Naming/Storable_Naming_Context.cpp \
-  Naming/Storable_Naming_Context_Activator.cpp \
-  Naming/Transient_Naming_Context.cpp
+noinst_HEADERS += \
+  ETCL/ETCL_Constraint.h \
+  Channel_Clients_T.h \
+  ETCL/ETCL_Interpreter.h \
+  ETCL/ETCL_y.h \
+  ETCL/ETCL_Constraint.i \
+  Channel_Clients_T.i \
+  Channel_Clients_T.cpp
 
-lib_LTLIBRARIES += libTAO_CosNaming_Serv.la
 
-libTAO_CosNaming_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_NAMING_SERV_BUILD_DLL
+## Makefile.CosNotification.am 
 
-libTAO_CosNaming_Serv_la_SOURCES = \
-  $(Naming)
+BUILT_SOURCES += \
+  CosEventCommS_T.cpp \
+  CosEventCommC.cpp \
+  CosEventCommS.cpp \
+  CosEventCommC.h \
+  CosEventCommS.h \
+  CosEventCommS_T.h \
+  CosEventCommC.inl \
+  CosEventCommS.inl \
+  CosEventCommS_T.inl
 
-libTAO_CosNaming_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+CLEANFILES += \
+  CosEventCommS_T.cpp \
+  CosEventCommC.cpp \
+  CosEventCommS.cpp \
+  CosEventCommC.h \
+  CosEventCommS.h \
+  CosEventCommS_T.h \
+  CosEventCommC.inl \
+  CosEventCommS.inl \
+  CosEventCommS_T.inl
 
-libTAO_CosNaming_Serv_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Naming/Entries.h \
-  Naming/Flat_File_Persistence.h \
-  Naming/Hash_Naming_Context.h \
-  Naming/Naming_Context_Interface.h \
-  Naming/Naming_Loader.h \
-  Naming/Naming_Server.h \
-  Naming/Persistent_Context_Index.h \
-  Naming/Persistent_Entries.h \
-  Naming/Persistent_Naming_Context.h \
-  Naming/Storable.h \
-  Naming/Storable_Naming_Context.h \
-  Naming/Storable_Naming_Context_Activator.h \
-  Naming/Transient_Naming_Context.h \
-  Naming/naming_export.h \
-  Naming/Storable.inl
+CosEventCommS_T.cpp CosEventCommC.cpp CosEventCommS.cpp CosEventCommC.h CosEventCommS.h CosEventCommS_T.h CosEventCommC.inl CosEventCommS.inl CosEventCommS_T.inl: CosEventComm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosEventComm.idl
 
-EXTRA_DIST += \
-  CosNaming_Serv.rc
+BUILT_SOURCES += \
+  CosEventChannelAdminS_T.cpp \
+  CosEventChannelAdminC.cpp \
+  CosEventChannelAdminS.cpp \
+  CosEventChannelAdminC.h \
+  CosEventChannelAdminS.h \
+  CosEventChannelAdminS_T.h \
+  CosEventChannelAdminC.inl \
+  CosEventChannelAdminS.inl \
+  CosEventChannelAdminS_T.inl
 
-## Makefile.CosNotification.am 
+CLEANFILES += \
+  CosEventChannelAdminS_T.cpp \
+  CosEventChannelAdminC.cpp \
+  CosEventChannelAdminS.cpp \
+  CosEventChannelAdminC.h \
+  CosEventChannelAdminS.h \
+  CosEventChannelAdminS_T.h \
+  CosEventChannelAdminC.inl \
+  CosEventChannelAdminS.inl \
+  CosEventChannelAdminS_T.inl
 
-if !BUILD_MINIMUM_CORBA
+CosEventChannelAdminS_T.cpp CosEventChannelAdminC.cpp CosEventChannelAdminS.cpp CosEventChannelAdminC.h CosEventChannelAdminS.h CosEventChannelAdminS_T.h CosEventChannelAdminC.inl CosEventChannelAdminS.inl CosEventChannelAdminS_T.inl: CosEventChannelAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosEventChannelAdmin.idl
 
 BUILT_SOURCES += \
   CosNotificationS_T.cpp \
-  CosNotificationC.inl \
-  CosNotificationS_T.inl \
   CosNotificationC.cpp \
+  CosNotificationS.cpp \
   CosNotificationC.h \
-  CosNotificationS_T.h
+  CosNotificationS.h \
+  CosNotificationS_T.h \
+  CosNotificationC.inl \
+  CosNotificationS.inl \
+  CosNotificationS_T.inl
 
 CLEANFILES += \
   CosNotificationS_T.cpp \
-  CosNotificationC.inl \
-  CosNotificationS_T.inl \
   CosNotificationC.cpp \
+  CosNotificationS.cpp \
   CosNotificationC.h \
+  CosNotificationS.h \
   CosNotificationS_T.h \
-  CosNotification-stamp
-
-CosNotificationS_T.cpp CosNotificationC.inl CosNotificationS_T.inl CosNotificationC.cpp CosNotificationC.h CosNotificationS_T.h: CosNotification-stamp
-
-CosNotification-stamp: $(srcdir)/CosNotification.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosNotifyChannelAdminS_T.cpp \
-  CosNotifyChannelAdminC.inl \
-  CosNotifyChannelAdminS_T.inl \
-  CosNotifyChannelAdminC.cpp \
-  CosNotifyChannelAdminC.h \
-  CosNotifyChannelAdminS_T.h
-
-CLEANFILES += \
-  CosNotifyChannelAdminS_T.cpp \
-  CosNotifyChannelAdminC.inl \
-  CosNotifyChannelAdminS_T.inl \
-  CosNotifyChannelAdminC.cpp \
-  CosNotifyChannelAdminC.h \
-  CosNotifyChannelAdminS_T.h \
-  CosNotifyChannelAdmin-stamp
-
-CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminC.inl CosNotifyChannelAdminS_T.inl CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminS_T.h: CosNotifyChannelAdmin-stamp
+  CosNotificationC.inl \
+  CosNotificationS.inl \
+  CosNotificationS_T.inl
 
-CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl
-	@touch $@
+CosNotificationS_T.cpp CosNotificationC.cpp CosNotificationS.cpp CosNotificationC.h CosNotificationS.h CosNotificationS_T.h CosNotificationC.inl CosNotificationS.inl CosNotificationS_T.inl: CosNotification.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotification.idl
 
 BUILT_SOURCES += \
   CosNotifyCommS_T.cpp \
-  CosNotifyCommC.inl \
-  CosNotifyCommS_T.inl \
   CosNotifyCommC.cpp \
+  CosNotifyCommS.cpp \
   CosNotifyCommC.h \
-  CosNotifyCommS_T.h
+  CosNotifyCommS.h \
+  CosNotifyCommS_T.h \
+  CosNotifyCommC.inl \
+  CosNotifyCommS.inl \
+  CosNotifyCommS_T.inl
 
 CLEANFILES += \
   CosNotifyCommS_T.cpp \
-  CosNotifyCommC.inl \
-  CosNotifyCommS_T.inl \
   CosNotifyCommC.cpp \
+  CosNotifyCommS.cpp \
   CosNotifyCommC.h \
+  CosNotifyCommS.h \
   CosNotifyCommS_T.h \
-  CosNotifyComm-stamp
-
-CosNotifyCommS_T.cpp CosNotifyCommC.inl CosNotifyCommS_T.inl CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommS_T.h: CosNotifyComm-stamp
+  CosNotifyCommC.inl \
+  CosNotifyCommS.inl \
+  CosNotifyCommS_T.inl
 
-CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl
-	@touch $@
+CosNotifyCommS_T.cpp CosNotifyCommC.cpp CosNotifyCommS.cpp CosNotifyCommC.h CosNotifyCommS.h CosNotifyCommS_T.h CosNotifyCommC.inl CosNotifyCommS.inl CosNotifyCommS_T.inl: CosNotifyComm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotifyComm.idl
 
 BUILT_SOURCES += \
   CosNotifyFilterS_T.cpp \
-  CosNotifyFilterC.inl \
-  CosNotifyFilterS_T.inl \
   CosNotifyFilterC.cpp \
+  CosNotifyFilterS.cpp \
   CosNotifyFilterC.h \
-  CosNotifyFilterS_T.h
+  CosNotifyFilterS.h \
+  CosNotifyFilterS_T.h \
+  CosNotifyFilterC.inl \
+  CosNotifyFilterS.inl \
+  CosNotifyFilterS_T.inl
 
 CLEANFILES += \
   CosNotifyFilterS_T.cpp \
-  CosNotifyFilterC.inl \
-  CosNotifyFilterS_T.inl \
   CosNotifyFilterC.cpp \
+  CosNotifyFilterS.cpp \
   CosNotifyFilterC.h \
+  CosNotifyFilterS.h \
   CosNotifyFilterS_T.h \
-  CosNotifyFilter-stamp
-
-CosNotifyFilterS_T.cpp CosNotifyFilterC.inl CosNotifyFilterS_T.inl CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterS_T.h: CosNotifyFilter-stamp
+  CosNotifyFilterC.inl \
+  CosNotifyFilterS.inl \
+  CosNotifyFilterS_T.inl
 
-CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl
-	@touch $@
+CosNotifyFilterS_T.cpp CosNotifyFilterC.cpp CosNotifyFilterS.cpp CosNotifyFilterC.h CosNotifyFilterS.h CosNotifyFilterS_T.h CosNotifyFilterC.inl CosNotifyFilterS.inl CosNotifyFilterS_T.inl: CosNotifyFilter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotifyFilter.idl
 
 BUILT_SOURCES += \
-  Event_ForwarderS_T.cpp \
-  Event_ForwarderC.inl \
-  Event_ForwarderS_T.inl \
-  Event_ForwarderC.cpp \
-  Event_ForwarderC.h \
-  Event_ForwarderS_T.h
+  CosNotifyChannelAdminS_T.cpp \
+  CosNotifyChannelAdminC.cpp \
+  CosNotifyChannelAdminS.cpp \
+  CosNotifyChannelAdminC.h \
+  CosNotifyChannelAdminS.h \
+  CosNotifyChannelAdminS_T.h \
+  CosNotifyChannelAdminC.inl \
+  CosNotifyChannelAdminS.inl \
+  CosNotifyChannelAdminS_T.inl
 
 CLEANFILES += \
-  Event_ForwarderS_T.cpp \
-  Event_ForwarderC.inl \
-  Event_ForwarderS_T.inl \
-  Event_ForwarderC.cpp \
-  Event_ForwarderC.h \
-  Event_ForwarderS_T.h \
-  Event_Forwarder-stamp
-
-Event_ForwarderS_T.cpp Event_ForwarderC.inl Event_ForwarderS_T.inl Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderS_T.h: Event_Forwarder-stamp
+  CosNotifyChannelAdminS_T.cpp \
+  CosNotifyChannelAdminC.cpp \
+  CosNotifyChannelAdminS.cpp \
+  CosNotifyChannelAdminC.h \
+  CosNotifyChannelAdminS.h \
+  CosNotifyChannelAdminS_T.h \
+  CosNotifyChannelAdminC.inl \
+  CosNotifyChannelAdminS.inl \
+  CosNotifyChannelAdminS_T.inl
 
-Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl
-	@touch $@
+CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminC.cpp CosNotifyChannelAdminS.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminS.h CosNotifyChannelAdminS_T.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.inl CosNotifyChannelAdminS_T.inl: CosNotifyChannelAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotifyChannelAdmin.idl
 
 BUILT_SOURCES += \
   NotifyExtS_T.cpp \
-  NotifyExtC.inl \
-  NotifyExtS_T.inl \
   NotifyExtC.cpp \
+  NotifyExtS.cpp \
   NotifyExtC.h \
-  NotifyExtS_T.h
+  NotifyExtS.h \
+  NotifyExtS_T.h \
+  NotifyExtC.inl \
+  NotifyExtS.inl \
+  NotifyExtS_T.inl
 
 CLEANFILES += \
   NotifyExtS_T.cpp \
-  NotifyExtC.inl \
-  NotifyExtS_T.inl \
   NotifyExtC.cpp \
+  NotifyExtS.cpp \
   NotifyExtC.h \
+  NotifyExtS.h \
   NotifyExtS_T.h \
-  NotifyExt-stamp
-
-NotifyExtS_T.cpp NotifyExtC.inl NotifyExtS_T.inl NotifyExtC.cpp NotifyExtC.h NotifyExtS_T.h: NotifyExt-stamp
-
-NotifyExt-stamp: $(srcdir)/NotifyExt.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_CosNotification.la
+  NotifyExtC.inl \
+  NotifyExtS.inl \
+  NotifyExtS_T.inl
 
-libTAO_CosNotification_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_BUILD_DLL
+NotifyExtS_T.cpp NotifyExtC.cpp NotifyExtS.cpp NotifyExtC.h NotifyExtS.h NotifyExtS_T.h NotifyExtC.inl NotifyExtS.inl NotifyExtS_T.inl: NotifyExt.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/NotifyExt.idl
 
-libTAO_CosNotification_la_SOURCES = \
-  CosNotificationC.cpp \
-  CosNotifyChannelAdminC.cpp \
-  CosNotifyCommC.cpp \
-  CosNotifyFilterC.cpp \
+BUILT_SOURCES += \
+  Event_ForwarderS_T.cpp \
   Event_ForwarderC.cpp \
-  Notify/Notify_Extensions.cpp \
-  NotifyExtC.cpp
-
-libTAO_CosNotification_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNotification_la_LIBADD = \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosNotificationC.h \
-  CosNotificationS_T.h \
-  CosNotifyChannelAdminC.h \
-  CosNotifyChannelAdminS_T.h \
-  CosNotifyCommC.h \
-  CosNotifyCommS_T.h \
-  CosNotifyFilterC.h \
-  CosNotifyFilterS_T.h \
+  Event_ForwarderS.cpp \
   Event_ForwarderC.h \
+  Event_ForwarderS.h \
   Event_ForwarderS_T.h \
-  Notify/Notify_Extensions.h \
-  NotifyExtC.h \
-  NotifyExtS_T.h \
-  CosNotificationC.inl \
-  CosNotificationS_T.inl \
-  CosNotifyChannelAdminC.inl \
-  CosNotifyChannelAdminS_T.inl \
-  CosNotifyCommC.inl \
-  CosNotifyCommS_T.inl \
-  CosNotifyFilterC.inl \
-  CosNotifyFilterS_T.inl \
   Event_ForwarderC.inl \
-  Event_ForwarderS_T.inl \
-  NotifyExtC.inl \
-  NotifyExtS_T.inl \
-  CosNotificationS_T.cpp \
-  CosNotifyChannelAdminS_T.cpp \
-  CosNotifyCommS_T.cpp \
-  CosNotifyFilterS_T.cpp \
-  Event_ForwarderS_T.cpp \
-  NotifyExtS_T.cpp \
-  CosNotification.idl \
-  CosNotifyChannelAdmin.idl \
-  CosNotifyComm.idl \
-  CosNotifyFilter.idl \
-  Event_Forwarder.idl \
-  NotifyExt.idl
-
-endif !BUILD_MINIMUM_CORBA
-
-EXTRA_DIST += \
-  CosNotification.rc
-
-## Makefile.ETCL.am 
-
-lib_LTLIBRARIES += libTAO_ETCL.la
-
-libTAO_ETCL_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_ETCL_BUILD_DLL
-
-libTAO_ETCL_la_SOURCES = \
-  ETCL/ETCL_Constraint.cpp \
-  ETCL/ETCL_Interpreter.cpp \
-  ETCL/ETCL_l.cpp \
-  ETCL/ETCL_y.cpp
-
-libTAO_ETCL_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_ETCL_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  ETCL/ETCL_Constraint.h \
-  ETCL/ETCL_Interpreter.h \
-  ETCL/ETCL_y.h \
-  ETCL/ETCL_Constraint.i
-
-EXTRA_DIST += \
-  ETCL.rc
-
-## Makefile.CosNotification_Skel.am 
-
-if !BUILD_MINIMUM_CORBA
-
-lib_LTLIBRARIES += libTAO_CosNotification_Skel.la
-
-libTAO_CosNotification_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_SKEL_BUILD_DLL
+  Event_ForwarderS.inl \
+  Event_ForwarderS_T.inl
 
-libTAO_CosNotification_Skel_la_SOURCES = \
-  CosNotificationS.cpp \
-  CosNotifyChannelAdminS.cpp \
-  CosNotifyCommS.cpp \
-  CosNotifyFilterS.cpp \
+CLEANFILES += \
+  Event_ForwarderS_T.cpp \
+  Event_ForwarderC.cpp \
   Event_ForwarderS.cpp \
-  NotifyExtS.cpp
-
-libTAO_CosNotification_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNotification_Skel_la_LIBADD = \
-  libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosNotificationS.h \
-  CosNotifyChannelAdminS.h \
-  CosNotifyCommS.h \
-  CosNotifyFilterS.h \
+  Event_ForwarderC.h \
   Event_ForwarderS.h \
-  NotifyExtS.h \
-  CosNotificationS.inl \
-  CosNotifyChannelAdminS.inl \
-  CosNotifyCommS.inl \
-  CosNotifyFilterS.inl \
+  Event_ForwarderS_T.h \
+  Event_ForwarderC.inl \
   Event_ForwarderS.inl \
-  NotifyExtS.inl
-
-endif !BUILD_MINIMUM_CORBA
-
-EXTRA_DIST += \
-  CosNotification_Skel.rc
+  Event_ForwarderS_T.inl
 
-## Makefile.CosNotification_Serv.am 
-
-if !BUILD_MINIMUM_CORBA
+Event_ForwarderS_T.cpp Event_ForwarderC.cpp Event_ForwarderS.cpp Event_ForwarderC.h Event_ForwarderS.h Event_ForwarderS_T.h Event_ForwarderC.inl Event_ForwarderS.inl Event_ForwarderS_T.inl: Event_Forwarder.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/Event_Forwarder.idl
 
 Notify = \
+  CosEventCommC.cpp \
+  CosEventCommS.cpp \
+  CosEventChannelAdminC.cpp \
+  CosEventChannelAdminS.cpp \
+  CosNotificationC.cpp \
+  CosNotificationS.cpp \
+  CosNotifyCommC.cpp \
+  CosNotifyCommS.cpp \
+  CosNotifyFilterC.cpp \
+  CosNotifyFilterS.cpp \
+  CosNotifyChannelAdminC.cpp \
+  CosNotifyChannelAdminS.cpp \
+  NotifyExtC.cpp \
+  NotifyExtS.cpp \
+  Event_ForwarderC.cpp \
+  Event_ForwarderS.cpp \
   Notify/Admin.cpp \
   Notify/AdminProperties.cpp \
-  Notify/Any/AnyEvent.cpp \
-  Notify/Any/CosEC_ProxyPushConsumer.cpp \
-  Notify/Any/CosEC_ProxyPushSupplier.cpp \
-  Notify/Any/ProxyPushConsumer.cpp \
-  Notify/Any/ProxyPushSupplier.cpp \
-  Notify/Any/PushConsumer.cpp \
-  Notify/Any/PushSupplier.cpp \
   Notify/Buffering_Strategy.cpp \
   Notify/Builder.cpp \
   Notify/Consumer.cpp \
@@ -1896,14 +1560,15 @@ Notify = \
   Notify/Method_Request_Updates.cpp \
   Notify/Notify_Constraint_Interpreter.cpp \
   Notify/Notify_Constraint_Visitors.cpp \
-  Notify/Notify_Default_CO_Factory.cpp \
   Notify/Notify_Default_Collection_Factory.cpp \
+  Notify/Notify_Default_CO_Factory.cpp \
   Notify/Notify_Default_EMO_Factory.cpp \
   Notify/Notify_Default_POA_Factory.cpp \
   Notify/Notify_EventChannelFactory_i.cpp \
+  Notify/Notify_Extensions.cpp \
   Notify/Object.cpp \
-  Notify/POA_Helper.cpp \
   Notify/Peer.cpp \
+  Notify/POA_Helper.cpp \
   Notify/Properties.cpp \
   Notify/PropertySeq.cpp \
   Notify/Property_Boolean.cpp \
@@ -1913,6 +1578,20 @@ Notify = \
   Notify/QoSProperties.cpp \
   Notify/Reactive_Task.cpp \
   Notify/Refcountable.cpp \
+  Notify/Subscription_Change_Worker.cpp \
+  Notify/Supplier.cpp \
+  Notify/SupplierAdmin.cpp \
+  Notify/ThreadPool_Task.cpp \
+  Notify/Timer_Queue.cpp \
+  Notify/Timer_Reactor.cpp \
+  Notify/Worker_Task.cpp \
+  Notify/Any/AnyEvent.cpp \
+  Notify/Any/CosEC_ProxyPushConsumer.cpp \
+  Notify/Any/CosEC_ProxyPushSupplier.cpp \
+  Notify/Any/ProxyPushConsumer.cpp \
+  Notify/Any/ProxyPushSupplier.cpp \
+  Notify/Any/PushConsumer.cpp \
+  Notify/Any/PushSupplier.cpp \
   Notify/Sequence/Batch_Buffering_Strategy.cpp \
   Notify/Sequence/SequenceProxyPushConsumer.cpp \
   Notify/Sequence/SequenceProxyPushSupplier.cpp \
@@ -1922,218 +1601,260 @@ Notify = \
   Notify/Structured/StructuredProxyPushConsumer.cpp \
   Notify/Structured/StructuredProxyPushSupplier.cpp \
   Notify/Structured/StructuredPushConsumer.cpp \
-  Notify/Structured/StructuredPushSupplier.cpp \
-  Notify/Subscription_Change_Worker.cpp \
-  Notify/Supplier.cpp \
-  Notify/SupplierAdmin.cpp \
-  Notify/ThreadPool_Task.cpp \
-  Notify/Timer_Queue.cpp \
-  Notify/Timer_Reactor.cpp \
-  Notify/Worker_Task.cpp
+  Notify/Structured/StructuredPushSupplier.cpp
 
-lib_LTLIBRARIES += libTAO_CosNotification_Serv.la
+lib_LTLIBRARIES += libTAO_CosNotification.la
 
-libTAO_CosNotification_Serv_la_CPPFLAGS = \
+libTAO_CosNotification_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_SERV_BUILD_DLL
+  -DTAO_NOTIFY_BUILD_DLL -DTAO_EVENT_BUILD_DLL
 
-libTAO_CosNotification_Serv_la_SOURCES = \
+libTAO_CosNotification_la_SOURCES = \
   $(Notify)
 
-libTAO_CosNotification_Serv_la_LDFLAGS = \
+libTAO_CosNotification_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_CosNotification_Serv_la_LIBADD = \
-  libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_CosNotification_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+libTAO_CosNotification_la_LIBADD = \
+ $(top_builddir)/tao/libTAO_DynamicAny.la \
+ libTAO_ETCL.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Notify/Notify_Default_POA_Factory.h \
+  Notify/Default_Factory.h \
+  Notify/CosNotify_Service.h \
+  Notify/Notify_Default_EMO_Factory.h \
+  Notify/Any/PushSupplier.h \
+  Notify/Any/PushConsumer.h \
+  Notify/Reactive_Task.h \
+  Notify/Method_Request.h \
+  CosNotifyCommC.h \
   Notify/Admin.h \
+  Notify/ThreadPool_Task.h \
+  Notify/Timer_Reactor.h \
+  Notify/Notify_Default_CO_Factory.h \
+  Notify/Notify_Constraint_Visitors.h \
+  Notify/Notify_Extensions.h \
+  Notify/Properties.h \
+  CosNotifyCommS.h \
+  Notify/Structured/StructuredProxyPushSupplier.h \
+  Notify/Structured/StructuredProxyPushConsumer.h \
   Notify/AdminProperties.h \
-  Notify/Any/AnyEvent.h \
-  Notify/Any/CosEC_ProxyPushConsumer.h \
-  Notify/Any/CosEC_ProxyPushSupplier.h \
-  Notify/Any/ProxyPushConsumer.h \
+  Notify/EventChannelFactory.h \
+  Notify/ConsumerAdmin.h \
   Notify/Any/ProxyPushSupplier.h \
-  Notify/Any/PushConsumer.h \
-  Notify/Any/PushSupplier.h \
-  Notify/Buffering_Strategy.h \
+  Notify/Any/ProxyPushConsumer.h \
   Notify/Builder.h \
+  Notify/Subscription_Change_Worker.h \
+  CosEventChannelAdminC.h \
+  Notify/Refcountable.h \
+  Notify/Notify_EventChannelFactory_i.h \
+  CosEventChannelAdminS.h \
+  Notify/ProxySupplier.h \
+  Notify/Supplier.h \
+  Notify/ProxyConsumer.h \
   Notify/Consumer.h \
-  Notify/ConsumerAdmin.h \
-  Notify/CosNotify_Initializer.h \
-  Notify/CosNotify_Service.h \
-  Notify/Default_Factory.h \
-  Notify/ETCL_Filter.h \
-  Notify/ETCL_FilterFactory.h \
+  Notify/Sequence/Batch_Buffering_Strategy.h \
   Notify/Event.h \
-  Notify/EventChannel.h \
-  Notify/EventChannelFactory.h \
+  CosEventCommC.h \
+  Notify/Worker_Task.h \
   Notify/EventType.h \
   Notify/EventTypeSeq.h \
-  Notify/Event_Manager.h \
-  Notify/FilterAdmin.h \
-  Notify/ID_Factory.h \
-  Notify/Method_Request.h \
-  Notify/Method_Request_Dispatch.h \
-  Notify/Method_Request_Event.h \
-  Notify/Method_Request_Lookup.h \
-  Notify/Method_Request_Shutdown.h \
-  Notify/Method_Request_Updates.h \
-  Notify/Notify_Constraint_Interpreter.h \
-  Notify/Notify_Constraint_Visitors.h \
-  Notify/Notify_Default_CO_Factory.h \
-  Notify/Notify_Default_Collection_Factory.h \
-  Notify/Notify_Default_EMO_Factory.h \
-  Notify/Notify_Default_POA_Factory.h \
-  Notify/Notify_EventChannelFactory_i.h \
-  Notify/Object.h \
-  Notify/POA_Helper.h \
-  Notify/Peer.h \
-  Notify/Properties.h \
-  Notify/PropertySeq.h \
-  Notify/Property_Boolean.h \
+  CosEventCommS.h \
   Notify/Proxy.h \
-  Notify/ProxyConsumer.h \
-  Notify/ProxySupplier.h \
+  Notify/Any/CosEC_ProxyPushSupplier.h \
+  Notify/Notify_Default_Collection_Factory.h \
+  Notify/Any/CosEC_ProxyPushConsumer.h \
+  Notify/SupplierAdmin.h \
+  Notify/Buffering_Strategy.h \
   Notify/QoSProperties.h \
-  Notify/Reactive_Task.h \
-  Notify/Refcountable.h \
-  Notify/Sequence/Batch_Buffering_Strategy.h \
-  Notify/Sequence/SequenceProxyPushConsumer.h \
-  Notify/Sequence/SequenceProxyPushSupplier.h \
-  Notify/Sequence/SequencePushConsumer.h \
+  Notify/Method_Request_Event.h \
+  CosNotifyFilterC.h \
   Notify/Sequence/SequencePushSupplier.h \
+  CosNotifyFilterS.h \
+  Notify/Sequence/SequencePushConsumer.h \
+  Notify/Method_Request_Dispatch.h \
+  Notify/POA_Helper.h \
   Notify/Structured/StructuredEvent.h \
-  Notify/Structured/StructuredProxyPushConsumer.h \
-  Notify/Structured/StructuredProxyPushSupplier.h \
-  Notify/Structured/StructuredPushConsumer.h \
+  Notify/PropertySeq.h \
+  Notify/Notify_Constraint_Interpreter.h \
+  Event_ForwarderC.h \
+  CosNotifyChannelAdminC.h \
+  Event_ForwarderS.h \
+  Notify/FilterAdmin.h \
+  CosNotificationC.h \
+  Notify/Method_Request_Shutdown.h \
+  CosNotifyChannelAdminS.h \
+  Notify/Peer.h \
+  Notify/Any/AnyEvent.h \
+  Notify/CosNotify_Initializer.h \
+  CosNotificationS.h \
   Notify/Structured/StructuredPushSupplier.h \
-  Notify/Subscription_Change_Worker.h \
-  Notify/Supplier.h \
-  Notify/SupplierAdmin.h \
-  Notify/ThreadPool_Task.h \
+  Notify/Structured/StructuredPushConsumer.h \
+  Notify/Object.h \
+  NotifyExtC.h \
+  Notify/ID_Factory.h \
+  NotifyExtS.h \
+  Notify/Event_Manager.h \
+  Notify/ETCL_FilterFactory.h \
+  Notify/Property_Boolean.h \
+  Notify/Sequence/SequenceProxyPushSupplier.h \
+  Notify/Sequence/SequenceProxyPushConsumer.h \
+  Notify/EventChannel.h \
+  Notify/Method_Request_Updates.h \
+  Notify/ETCL_Filter.h \
   Notify/Timer_Queue.h \
-  Notify/Timer_Reactor.h \
-  Notify/Worker_Task.h \
+  Notify/Method_Request_Lookup.h \
+  Event_ForwarderS_T.h \
+  CosNotifyFilterS_T.h \
+  NotifyExtS_T.h \
+  CosEventChannelAdminS_T.h \
+  Channel_Clients_T.h \
+  CosNotifyCommS_T.h \
+  CosNotificationS_T.h \
+  CosNotifyChannelAdminS_T.h \
+  CosEventCommS_T.h \
+  Notify/Default_Factory.inl \
+  Notify/CosNotify_Service.inl \
+  Notify/Any/PushSupplier.inl \
+  Notify/Any/PushConsumer.inl \
+  Notify/Reactive_Task.inl \
+  Notify/Method_Request.inl \
+  CosNotifyCommC.inl \
   Notify/Admin.inl \
+  Notify/ThreadPool_Task.inl \
+  Notify/Timer_Reactor.inl \
+  Notify/Properties.inl \
+  CosNotifyCommS.inl \
+  Notify/Structured/StructuredProxyPushSupplier.inl \
+  Notify/Structured/StructuredProxyPushConsumer.inl \
   Notify/AdminProperties.inl \
-  Notify/Any/AnyEvent.inl \
-  Notify/Any/CosEC_ProxyPushConsumer.inl \
-  Notify/Any/CosEC_ProxyPushSupplier.inl \
-  Notify/Any/ProxyPushConsumer.inl \
+  Notify/EventChannelFactory.inl \
+  Notify/ConsumerAdmin.inl \
   Notify/Any/ProxyPushSupplier.inl \
-  Notify/Any/PushConsumer.inl \
-  Notify/Any/PushSupplier.inl \
-  Notify/Buffering_Strategy.inl \
+  Notify/Any/ProxyPushConsumer.inl \
   Notify/Builder.inl \
+  Notify/Subscription_Change_Worker.inl \
+  CosEventChannelAdminC.inl \
+  Notify/Refcountable.inl \
+  CosEventChannelAdminS.inl \
+  Notify/ProxySupplier.inl \
+  Notify/Supplier.inl \
+  Notify/ProxyConsumer.inl \
   Notify/Consumer.inl \
-  Notify/ConsumerAdmin.inl \
-  Notify/CosNotify_Service.inl \
-  Notify/Default_Factory.inl \
-  Notify/ETCL_Filter.inl \
-  Notify/ETCL_FilterFactory.inl \
+  Notify/Sequence/Batch_Buffering_Strategy.inl \
   Notify/Event.inl \
-  Notify/EventChannel.inl \
-  Notify/EventChannelFactory.inl \
+  CosEventCommC.inl \
+  Notify/Worker_Task.inl \
   Notify/EventType.inl \
   Notify/EventTypeSeq.inl \
-  Notify/Event_Manager.inl \
-  Notify/FilterAdmin.inl \
-  Notify/ID_Factory.inl \
-  Notify/Method_Request.inl \
-  Notify/Method_Request_Dispatch.inl \
-  Notify/Method_Request_Event.inl \
-  Notify/Method_Request_Lookup.inl \
-  Notify/Method_Request_Shutdown.inl \
-  Notify/Method_Request_Updates.inl \
-  Notify/Object.inl \
-  Notify/POA_Helper.inl \
-  Notify/Peer.inl \
-  Notify/Properties.inl \
-  Notify/PropertySeq.inl \
-  Notify/Property_Boolean.inl \
+  CosEventCommS.inl \
   Notify/Proxy.inl \
-  Notify/ProxyConsumer.inl \
-  Notify/ProxySupplier.inl \
+  Notify/Any/CosEC_ProxyPushSupplier.inl \
+  Notify/Any/CosEC_ProxyPushConsumer.inl \
+  Notify/SupplierAdmin.inl \
+  Notify/Buffering_Strategy.inl \
   Notify/QoSProperties.inl \
-  Notify/Reactive_Task.inl \
-  Notify/Refcountable.inl \
-  Notify/Sequence/Batch_Buffering_Strategy.inl \
-  Notify/Sequence/SequenceProxyPushConsumer.inl \
-  Notify/Sequence/SequenceProxyPushSupplier.inl \
-  Notify/Sequence/SequencePushConsumer.inl \
+  Notify/Method_Request_Event.inl \
+  CosNotifyFilterC.inl \
   Notify/Sequence/SequencePushSupplier.inl \
+  CosNotifyFilterS.inl \
+  Notify/Sequence/SequencePushConsumer.inl \
+  Notify/Method_Request_Dispatch.inl \
+  Notify/POA_Helper.inl \
   Notify/Structured/StructuredEvent.inl \
-  Notify/Structured/StructuredProxyPushConsumer.inl \
-  Notify/Structured/StructuredProxyPushSupplier.inl \
-  Notify/Structured/StructuredPushConsumer.inl \
+  Notify/PropertySeq.inl \
+  Event_ForwarderC.inl \
+  CosNotifyChannelAdminC.inl \
+  Event_ForwarderS.inl \
+  Notify/FilterAdmin.inl \
+  CosNotificationC.inl \
+  Notify/Method_Request_Shutdown.inl \
+  CosNotifyChannelAdminS.inl \
+  Notify/Peer.inl \
+  Notify/Any/AnyEvent.inl \
+  CosNotificationS.inl \
   Notify/Structured/StructuredPushSupplier.inl \
-  Notify/Subscription_Change_Worker.inl \
-  Notify/Supplier.inl \
-  Notify/SupplierAdmin.inl \
-  Notify/ThreadPool_Task.inl \
+  Notify/Structured/StructuredPushConsumer.inl \
+  Notify/Object.inl \
+  NotifyExtC.inl \
+  Notify/ID_Factory.inl \
+  NotifyExtS.inl \
+  Notify/Event_Manager.inl \
+  Notify/ETCL_FilterFactory.inl \
+  Notify/Property_Boolean.inl \
+  Notify/Sequence/SequenceProxyPushSupplier.inl \
+  Notify/Sequence/SequenceProxyPushConsumer.inl \
+  Notify/EventChannel.inl \
+  Notify/Method_Request_Updates.inl \
+  Notify/ETCL_Filter.inl \
   Notify/Timer_Queue.inl \
-  Notify/Timer_Reactor.inl \
-  Notify/Worker_Task.inl
-
-endif !BUILD_MINIMUM_CORBA
+  Notify/Method_Request_Lookup.inl \
+  Event_ForwarderS_T.inl \
+  CosNotifyFilterS_T.inl \
+  NotifyExtS_T.inl \
+  CosEventChannelAdminS_T.inl \
+  Channel_Clients_T.i \
+  CosNotifyCommS_T.inl \
+  CosNotificationS_T.inl \
+  CosNotifyChannelAdminS_T.inl \
+  CosEventCommS_T.inl \
+  CosEventCommS_T.cpp \
+  CosEventChannelAdminS_T.cpp \
+  CosNotificationS_T.cpp \
+  CosNotifyCommS_T.cpp \
+  CosNotifyFilterS_T.cpp \
+  CosNotifyChannelAdminS_T.cpp \
+  NotifyExtS_T.cpp \
+  Event_ForwarderS_T.cpp \
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  CosNotification_Serv.rc
 
 ## Makefile.CosTime.am 
 
 BUILT_SOURCES += \
   TimeServiceS_T.cpp \
-  TimeServiceC.inl \
-  TimeServiceS.inl \
-  TimeServiceS_T.inl \
   TimeServiceC.cpp \
   TimeServiceS.cpp \
   TimeServiceC.h \
   TimeServiceS.h \
-  TimeServiceS_T.h
+  TimeServiceS_T.h \
+  TimeServiceC.inl \
+  TimeServiceS.inl \
+  TimeServiceS_T.inl
 
 CLEANFILES += \
   TimeServiceS_T.cpp \
-  TimeServiceC.inl \
-  TimeServiceS.inl \
-  TimeServiceS_T.inl \
   TimeServiceC.cpp \
   TimeServiceS.cpp \
   TimeServiceC.h \
   TimeServiceS.h \
   TimeServiceS_T.h \
-  TimeService-stamp
-
-TimeServiceS_T.cpp TimeServiceC.inl TimeServiceS.inl TimeServiceS_T.inl TimeServiceC.cpp TimeServiceS.cpp TimeServiceC.h TimeServiceS.h TimeServiceS_T.h: TimeService-stamp
+  TimeServiceC.inl \
+  TimeServiceS.inl \
+  TimeServiceS_T.inl
 
-TimeService-stamp: $(srcdir)/TimeService.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl
-	@touch $@
+TimeServiceS_T.cpp TimeServiceC.cpp TimeServiceS.cpp TimeServiceC.h TimeServiceS.h TimeServiceS_T.h TimeServiceC.inl TimeServiceS.inl TimeServiceS_T.inl: TimeService.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h $(srcdir)/TimeService.idl
 
 Time = \
+  TimeServiceC.cpp \
+  TimeServiceS.cpp \
+  Time/Timer_Helper.cpp \
   Time/TAO_TIO.cpp \
-  Time/TAO_Time_Service_Clerk.cpp \
-  Time/TAO_Time_Service_Server.cpp \
   Time/TAO_UTO.cpp \
-  Time/Timer_Helper.cpp \
-  TimeServiceC.cpp \
-  TimeServiceS.cpp
+  Time/TAO_Time_Service_Clerk.cpp \
+  Time/TAO_Time_Service_Server.cpp
 
 lib_LTLIBRARIES += libTAO_CosTime.la
 
@@ -2142,8 +1863,6 @@ libTAO_CosTime_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_TIME_BUILD_DLL
 
 libTAO_CosTime_la_SOURCES = \
@@ -2153,186 +1872,117 @@ libTAO_CosTime_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_CosTime_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Time/TAO_TIO.h \
-  Time/TAO_Time_Service_Clerk.h \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Channel_Clients_T.h \
+  TimeServiceS_T.h \
   Time/TAO_Time_Service_Server.h \
   Time/TAO_UTO.h \
-  Time/Timer_Helper.h \
   TimeServiceC.h \
+  Time/TAO_Time_Service_Clerk.h \
   TimeServiceS.h \
-  TimeServiceS_T.h \
-  TimeServiceC.inl \
-  TimeServiceS.inl \
+  Time/TAO_TIO.h \
+  Time/Timer_Helper.h \
+  Channel_Clients_T.i \
   TimeServiceS_T.inl \
   TimeServiceS_T.cpp \
-  TimeService.idl
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  CosTime.rc
 
 ## Makefile.CosTrading.am 
 
 BUILT_SOURCES += \
   CosTradingS_T.cpp \
-  CosTradingC.inl \
-  CosTradingS_T.inl \
   CosTradingC.cpp \
+  CosTradingS.cpp \
   CosTradingC.h \
-  CosTradingS_T.h
+  CosTradingS.h \
+  CosTradingS_T.h \
+  CosTradingC.inl \
+  CosTradingS.inl \
+  CosTradingS_T.inl
 
 CLEANFILES += \
   CosTradingS_T.cpp \
-  CosTradingC.inl \
-  CosTradingS_T.inl \
   CosTradingC.cpp \
+  CosTradingS.cpp \
   CosTradingC.h \
+  CosTradingS.h \
   CosTradingS_T.h \
-  CosTrading-stamp
-
-CosTradingS_T.cpp CosTradingC.inl CosTradingS_T.inl CosTradingC.cpp CosTradingC.h CosTradingS_T.h: CosTrading-stamp
-
-CosTrading-stamp: $(srcdir)/CosTrading.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosTradingDynamicS_T.cpp \
-  CosTradingDynamicC.inl \
-  CosTradingDynamicS_T.inl \
-  CosTradingDynamicC.cpp \
-  CosTradingDynamicC.h \
-  CosTradingDynamicS_T.h
-
-CLEANFILES += \
-  CosTradingDynamicS_T.cpp \
-  CosTradingDynamicC.inl \
-  CosTradingDynamicS_T.inl \
-  CosTradingDynamicC.cpp \
-  CosTradingDynamicC.h \
-  CosTradingDynamicS_T.h \
-  CosTradingDynamic-stamp
-
-CosTradingDynamicS_T.cpp CosTradingDynamicC.inl CosTradingDynamicS_T.inl CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicS_T.h: CosTradingDynamic-stamp
+  CosTradingC.inl \
+  CosTradingS.inl \
+  CosTradingS_T.inl
 
-CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl
-	@touch $@
+CosTradingS_T.cpp CosTradingC.cpp CosTradingS.cpp CosTradingC.h CosTradingS.h CosTradingS_T.h CosTradingC.inl CosTradingS.inl CosTradingS_T.inl: CosTrading.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h $(srcdir)/CosTrading.idl
 
 BUILT_SOURCES += \
   CosTradingReposS_T.cpp \
-  CosTradingReposC.inl \
-  CosTradingReposS_T.inl \
   CosTradingReposC.cpp \
+  CosTradingReposS.cpp \
   CosTradingReposC.h \
-  CosTradingReposS_T.h
+  CosTradingReposS.h \
+  CosTradingReposS_T.h \
+  CosTradingReposC.inl \
+  CosTradingReposS.inl \
+  CosTradingReposS_T.inl
 
 CLEANFILES += \
   CosTradingReposS_T.cpp \
-  CosTradingReposC.inl \
-  CosTradingReposS_T.inl \
   CosTradingReposC.cpp \
+  CosTradingReposS.cpp \
   CosTradingReposC.h \
+  CosTradingReposS.h \
   CosTradingReposS_T.h \
-  CosTradingRepos-stamp
-
-CosTradingReposS_T.cpp CosTradingReposC.inl CosTradingReposS_T.inl CosTradingReposC.cpp CosTradingReposC.h CosTradingReposS_T.h: CosTradingRepos-stamp
-
-CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl
-	@touch $@
+  CosTradingReposC.inl \
+  CosTradingReposS.inl \
+  CosTradingReposS_T.inl
 
-lib_LTLIBRARIES += libTAO_CosTrading.la
+CosTradingReposS_T.cpp CosTradingReposC.cpp CosTradingReposS.cpp CosTradingReposC.h CosTradingReposS.h CosTradingReposS_T.h CosTradingReposC.inl CosTradingReposS.inl CosTradingReposS_T.inl: CosTradingRepos.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h $(srcdir)/CosTradingRepos.idl
 
-libTAO_CosTrading_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TRADING_BUILD_DLL
-
-libTAO_CosTrading_la_SOURCES = \
-  CosTradingC.cpp \
+BUILT_SOURCES += \
+  CosTradingDynamicS_T.cpp \
   CosTradingDynamicC.cpp \
-  CosTradingReposC.cpp
-
-libTAO_CosTrading_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosTrading_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosTradingC.h \
+  CosTradingDynamicS.cpp \
   CosTradingDynamicC.h \
+  CosTradingDynamicS.h \
   CosTradingDynamicS_T.h \
-  CosTradingReposC.h \
-  CosTradingReposS_T.h \
-  CosTradingS_T.h \
-  CosTradingC.inl \
   CosTradingDynamicC.inl \
-  CosTradingDynamicS_T.inl \
-  CosTradingReposC.inl \
-  CosTradingReposS_T.inl \
-  CosTradingS_T.inl \
-  CosTradingDynamicS_T.cpp \
-  CosTradingReposS_T.cpp \
-  CosTradingS_T.cpp \
-  CosTrading.idl \
-  CosTradingDynamic.idl \
-  CosTradingRepos.idl
-
-EXTRA_DIST += \
-  CosTrading.rc
-
-## Makefile.CosTrading_Skel.am 
-
-lib_LTLIBRARIES += libTAO_CosTrading_Skel.la
-
-libTAO_CosTrading_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TRADING_SKEL_BUILD_DLL
+  CosTradingDynamicS.inl \
+  CosTradingDynamicS_T.inl
 
-libTAO_CosTrading_Skel_la_SOURCES = \
+CLEANFILES += \
+  CosTradingDynamicS_T.cpp \
+  CosTradingDynamicC.cpp \
   CosTradingDynamicS.cpp \
-  CosTradingReposS.cpp \
-  CosTradingS.cpp
-
-libTAO_CosTrading_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosTrading_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+  CosTradingDynamicC.h \
   CosTradingDynamicS.h \
-  CosTradingReposS.h \
-  CosTradingS.h \
+  CosTradingDynamicS_T.h \
+  CosTradingDynamicC.inl \
   CosTradingDynamicS.inl \
-  CosTradingReposS.inl \
-  CosTradingS.inl
+  CosTradingDynamicS_T.inl
 
-EXTRA_DIST += \
-  CosTrading_Skel.rc
-
-## Makefile.CosTrading_Serv.am 
+CosTradingDynamicS_T.cpp CosTradingDynamicC.cpp CosTradingDynamicS.cpp CosTradingDynamicC.h CosTradingDynamicS.h CosTradingDynamicS_T.h CosTradingDynamicC.inl CosTradingDynamicS.inl CosTradingDynamicS_T.inl: CosTradingDynamic.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h $(srcdir)/CosTradingDynamic.idl
 
 Trader = \
+  CosTradingC.cpp \
+  CosTradingS.cpp \
+  CosTradingReposC.cpp \
+  CosTradingReposS.cpp \
+  CosTradingDynamicC.cpp \
+  CosTradingDynamicS.cpp \
   Trader/Constraint_Interpreter.cpp \
   Trader/Constraint_Nodes.cpp \
   Trader/Constraint_Visitors.cpp \
@@ -2344,102 +1994,137 @@ Trader = \
   Trader/Offer_Iterators.cpp \
   Trader/Service_Type_Repository.cpp \
   Trader/Trader.cpp \
+  Trader/Trader_Utils.cpp \
   Trader/Trader_Constraint_Visitors.cpp \
   Trader/Trader_Interfaces.cpp \
-  Trader/Trader_Utils.cpp \
   Trader/Trading_Loader.cpp
 
-lib_LTLIBRARIES += libTAO_CosTrading_Serv.la
+lib_LTLIBRARIES += libTAO_CosTrading.la
 
-libTAO_CosTrading_Serv_la_CPPFLAGS = \
+libTAO_CosTrading_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TRADING_SERV_BUILD_DLL
+  -DTAO_TRADING_BUILD_DLL
 
-libTAO_CosTrading_Serv_la_SOURCES = \
+libTAO_CosTrading_la_SOURCES = \
   $(Trader)
 
-libTAO_CosTrading_Serv_la_LDFLAGS = \
+libTAO_CosTrading_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_CosTrading_Serv_la_LIBADD = \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Trader/Constraint_Interpreter.h \
-  Trader/Constraint_Nodes.h \
-  Trader/Constraint_Visitors.h \
-  Trader/Interpreter.h \
-  Trader/Interpreter_Utils.h \
+libTAO_CosTrading_la_LIBADD = \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_DynamicAny.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Trader/Trader_Constraint_Visitors.h \
+  Trader/Service_Type_Repository.h \
   Trader/Offer_Database.h \
+  Trader/Constraint_Nodes.h \
+  Trader/Trading_Loader.h \
   Trader/Offer_Iterators.h \
-  Trader/Service_Type_Repository.h \
+  CosTradingDynamicC.h \
+  CosTradingDynamicS.h \
+  Trader/Constraint_Visitors.h \
+  CosTradingC.h \
+  CosTradingS.h \
   Trader/Trader.h \
-  Trader/Trader_Constraint_Visitors.h \
-  Trader/Trader_Interfaces.h \
   Trader/Trader_Utils.h \
-  Trader/Trading_Loader.h
+  Trader/Interpreter_Utils.h \
+  CosTradingReposC.h \
+  Trader/Trader_Interfaces.h \
+  CosTradingReposS.h \
+  Trader/Constraint_Interpreter.h \
+  Trader/Interpreter.h \
+  CosTradingReposS_T.h \
+  CosTradingDynamicS_T.h \
+  CosTradingS_T.h \
+  Channel_Clients_T.h \
+  CosTradingReposS_T.inl \
+  CosTradingDynamicS_T.inl \
+  CosTradingS_T.inl \
+  Channel_Clients_T.i \
+  CosTradingS_T.cpp \
+  CosTradingReposS_T.cpp \
+  CosTradingDynamicS_T.cpp \
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  CosTrading_Serv.rc
 
 ## Makefile.DsLogAdmin.am 
 
 BUILT_SOURCES += \
   DsLogAdminS_T.cpp \
-  DsLogAdminC.inl \
-  DsLogAdminS_T.inl \
   DsLogAdminC.cpp \
+  DsLogAdminS.cpp \
   DsLogAdminC.h \
-  DsLogAdminS_T.h
+  DsLogAdminS.h \
+  DsLogAdminS_T.h \
+  DsLogAdminC.inl \
+  DsLogAdminS.inl \
+  DsLogAdminS_T.inl
 
 CLEANFILES += \
   DsLogAdminS_T.cpp \
-  DsLogAdminC.inl \
-  DsLogAdminS_T.inl \
   DsLogAdminC.cpp \
+  DsLogAdminS.cpp \
   DsLogAdminC.h \
+  DsLogAdminS.h \
   DsLogAdminS_T.h \
-  DsLogAdmin-stamp
-
-DsLogAdminS_T.cpp DsLogAdminC.inl DsLogAdminS_T.inl DsLogAdminC.cpp DsLogAdminC.h DsLogAdminS_T.h: DsLogAdmin-stamp
+  DsLogAdminC.inl \
+  DsLogAdminS.inl \
+  DsLogAdminS_T.inl
 
-DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl
-	@touch $@
+DsLogAdminS_T.cpp DsLogAdminC.cpp DsLogAdminS.cpp DsLogAdminC.h DsLogAdminS.h DsLogAdminS_T.h DsLogAdminC.inl DsLogAdminS.inl DsLogAdminS_T.inl: DsLogAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h $(srcdir)/DsLogAdmin.idl
 
 BUILT_SOURCES += \
   DsLogNotificationS_T.cpp \
-  DsLogNotificationC.inl \
-  DsLogNotificationS_T.inl \
   DsLogNotificationC.cpp \
+  DsLogNotificationS.cpp \
   DsLogNotificationC.h \
-  DsLogNotificationS_T.h
+  DsLogNotificationS.h \
+  DsLogNotificationS_T.h \
+  DsLogNotificationC.inl \
+  DsLogNotificationS.inl \
+  DsLogNotificationS_T.inl
 
 CLEANFILES += \
   DsLogNotificationS_T.cpp \
-  DsLogNotificationC.inl \
-  DsLogNotificationS_T.inl \
   DsLogNotificationC.cpp \
+  DsLogNotificationS.cpp \
   DsLogNotificationC.h \
+  DsLogNotificationS.h \
   DsLogNotificationS_T.h \
-  DsLogNotification-stamp
+  DsLogNotificationC.inl \
+  DsLogNotificationS.inl \
+  DsLogNotificationS_T.inl
 
-DsLogNotificationS_T.cpp DsLogNotificationC.inl DsLogNotificationS_T.inl DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationS_T.h: DsLogNotification-stamp
+DsLogNotificationS_T.cpp DsLogNotificationC.cpp DsLogNotificationS.cpp DsLogNotificationC.h DsLogNotificationS.h DsLogNotificationS_T.h DsLogNotificationC.inl DsLogNotificationS.inl DsLogNotificationS_T.inl: DsLogNotification.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h $(srcdir)/DsLogNotification.idl
 
-DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl
-	@touch $@
+DsLogAdmin = \
+  DsLogAdminC.cpp \
+  DsLogAdminS.cpp \
+  DsLogNotificationC.cpp \
+  DsLogNotificationS.cpp \
+  Log/PersistStore.cpp \
+  Log/LogRecordStore.cpp \
+  Log/BasicLogFactory_i.cpp \
+  Log/Iterator_i.cpp \
+  Log/BasicLog_i.cpp \
+  Log/Log_i.cpp \
+  Log/LogMgr_i.cpp \
+  Log/Log_Constraint_Visitors.cpp \
+  Log/Log_Constraint_Interpreter.cpp \
+  Log/LogNotification.cpp
 
 lib_LTLIBRARIES += libTAO_DsLogAdmin.la
 
@@ -2448,64 +2133,88 @@ libTAO_DsLogAdmin_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_LOG_BUILD_DLL
 
 libTAO_DsLogAdmin_la_SOURCES = \
-  DsLogAdminC.cpp \
-  DsLogNotificationC.cpp
+  $(DsLogAdmin)
 
 libTAO_DsLogAdmin_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_DsLogAdmin_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ $(top_builddir)/tao/libTAO_DynamicAny.la \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_ETCL.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Log/Log_Constraint_Visitors.h \
+  Log/BasicLogFactory_i.h \
+  Log/Iterator_i.h \
+  Log/PersistStore.h \
+  Log/LogRecordStore.h \
+  Log/Log_Constraint_Interpreter.h \
+  Log/BasicLog_i.h \
   DsLogAdminC.h \
-  DsLogAdminS_T.h \
+  DsLogAdminS.h \
+  Log/LogMgr_i.h \
+  Log/Log_i.h \
+  Log/LogNotification.h \
   DsLogNotificationC.h \
+  DsLogNotificationS.h \
   DsLogNotificationS_T.h \
-  DsLogAdminC.inl \
-  DsLogAdminS_T.inl \
-  DsLogNotificationC.inl \
+  DsLogAdminS_T.h \
+  Channel_Clients_T.h \
   DsLogNotificationS_T.inl \
+  DsLogAdminS_T.inl \
+  Channel_Clients_T.i \
   DsLogAdminS_T.cpp \
   DsLogNotificationS_T.cpp \
-  DsLogAdmin.idl \
-  DsLogNotification.idl
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  DsLogAdmin.rc
 
 ## Makefile.DsEventLogAdmin.am 
 
-if !BUILD_MINIMUM_CORBA
-
 BUILT_SOURCES += \
   DsEventLogAdminS_T.cpp \
-  DsEventLogAdminC.inl \
-  DsEventLogAdminS_T.inl \
   DsEventLogAdminC.cpp \
+  DsEventLogAdminS.cpp \
   DsEventLogAdminC.h \
-  DsEventLogAdminS_T.h
+  DsEventLogAdminS.h \
+  DsEventLogAdminS_T.h \
+  DsEventLogAdminC.inl \
+  DsEventLogAdminS.inl \
+  DsEventLogAdminS_T.inl
 
 CLEANFILES += \
   DsEventLogAdminS_T.cpp \
-  DsEventLogAdminC.inl \
-  DsEventLogAdminS_T.inl \
   DsEventLogAdminC.cpp \
+  DsEventLogAdminS.cpp \
   DsEventLogAdminC.h \
+  DsEventLogAdminS.h \
   DsEventLogAdminS_T.h \
-  DsEventLogAdmin-stamp
+  DsEventLogAdminC.inl \
+  DsEventLogAdminS.inl \
+  DsEventLogAdminS_T.inl
 
-DsEventLogAdminS_T.cpp DsEventLogAdminC.inl DsEventLogAdminS_T.inl DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminS_T.h: DsEventLogAdmin-stamp
+DsEventLogAdminS_T.cpp DsEventLogAdminC.cpp DsEventLogAdminS.cpp DsEventLogAdminC.h DsEventLogAdminS.h DsEventLogAdminS_T.h DsEventLogAdminC.inl DsEventLogAdminS.inl DsEventLogAdminS_T.inl: DsEventLogAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=Log/eventlog_export.h $(srcdir)/DsEventLogAdmin.idl
 
-DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl
-	@touch $@
+DsEventLogAdmin = \
+  DsEventLogAdminC.cpp \
+  DsEventLogAdminS.cpp \
+  Log/EventLogFactory_i.cpp \
+  Log/EventLog_i.cpp \
+  Log/EventLogConsumer.cpp \
+  Log/EventLogNotification.cpp
 
 lib_LTLIBRARIES += libTAO_DsEventLogAdmin.la
 
@@ -2514,241 +2223,82 @@ libTAO_DsEventLogAdmin_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_HAS_TYPED_EVENT_CHANNEL \
   -DTAO_EVENTLOG_BUILD_DLL
 
 libTAO_DsEventLogAdmin_la_SOURCES = \
-  DsEventLogAdminC.cpp
+  $(DsEventLogAdmin)
 
 libTAO_DsEventLogAdmin_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_DsEventLogAdmin_la_LIBADD = \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_CosEvent.la \
+ libTAO_CosNaming.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO_IFR_Client.la \
+ $(top_builddir)/tao/libTAO_DynamicInterface.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ libTAO_DsLogAdmin.la \
+ $(top_builddir)/tao/libTAO_DynamicAny.la \
+ libTAO_ETCL.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Log/EventLogConsumer.h \
   DsEventLogAdminC.h \
-  DsEventLogAdminS_T.h \
-  DsEventLogAdminC.inl \
-  DsEventLogAdminS_T.inl \
-  DsEventLogAdminS_T.cpp \
-  DsEventLogAdmin.idl
-
-endif !BUILD_MINIMUM_CORBA
-
-EXTRA_DIST += \
-  DsEventLogAdmin.rc
-
-## Makefile.DsLogAdmin_Skel.am 
-
-lib_LTLIBRARIES += libTAO_DsLogAdmin_Skel.la
-
-libTAO_DsLogAdmin_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_LOG_SKEL_BUILD_DLL
-
-libTAO_DsLogAdmin_Skel_la_SOURCES = \
-  DsLogAdminS.cpp \
-  DsLogNotificationS.cpp
-
-libTAO_DsLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsLogAdmin_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DsLogAdminS.h \
-  DsLogNotificationS.h \
-  DsLogAdminS.inl \
-  DsLogNotificationS.inl
-
-## Makefile.DsLogAdmin_Serv.am 
-
-DsLogAdmin = \
-  Log/BasicLogFactory_i.cpp \
-  Log/BasicLog_i.cpp \
-  Log/Iterator_i.cpp \
-  Log/LogMgr_i.cpp \
-  Log/LogNotification.cpp \
-  Log/LogRecordStore.cpp \
-  Log/Log_Constraint_Interpreter.cpp \
-  Log/Log_Constraint_Visitors.cpp \
-  Log/Log_i.cpp \
-  Log/PersistStore.cpp
-
-lib_LTLIBRARIES += libTAO_DsLogAdmin_Serv.la
-
-libTAO_DsLogAdmin_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_LOG_SERV_BUILD_DLL
-
-libTAO_DsLogAdmin_Serv_la_SOURCES = \
-  $(DsLogAdmin)
-
-libTAO_DsLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsLogAdmin_Serv_la_LIBADD = \
-  libTAO_Svc_Utils.la \
-  libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Log/BasicLogFactory_i.h \
-  Log/BasicLog_i.h \
-  Log/Iterator_i.h \
-  Log/LogMgr_i.h \
-  Log/LogNotification.h \
-  Log/LogRecordStore.h \
-  Log/Log_Constraint_Interpreter.h \
-  Log/Log_Constraint_Visitors.h \
-  Log/Log_i.h \
-  Log/PersistStore.h
-
-## Makefile.DsEventLogAdmin_Skel.am 
-
-if !BUILD_MINIMUM_CORBA
-
-lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Skel.la
-
-libTAO_DsEventLogAdmin_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENTLOG_SKEL_BUILD_DLL
-
-libTAO_DsEventLogAdmin_Skel_la_SOURCES = \
-  DsEventLogAdminS.cpp
-
-libTAO_DsEventLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsEventLogAdmin_Skel_la_LIBADD = \
-  libTAO_CosEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
   DsEventLogAdminS.h \
-  DsEventLogAdminS.inl
-
-endif !BUILD_MINIMUM_CORBA
-
-## Makefile.DsEventLogAdmin_Serv.am 
-
-if !BUILD_MINIMUM_CORBA
-
-DsEventLogAdmin = \
-  Log/EventLogConsumer.cpp \
-  Log/EventLogFactory_i.cpp \
-  Log/EventLogNotification.cpp \
-  Log/EventLog_i.cpp
-
-lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Serv.la
-
-libTAO_DsEventLogAdmin_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENTLOG_SERV_BUILD_DLL
-
-libTAO_DsEventLogAdmin_Serv_la_SOURCES = \
-  $(DsEventLogAdmin)
-
-libTAO_DsEventLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsEventLogAdmin_Serv_la_LIBADD = \
-  libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_DsLogAdmin_Serv.la \
-  libTAO_Svc_Utils.la \
-  libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_DsEventLogAdmin_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Log/EventLogConsumer.h \
   Log/EventLogFactory_i.h \
+  Log/EventLog_i.h \
   Log/EventLogNotification.h \
-  Log/EventLog_i.h
+  Channel_Clients_T.h \
+  DsEventLogAdminS_T.h \
+  Channel_Clients_T.i \
+  DsEventLogAdminS_T.inl \
+  DsEventLogAdminS_T.cpp \
+  Channel_Clients_T.cpp
 
-endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.DsNotifyLogAdmin.am 
 
-if !BUILD_MINIMUM_CORBA
-
 BUILT_SOURCES += \
   DsNotifyLogAdminS_T.cpp \
-  DsNotifyLogAdminC.inl \
-  DsNotifyLogAdminS_T.inl \
   DsNotifyLogAdminC.cpp \
+  DsNotifyLogAdminS.cpp \
   DsNotifyLogAdminC.h \
-  DsNotifyLogAdminS_T.h
+  DsNotifyLogAdminS.h \
+  DsNotifyLogAdminS_T.h \
+  DsNotifyLogAdminC.inl \
+  DsNotifyLogAdminS.inl \
+  DsNotifyLogAdminS_T.inl
 
 CLEANFILES += \
   DsNotifyLogAdminS_T.cpp \
-  DsNotifyLogAdminC.inl \
-  DsNotifyLogAdminS_T.inl \
   DsNotifyLogAdminC.cpp \
+  DsNotifyLogAdminS.cpp \
   DsNotifyLogAdminC.h \
+  DsNotifyLogAdminS.h \
   DsNotifyLogAdminS_T.h \
-  DsNotifyLogAdmin-stamp
+  DsNotifyLogAdminC.inl \
+  DsNotifyLogAdminS.inl \
+  DsNotifyLogAdminS_T.inl
 
-DsNotifyLogAdminS_T.cpp DsNotifyLogAdminC.inl DsNotifyLogAdminS_T.inl DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminS_T.h: DsNotifyLogAdmin-stamp
+DsNotifyLogAdminS_T.cpp DsNotifyLogAdminC.cpp DsNotifyLogAdminS.cpp DsNotifyLogAdminC.h DsNotifyLogAdminS.h DsNotifyLogAdminS_T.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.inl DsNotifyLogAdminS_T.inl: DsNotifyLogAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log/notifylog_export.h $(srcdir)/DsNotifyLogAdmin.idl
 
-DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl
-	@touch $@
+DsNotifyLogAdmin = \
+  DsNotifyLogAdminC.cpp \
+  DsNotifyLogAdminS.cpp \
+  Log/NotifyLogFactory_i.cpp \
+  Log/NotifyLog_i.cpp \
+  Log/NotifyLogConsumer.cpp \
+  Log/NotifyLogNotification.cpp
 
 lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin.la
 
@@ -2757,134 +2307,49 @@ libTAO_DsNotifyLogAdmin_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_HAS_TYPED_EVENT_CHANNEL \
   -DTAO_NOTIFYLOG_BUILD_DLL
 
 libTAO_DsNotifyLogAdmin_la_SOURCES = \
-  DsNotifyLogAdminC.cpp
+  $(DsNotifyLogAdmin)
 
 libTAO_DsNotifyLogAdmin_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_DsNotifyLogAdmin_la_LIBADD = \
-  libTAO_CosNotification.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_CosNotification.la \
+ libTAO_DsEventLogAdmin.la \
+ libTAO_CosEvent.la \
+ libTAO_CosNaming.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO_IFR_Client.la \
+ $(top_builddir)/tao/libTAO_DynamicInterface.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ libTAO_DsLogAdmin.la \
+ $(top_builddir)/tao/libTAO_DynamicAny.la \
+ libTAO_ETCL.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Log/NotifyLog_i.h \
   DsNotifyLogAdminC.h \
-  DsNotifyLogAdminS_T.h \
-  DsNotifyLogAdminC.inl \
-  DsNotifyLogAdminS_T.inl \
-  DsNotifyLogAdminS_T.cpp \
-  DsNotifyLogAdmin.idl
-
-endif !BUILD_MINIMUM_CORBA
-
-EXTRA_DIST += \
-  DsNotifyLogAdmin.rc
-
-## Makefile.DsNotifyLogAdmin_Skel.am 
-
-if !BUILD_MINIMUM_CORBA
-
-lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Skel.la
-
-libTAO_DsNotifyLogAdmin_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFYLOG_SKEL_BUILD_DLL
-
-libTAO_DsNotifyLogAdmin_Skel_la_SOURCES = \
-  DsNotifyLogAdminS.cpp
-
-libTAO_DsNotifyLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \
-  libTAO_CosNotification_Skel.la \
-  libTAO_DsEventLogAdmin_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsNotifyLogAdmin.la \
-  libTAO_CosNotification.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+  Log/NotifyLogFactory_i.h \
   DsNotifyLogAdminS.h \
-  DsNotifyLogAdminS.inl
-
-endif !BUILD_MINIMUM_CORBA
-
-## Makefile.DsNotifyLogAdmin_Serv.am 
-
-if !BUILD_MINIMUM_CORBA
-
-DsNotifyLogAdmin = \
-  Log/NotifyLogConsumer.cpp \
-  Log/NotifyLogFactory_i.cpp \
-  Log/NotifyLogNotification.cpp \
-  Log/NotifyLog_i.cpp
-
-lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Serv.la
-
-libTAO_DsNotifyLogAdmin_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFYLOG_SERV_BUILD_DLL
-
-libTAO_DsNotifyLogAdmin_Serv_la_SOURCES = \
-  $(DsNotifyLogAdmin)
-
-libTAO_DsNotifyLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \
-  libTAO_DsLogAdmin_Serv.la \
-  libTAO_Svc_Utils.la \
-  libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_DsNotifyLogAdmin_Skel.la \
-  libTAO_CosNotification_Skel.la \
-  libTAO_DsEventLogAdmin_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsNotifyLogAdmin.la \
-  libTAO_CosNotification.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
   Log/NotifyLogConsumer.h \
-  Log/NotifyLogFactory_i.h \
   Log/NotifyLogNotification.h \
-  Log/NotifyLog_i.h
+  DsNotifyLogAdminS_T.h \
+  Channel_Clients_T.h \
+  DsNotifyLogAdminS_T.inl \
+  Channel_Clients_T.i \
+  DsNotifyLogAdminS_T.cpp \
+  Channel_Clients_T.cpp
 
-endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.FTRT_ClientORB.am 
 
@@ -2900,8 +2365,6 @@ libTAO_FTRT_ClientORB_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/ClientORB \
   -DTAO_FTRT_BUILD_DLL
 
@@ -2912,152 +2375,151 @@ libTAO_FTRT_ClientORB_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_FTRT_ClientORB_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h \
   FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h \
   FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \
-  FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
+  Channel_Clients_T.h \
+  Channel_Clients_T.i \
+  Channel_Clients_T.cpp
+
 
 ## Makefile.RTEvent.am 
 
 BUILT_SOURCES += \
   RtecDefaultEventDataS_T.cpp \
-  RtecDefaultEventDataC.inl \
-  RtecDefaultEventDataS.inl \
-  RtecDefaultEventDataS_T.inl \
   RtecDefaultEventDataC.cpp \
   RtecDefaultEventDataS.cpp \
   RtecDefaultEventDataC.h \
   RtecDefaultEventDataS.h \
-  RtecDefaultEventDataS_T.h
+  RtecDefaultEventDataS_T.h \
+  RtecDefaultEventDataC.inl \
+  RtecDefaultEventDataS.inl \
+  RtecDefaultEventDataS_T.inl
 
 CLEANFILES += \
   RtecDefaultEventDataS_T.cpp \
-  RtecDefaultEventDataC.inl \
-  RtecDefaultEventDataS.inl \
-  RtecDefaultEventDataS_T.inl \
   RtecDefaultEventDataC.cpp \
   RtecDefaultEventDataS.cpp \
   RtecDefaultEventDataC.h \
   RtecDefaultEventDataS.h \
   RtecDefaultEventDataS_T.h \
-  RtecDefaultEventData-stamp
-
-RtecDefaultEventDataS_T.cpp RtecDefaultEventDataC.inl RtecDefaultEventDataS.inl RtecDefaultEventDataS_T.inl RtecDefaultEventDataC.cpp RtecDefaultEventDataS.cpp RtecDefaultEventDataC.h RtecDefaultEventDataS.h RtecDefaultEventDataS_T.h: RtecDefaultEventData-stamp
-
-RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecDefaultEventData.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  RtecEventChannelAdminS_T.cpp \
-  RtecEventChannelAdminC.inl \
-  RtecEventChannelAdminS.inl \
-  RtecEventChannelAdminS_T.inl \
-  RtecEventChannelAdminC.cpp \
-  RtecEventChannelAdminS.cpp \
-  RtecEventChannelAdminC.h \
-  RtecEventChannelAdminS.h \
-  RtecEventChannelAdminS_T.h
-
-CLEANFILES += \
-  RtecEventChannelAdminS_T.cpp \
-  RtecEventChannelAdminC.inl \
-  RtecEventChannelAdminS.inl \
-  RtecEventChannelAdminS_T.inl \
-  RtecEventChannelAdminC.cpp \
-  RtecEventChannelAdminS.cpp \
-  RtecEventChannelAdminC.h \
-  RtecEventChannelAdminS.h \
-  RtecEventChannelAdminS_T.h \
-  RtecEventChannelAdmin-stamp
-
-RtecEventChannelAdminS_T.cpp RtecEventChannelAdminC.inl RtecEventChannelAdminS.inl RtecEventChannelAdminS_T.inl RtecEventChannelAdminC.cpp RtecEventChannelAdminS.cpp RtecEventChannelAdminC.h RtecEventChannelAdminS.h RtecEventChannelAdminS_T.h: RtecEventChannelAdmin-stamp
+  RtecDefaultEventDataC.inl \
+  RtecDefaultEventDataS.inl \
+  RtecDefaultEventDataS_T.inl
 
-RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecEventChannelAdmin.idl
-	@touch $@
+RtecDefaultEventDataS_T.cpp RtecDefaultEventDataC.cpp RtecDefaultEventDataS.cpp RtecDefaultEventDataC.h RtecDefaultEventDataS.h RtecDefaultEventDataS_T.h RtecDefaultEventDataC.inl RtecDefaultEventDataS.inl RtecDefaultEventDataS_T.inl: RtecDefaultEventData.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecDefaultEventData.idl
 
 BUILT_SOURCES += \
   RtecEventCommS_T.cpp \
-  RtecEventCommC.inl \
-  RtecEventCommS.inl \
-  RtecEventCommS_T.inl \
   RtecEventCommC.cpp \
   RtecEventCommS.cpp \
   RtecEventCommC.h \
   RtecEventCommS.h \
-  RtecEventCommS_T.h
+  RtecEventCommS_T.h \
+  RtecEventCommC.inl \
+  RtecEventCommS.inl \
+  RtecEventCommS_T.inl
 
 CLEANFILES += \
   RtecEventCommS_T.cpp \
-  RtecEventCommC.inl \
-  RtecEventCommS.inl \
-  RtecEventCommS_T.inl \
   RtecEventCommC.cpp \
   RtecEventCommS.cpp \
   RtecEventCommC.h \
   RtecEventCommS.h \
   RtecEventCommS_T.h \
-  RtecEventComm-stamp
+  RtecEventCommC.inl \
+  RtecEventCommS.inl \
+  RtecEventCommS_T.inl
+
+RtecEventCommS_T.cpp RtecEventCommC.cpp RtecEventCommS.cpp RtecEventCommC.h RtecEventCommS.h RtecEventCommS_T.h RtecEventCommC.inl RtecEventCommS.inl RtecEventCommS_T.inl: RtecEventComm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecEventComm.idl
 
-RtecEventCommS_T.cpp RtecEventCommC.inl RtecEventCommS.inl RtecEventCommS_T.inl RtecEventCommC.cpp RtecEventCommS.cpp RtecEventCommC.h RtecEventCommS.h RtecEventCommS_T.h: RtecEventComm-stamp
+BUILT_SOURCES += \
+  RtecEventChannelAdminS_T.cpp \
+  RtecEventChannelAdminC.cpp \
+  RtecEventChannelAdminS.cpp \
+  RtecEventChannelAdminC.h \
+  RtecEventChannelAdminS.h \
+  RtecEventChannelAdminS_T.h \
+  RtecEventChannelAdminC.inl \
+  RtecEventChannelAdminS.inl \
+  RtecEventChannelAdminS_T.inl
+
+CLEANFILES += \
+  RtecEventChannelAdminS_T.cpp \
+  RtecEventChannelAdminC.cpp \
+  RtecEventChannelAdminS.cpp \
+  RtecEventChannelAdminC.h \
+  RtecEventChannelAdminS.h \
+  RtecEventChannelAdminS_T.h \
+  RtecEventChannelAdminC.inl \
+  RtecEventChannelAdminS.inl \
+  RtecEventChannelAdminS_T.inl
 
-RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecEventComm.idl
-	@touch $@
+RtecEventChannelAdminS_T.cpp RtecEventChannelAdminC.cpp RtecEventChannelAdminS.cpp RtecEventChannelAdminC.h RtecEventChannelAdminS.h RtecEventChannelAdminS_T.h RtecEventChannelAdminC.inl RtecEventChannelAdminS.inl RtecEventChannelAdminS_T.inl: RtecEventChannelAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecEventChannelAdmin.idl
 
 BUILT_SOURCES += \
   RtecUDPAdminS_T.cpp \
-  RtecUDPAdminC.inl \
-  RtecUDPAdminS.inl \
-  RtecUDPAdminS_T.inl \
   RtecUDPAdminC.cpp \
   RtecUDPAdminS.cpp \
   RtecUDPAdminC.h \
   RtecUDPAdminS.h \
-  RtecUDPAdminS_T.h
+  RtecUDPAdminS_T.h \
+  RtecUDPAdminC.inl \
+  RtecUDPAdminS.inl \
+  RtecUDPAdminS_T.inl
 
 CLEANFILES += \
   RtecUDPAdminS_T.cpp \
-  RtecUDPAdminC.inl \
-  RtecUDPAdminS.inl \
-  RtecUDPAdminS_T.inl \
   RtecUDPAdminC.cpp \
   RtecUDPAdminS.cpp \
   RtecUDPAdminC.h \
   RtecUDPAdminS.h \
   RtecUDPAdminS_T.h \
-  RtecUDPAdmin-stamp
-
-RtecUDPAdminS_T.cpp RtecUDPAdminC.inl RtecUDPAdminS.inl RtecUDPAdminS_T.inl RtecUDPAdminC.cpp RtecUDPAdminS.cpp RtecUDPAdminC.h RtecUDPAdminS.h RtecUDPAdminS_T.h: RtecUDPAdmin-stamp
+  RtecUDPAdminC.inl \
+  RtecUDPAdminS.inl \
+  RtecUDPAdminS_T.inl
 
-RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecUDPAdmin.idl
-	@touch $@
+RtecUDPAdminS_T.cpp RtecUDPAdminC.cpp RtecUDPAdminS.cpp RtecUDPAdminC.h RtecUDPAdminS.h RtecUDPAdminS_T.h RtecUDPAdminC.inl RtecUDPAdminS.inl RtecUDPAdminS_T.inl: RtecUDPAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecUDPAdmin.idl
 
 RTEvent = \
+  RtecDefaultEventDataC.cpp \
+  RtecDefaultEventDataS.cpp \
+  RtecEventCommC.cpp \
+  RtecEventCommS.cpp \
+  RtecEventChannelAdminC.cpp \
+  RtecEventChannelAdminS.cpp \
+  RtecUDPAdminC.cpp \
+  RtecUDPAdminS.cpp \
+  Event_Utilities.cpp \
   Event/ECG_Adapters.cpp \
   Event/ECG_Address_Server_Base.cpp \
   Event/ECG_CDR_Message_Receiver.cpp \
   Event/ECG_CDR_Message_Sender.cpp \
   Event/ECG_Complex_Address_Server.cpp \
-  Event/ECG_ConsumerEC_Control.cpp \
   Event/ECG_Mcast_EH.cpp \
   Event/ECG_Mcast_Gateway.cpp \
-  Event/ECG_Reactive_ConsumerEC_Control.cpp \
-  Event/ECG_Reconnect_ConsumerEC_Control.cpp \
   Event/ECG_Simple_Address_Server.cpp \
   Event/ECG_Simple_Mcast_EH.cpp \
   Event/ECG_UDP_EH.cpp \
   Event/ECG_UDP_Out_Endpoint.cpp \
   Event/ECG_UDP_Receiver.cpp \
   Event/ECG_UDP_Sender.cpp \
+  Event/ECG_ConsumerEC_Control.cpp \
+  Event/ECG_Reactive_ConsumerEC_Control.cpp \
+  Event/ECG_Reconnect_ConsumerEC_Control.cpp \
   Event/EC_And_Filter.cpp \
   Event/EC_Basic_Factory.cpp \
   Event/EC_Basic_Filter_Builder.cpp \
@@ -3084,8 +2546,8 @@ RTEvent = \
   Event/EC_Group_Scheduling.cpp \
   Event/EC_Lifetime_Utils.cpp \
   Event/EC_Lifetime_Utils_T.cpp \
-  Event/EC_MT_Dispatching.cpp \
   Event/EC_Masked_Type_Filter.cpp \
+  Event/EC_MT_Dispatching.cpp \
   Event/EC_Negation_Filter.cpp \
   Event/EC_Null_Factory.cpp \
   Event/EC_Null_Scheduling.cpp \
@@ -3109,16 +2571,7 @@ RTEvent = \
   Event/EC_Timeout_Generator.cpp \
   Event/EC_Trivial_Supplier_Filter.cpp \
   Event/EC_Type_Filter.cpp \
-  Event/EC_UDP_Admin.cpp \
-  Event_Utilities.cpp \
-  RtecDefaultEventDataC.cpp \
-  RtecDefaultEventDataS.cpp \
-  RtecEventChannelAdminC.cpp \
-  RtecEventChannelAdminS.cpp \
-  RtecEventCommC.cpp \
-  RtecEventCommS.cpp \
-  RtecUDPAdminC.cpp \
-  RtecUDPAdminS.cpp
+  Event/EC_UDP_Admin.cpp
 
 lib_LTLIBRARIES += libTAO_RTEvent.la
 
@@ -3127,8 +2580,6 @@ libTAO_RTEvent_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_RTEVENT_BUILD_DLL
 
 libTAO_RTEvent_la_SOURCES = \
@@ -3138,314 +2589,295 @@ libTAO_RTEvent_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTEvent_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
   Event/ECG_Adapters.h \
-  Event/ECG_Address_Server_Base.h \
-  Event/ECG_CDR_Message_Receiver.h \
-  Event/ECG_CDR_Message_Sender.h \
-  Event/ECG_Complex_Address_Server.h \
-  Event/ECG_ConsumerEC_Control.h \
-  Event/ECG_Mcast_EH.h \
-  Event/ECG_Mcast_Gateway.h \
-  Event/ECG_Reactive_ConsumerEC_Control.h \
-  Event/ECG_Reconnect_ConsumerEC_Control.h \
-  Event/ECG_Simple_Address_Server.h \
+  Event/EC_Filter_Builder.h \
+  Event/EC_Masked_Type_Filter.h \
+  Event/EC_Factory.h \
   Event/ECG_Simple_Mcast_EH.h \
-  Event/ECG_UDP_EH.h \
-  Event/ECG_UDP_Out_Endpoint.h \
-  Event/ECG_UDP_Receiver.h \
-  Event/ECG_UDP_Sender.h \
-  Event/EC_And_Filter.h \
+  RtecEventChannelAdminC.h \
   Event/EC_Basic_Factory.h \
-  Event/EC_Basic_Filter_Builder.h \
-  Event/EC_Bitmask_Filter.h \
-  Event/EC_Busy_Lock.h \
-  Event/EC_Channel_Destroyer.h \
-  Event/EC_Conjunction_Filter.h \
+  Event/EC_MT_Dispatching.h \
+  RtecEventChannelAdminS.h \
+  Event/EC_Per_Supplier_Filter.h \
+  Event/EC_UDP_Admin.h \
+  Event/EC_Scheduling_Strategy.h \
+  Event/ECG_ConsumerEC_Control.h \
+  Event/EC_Timeout_Generator.h \
   Event/EC_ConsumerAdmin.h \
-  Event/EC_ConsumerControl.h \
-  Event/EC_Default_Factory.h \
-  Event/EC_Default_ProxyConsumer.h \
-  Event/EC_Default_ProxySupplier.h \
-  Event/EC_Disjunction_Filter.h \
   Event/EC_Dispatching.h \
-  Event/EC_Dispatching_Task.h \
+  Event/EC_Type_Filter.h \
+  Event/EC_Bitmask_Filter.h \
+  Event/EC_Group_Scheduling.h \
+  Event/EC_Reactive_Dispatching.h \
   Event/EC_Event_Channel.h \
+  Event/EC_Null_Scheduling.h \
   Event/EC_Event_Channel_Base.h \
-  Event/EC_Factory.h \
-  Event/EC_Filter.h \
-  Event/EC_Filter_Builder.h \
-  Event/EC_Gateway.h \
+  Event/EC_Reactive_Timeout_Generator.h \
+  Event/EC_QOS_Info.h \
+  Event/EC_ProxySupplier.h \
+  Event/EC_ProxyConsumer.h \
+  RtecEventCommC.h \
+  Event/EC_Conjunction_Filter.h \
+  Event/ECG_UDP_Sender.h \
+  Event/EC_Supplier_Filter.h \
+  RtecEventCommS.h \
+  Event/ECG_Address_Server_Base.h \
+  RtecUDPAdminC.h \
+  Event/EC_Disjunction_Filter.h \
   Event/EC_Gateway_IIOP.h \
-  Event/EC_Gateway_IIOP_Factory.h \
-  Event/EC_Group_Scheduling.h \
-  Event/EC_Lifetime_Utils.h \
+  RtecUDPAdminS.h \
   Event/EC_Lifetime_Utils_T.h \
-  Event/EC_MT_Dispatching.h \
-  Event/EC_Masked_Type_Filter.h \
-  Event/EC_Negation_Filter.h \
-  Event/EC_Null_Factory.h \
-  Event/EC_Null_Scheduling.h \
-  Event/EC_ObserverStrategy.h \
-  Event/EC_Per_Supplier_Filter.h \
+  Event/EC_Filter.h \
+  Event/ECG_UDP_Receiver.h \
+  Event/ECG_Complex_Address_Server.h \
+  Event/EC_Timeout_Filter.h \
+  Event_Utilities.h \
+  Event/EC_SupplierAdmin.h \
+  Event/ECG_Simple_Address_Server.h \
   Event/EC_Prefix_Filter_Builder.h \
-  Event/EC_ProxyConsumer.h \
-  Event/EC_ProxySupplier.h \
-  Event/EC_Proxy_Disconnector.h \
-  Event/EC_QOS_Info.h \
-  Event/EC_Reactive_ConsumerControl.h \
-  Event/EC_Reactive_Dispatching.h \
+  Event/EC_Supplier_Filter_Builder.h \
+  Event/EC_Gateway_IIOP_Factory.h \
+  Event/EC_Busy_Lock.h \
+  Event/EC_Default_Factory.h \
+  Event/ECG_Mcast_EH.h \
+  Event/EC_Default_ProxySupplier.h \
+  Event/ECG_UDP_Out_Endpoint.h \
   Event/EC_Reactive_SupplierControl.h \
-  Event/EC_Reactive_Timeout_Generator.h \
-  Event/EC_Scheduling_Strategy.h \
-  Event/EC_SupplierAdmin.h \
+  Event/EC_Default_ProxyConsumer.h \
+  Event/EC_ObserverStrategy.h \
+  Event/ECG_Reconnect_ConsumerEC_Control.h \
+  Event/EC_Null_Factory.h \
+  Event/ECG_CDR_Message_Receiver.h \
   Event/EC_SupplierControl.h \
-  Event/EC_Supplier_Filter.h \
-  Event/EC_Supplier_Filter_Builder.h \
-  Event/EC_Timeout_Filter.h \
-  Event/EC_Timeout_Generator.h \
-  Event/EC_Trivial_Supplier_Filter.h \
-  Event/EC_Type_Filter.h \
-  Event/EC_UDP_Admin.h \
-  Event_Utilities.h \
+  Event/EC_Proxy_Disconnector.h \
+  Event/EC_Lifetime_Utils.h \
+  Event/EC_Channel_Destroyer.h \
+  Event/EC_And_Filter.h \
+  Event/ECG_UDP_EH.h \
+  Event/ECG_Reactive_ConsumerEC_Control.h \
+  Event/EC_Gateway.h \
+  Event/EC_Dispatching_Task.h \
+  Event/EC_Reactive_ConsumerControl.h \
+  Event/EC_Negation_Filter.h \
   RtecDefaultEventDataC.h \
+  Event/ECG_Mcast_Gateway.h \
+  Event/EC_Trivial_Supplier_Filter.h \
+  Event/ECG_CDR_Message_Sender.h \
+  Event/EC_Basic_Filter_Builder.h \
   RtecDefaultEventDataS.h \
+  Event/EC_ConsumerControl.h \
   RtecDefaultEventDataS_T.h \
-  RtecEventChannelAdminC.h \
-  RtecEventChannelAdminS.h \
+  RtecUDPAdminS_T.h \
   RtecEventChannelAdminS_T.h \
-  RtecEventCommC.h \
-  RtecEventCommS.h \
+  Channel_Clients_T.h \
   RtecEventCommS_T.h \
-  RtecUDPAdminC.h \
-  RtecUDPAdminS.h \
-  RtecUDPAdminS_T.h \
-  Event/ECG_Address_Server_Base.i \
-  Event/ECG_CDR_Message_Receiver.i \
-  Event/ECG_CDR_Message_Sender.i \
-  Event/ECG_Complex_Address_Server.i \
-  Event/ECG_ConsumerEC_Control.i \
-  Event/ECG_Mcast_EH.i \
-  Event/ECG_Mcast_Gateway.i \
-  Event/ECG_Reactive_ConsumerEC_Control.i \
-  Event/ECG_Simple_Address_Server.i \
+  Event/EC_Filter_Builder.i \
+  Event/EC_Masked_Type_Filter.i \
+  Event/EC_Factory.i \
   Event/ECG_Simple_Mcast_EH.i \
-  Event/ECG_UDP_EH.i \
-  Event/ECG_UDP_Out_Endpoint.i \
-  Event/ECG_UDP_Receiver.i \
-  Event/ECG_UDP_Sender.inl \
-  Event/EC_And_Filter.i \
+  RtecEventChannelAdminC.inl \
   Event/EC_Basic_Factory.i \
-  Event/EC_Basic_Filter_Builder.i \
-  Event/EC_Bitmask_Filter.i \
-  Event/EC_Busy_Lock.i \
-  Event/EC_Conjunction_Filter.i \
+  Event/EC_MT_Dispatching.i \
+  RtecEventChannelAdminS.inl \
+  Event/EC_Per_Supplier_Filter.i \
+  Event/EC_Scheduling_Strategy.i \
+  Event/ECG_ConsumerEC_Control.i \
+  Event/EC_Timeout_Generator.i \
   Event/EC_ConsumerAdmin.i \
-  Event/EC_ConsumerControl.i \
-  Event/EC_Default_Factory.i \
-  Event/EC_Default_ProxyConsumer.i \
-  Event/EC_Default_ProxySupplier.i \
-  Event/EC_Disjunction_Filter.i \
   Event/EC_Dispatching.i \
-  Event/EC_Dispatching_Task.i \
-  Event/EC_Event_Channel.i \
-  Event/EC_Event_Channel_Base.i \
-  Event/EC_Factory.i \
-  Event/EC_Filter.i \
-  Event/EC_Filter_Builder.i \
-  Event/EC_Gateway_IIOP_Factory.i \
+  Event/EC_Type_Filter.i \
+  Event/EC_Bitmask_Filter.i \
   Event/EC_Group_Scheduling.inl \
-  Event/EC_Lifetime_Utils.i \
-  Event/EC_Lifetime_Utils_T.i \
-  Event/EC_MT_Dispatching.i \
-  Event/EC_Masked_Type_Filter.i \
-  Event/EC_Negation_Filter.i \
-  Event/EC_Null_Factory.i \
-  Event/EC_Null_Scheduling.i \
-  Event/EC_ObserverStrategy.i \
-  Event/EC_Per_Supplier_Filter.i \
-  Event/EC_Prefix_Filter_Builder.i \
-  Event/EC_ProxyConsumer.i \
-  Event/EC_ProxySupplier.i \
-  Event/EC_QOS_Info.i \
-  Event/EC_Reactive_ConsumerControl.i \
   Event/EC_Reactive_Dispatching.i \
-  Event/EC_Reactive_SupplierControl.i \
+  Event/EC_Event_Channel.i \
+  Event/EC_Null_Scheduling.i \
+  Event/EC_Event_Channel_Base.i \
   Event/EC_Reactive_Timeout_Generator.i \
-  Event/EC_Scheduling_Strategy.i \
-  Event/EC_SupplierAdmin.i \
-  Event/EC_SupplierControl.i \
+  Event/EC_QOS_Info.i \
+  Event/EC_ProxySupplier.i \
+  Event/EC_ProxyConsumer.i \
+  RtecEventCommC.inl \
+  Event/EC_Conjunction_Filter.i \
+  Event/ECG_UDP_Sender.inl \
   Event/EC_Supplier_Filter.i \
-  Event/EC_Supplier_Filter_Builder.i \
+  RtecEventCommS.inl \
+  Event/ECG_Address_Server_Base.i \
+  RtecUDPAdminC.inl \
+  Event/EC_Disjunction_Filter.i \
+  RtecUDPAdminS.inl \
+  Event/EC_Lifetime_Utils_T.i \
+  Event/EC_Filter.i \
+  Event/ECG_UDP_Receiver.i \
+  Event/ECG_Complex_Address_Server.i \
   Event/EC_Timeout_Filter.i \
-  Event/EC_Timeout_Generator.i \
-  Event/EC_Trivial_Supplier_Filter.i \
-  Event/EC_Type_Filter.i \
   Event_Utilities.i \
+  Event/EC_SupplierAdmin.i \
+  Event/ECG_Simple_Address_Server.i \
+  Event/EC_Prefix_Filter_Builder.i \
+  Event/EC_Supplier_Filter_Builder.i \
+  Event/EC_Gateway_IIOP_Factory.i \
+  Event/EC_Busy_Lock.i \
+  Event/EC_Default_Factory.i \
+  Event/ECG_Mcast_EH.i \
+  Event/EC_Default_ProxySupplier.i \
+  Event/ECG_UDP_Out_Endpoint.i \
+  Event/EC_Reactive_SupplierControl.i \
+  Event/EC_Default_ProxyConsumer.i \
+  Event/EC_ObserverStrategy.i \
+  Event/EC_Null_Factory.i \
+  Event/ECG_CDR_Message_Receiver.i \
+  Event/EC_SupplierControl.i \
+  Event/EC_Lifetime_Utils.i \
+  Event/EC_And_Filter.i \
+  Event/ECG_UDP_EH.i \
+  Event/ECG_Reactive_ConsumerEC_Control.i \
+  Event/EC_Dispatching_Task.i \
+  Event/EC_Reactive_ConsumerControl.i \
+  Event/EC_Negation_Filter.i \
   RtecDefaultEventDataC.inl \
+  Event/ECG_Mcast_Gateway.i \
+  Event/EC_Trivial_Supplier_Filter.i \
+  Event/ECG_CDR_Message_Sender.i \
+  Event/EC_Basic_Filter_Builder.i \
   RtecDefaultEventDataS.inl \
+  Event/EC_ConsumerControl.i \
   RtecDefaultEventDataS_T.inl \
-  RtecEventChannelAdminC.inl \
-  RtecEventChannelAdminS.inl \
+  RtecUDPAdminS_T.inl \
   RtecEventChannelAdminS_T.inl \
-  RtecEventCommC.inl \
-  RtecEventCommS.inl \
+  Channel_Clients_T.i \
   RtecEventCommS_T.inl \
-  RtecUDPAdminC.inl \
-  RtecUDPAdminS.inl \
-  RtecUDPAdminS_T.inl \
   RtecDefaultEventDataS_T.cpp \
-  RtecEventChannelAdminS_T.cpp \
   RtecEventCommS_T.cpp \
+  RtecEventChannelAdminS_T.cpp \
   RtecUDPAdminS_T.cpp \
-  RtecDefaultEventData.idl \
-  RtecEventChannelAdmin.idl \
-  RtecEventComm.idl \
-  RtecUDPAdmin.idl
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  RTEvent.rc
 
 ## Makefile.FtRtEvent.am 
 
-if !BUILD_MINIMUM_CORBA
-
 BUILT_SOURCES += \
   FTRTS_T.cpp \
-  FTRTC.inl \
-  FTRTS.inl \
-  FTRTS_T.inl \
   FTRTC.cpp \
   FTRTS.cpp \
   FTRTC.h \
   FTRTS.h \
-  FTRTS_T.h
+  FTRTS_T.h \
+  FTRTC.inl \
+  FTRTS.inl \
+  FTRTS_T.inl
 
 CLEANFILES += \
   FTRTS_T.cpp \
-  FTRTC.inl \
-  FTRTS.inl \
-  FTRTS_T.inl \
   FTRTC.cpp \
   FTRTS.cpp \
   FTRTC.h \
   FTRTS.h \
   FTRTS_T.h \
-  FTRT-stamp
+  FTRTC.inl \
+  FTRTS.inl \
+  FTRTS_T.inl
 
-FTRTS_T.cpp FTRTC.inl FTRTS.inl FTRTS_T.inl FTRTC.cpp FTRTS.cpp FTRTC.h FTRTS.h FTRTS_T.h: FTRT-stamp
+FTRTS_T.cpp FTRTC.cpp FTRTS.cpp FTRTC.h FTRTS.h FTRTS_T.h FTRTC.inl FTRTS.inl FTRTS_T.inl: FTRT.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl
 
-FTRT-stamp: $(srcdir)/FTRT.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl
-	@touch $@
+BUILT_SOURCES += \
+  FtRtecEventCommS_T.cpp \
+  FtRtecEventCommC.cpp \
+  FtRtecEventCommS.cpp \
+  FtRtecEventCommC.h \
+  FtRtecEventCommS.h \
+  FtRtecEventCommS_T.h \
+  FtRtecEventCommC.inl \
+  FtRtecEventCommS.inl \
+  FtRtecEventCommS_T.inl
+
+CLEANFILES += \
+  FtRtecEventCommS_T.cpp \
+  FtRtecEventCommC.cpp \
+  FtRtecEventCommS.cpp \
+  FtRtecEventCommC.h \
+  FtRtecEventCommS.h \
+  FtRtecEventCommS_T.h \
+  FtRtecEventCommC.inl \
+  FtRtecEventCommS.inl \
+  FtRtecEventCommS_T.inl
+
+FtRtecEventCommS_T.cpp FtRtecEventCommC.cpp FtRtecEventCommS.cpp FtRtecEventCommC.h FtRtecEventCommS.h FtRtecEventCommS_T.h FtRtecEventCommC.inl FtRtecEventCommS.inl FtRtecEventCommS_T.inl: FtRtecEventComm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl
 
 BUILT_SOURCES += \
   FTRT_GroupManagerS_T.cpp \
-  FTRT_GroupManagerC.inl \
-  FTRT_GroupManagerS.inl \
-  FTRT_GroupManagerS_T.inl \
   FTRT_GroupManagerC.cpp \
   FTRT_GroupManagerS.cpp \
   FTRT_GroupManagerC.h \
   FTRT_GroupManagerS.h \
-  FTRT_GroupManagerS_T.h
+  FTRT_GroupManagerS_T.h \
+  FTRT_GroupManagerC.inl \
+  FTRT_GroupManagerS.inl \
+  FTRT_GroupManagerS_T.inl
 
 CLEANFILES += \
   FTRT_GroupManagerS_T.cpp \
-  FTRT_GroupManagerC.inl \
-  FTRT_GroupManagerS.inl \
-  FTRT_GroupManagerS_T.inl \
   FTRT_GroupManagerC.cpp \
   FTRT_GroupManagerS.cpp \
   FTRT_GroupManagerC.h \
   FTRT_GroupManagerS.h \
   FTRT_GroupManagerS_T.h \
-  FTRT_GroupManager-stamp
-
-FTRT_GroupManagerS_T.cpp FTRT_GroupManagerC.inl FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.inl FTRT_GroupManagerC.cpp FTRT_GroupManagerS.cpp FTRT_GroupManagerC.h FTRT_GroupManagerS.h FTRT_GroupManagerS_T.h: FTRT_GroupManager-stamp
+  FTRT_GroupManagerC.inl \
+  FTRT_GroupManagerS.inl \
+  FTRT_GroupManagerS_T.inl
 
-FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl
-	@touch $@
+FTRT_GroupManagerS_T.cpp FTRT_GroupManagerC.cpp FTRT_GroupManagerS.cpp FTRT_GroupManagerC.h FTRT_GroupManagerS.h FTRT_GroupManagerS_T.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.inl: FTRT_GroupManager.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl
 
 BUILT_SOURCES += \
   FtRtecEventChannelAdminS_T.cpp \
-  FtRtecEventChannelAdminC.inl \
-  FtRtecEventChannelAdminS.inl \
-  FtRtecEventChannelAdminS_T.inl \
   FtRtecEventChannelAdminC.cpp \
   FtRtecEventChannelAdminS.cpp \
   FtRtecEventChannelAdminC.h \
   FtRtecEventChannelAdminS.h \
-  FtRtecEventChannelAdminS_T.h
+  FtRtecEventChannelAdminS_T.h \
+  FtRtecEventChannelAdminC.inl \
+  FtRtecEventChannelAdminS.inl \
+  FtRtecEventChannelAdminS_T.inl
 
 CLEANFILES += \
   FtRtecEventChannelAdminS_T.cpp \
-  FtRtecEventChannelAdminC.inl \
-  FtRtecEventChannelAdminS.inl \
-  FtRtecEventChannelAdminS_T.inl \
   FtRtecEventChannelAdminC.cpp \
   FtRtecEventChannelAdminS.cpp \
   FtRtecEventChannelAdminC.h \
   FtRtecEventChannelAdminS.h \
   FtRtecEventChannelAdminS_T.h \
-  FtRtecEventChannelAdmin-stamp
-
-FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.inl FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS_T.h: FtRtecEventChannelAdmin-stamp
-
-FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FtRtecEventCommS_T.cpp \
-  FtRtecEventCommC.inl \
-  FtRtecEventCommS.inl \
-  FtRtecEventCommS_T.inl \
-  FtRtecEventCommC.cpp \
-  FtRtecEventCommS.cpp \
-  FtRtecEventCommC.h \
-  FtRtecEventCommS.h \
-  FtRtecEventCommS_T.h
-
-CLEANFILES += \
-  FtRtecEventCommS_T.cpp \
-  FtRtecEventCommC.inl \
-  FtRtecEventCommS.inl \
-  FtRtecEventCommS_T.inl \
-  FtRtecEventCommC.cpp \
-  FtRtecEventCommS.cpp \
-  FtRtecEventCommC.h \
-  FtRtecEventCommS.h \
-  FtRtecEventCommS_T.h \
-  FtRtecEventComm-stamp
-
-FtRtecEventCommS_T.cpp FtRtecEventCommC.inl FtRtecEventCommS.inl FtRtecEventCommS_T.inl FtRtecEventCommC.cpp FtRtecEventCommS.cpp FtRtecEventCommC.h FtRtecEventCommS.h FtRtecEventCommS_T.h: FtRtecEventComm-stamp
+  FtRtecEventChannelAdminC.inl \
+  FtRtecEventChannelAdminS.inl \
+  FtRtecEventChannelAdminS_T.inl
 
-FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl
-	@touch $@
+FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS_T.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.inl: FtRtecEventChannelAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl
 
 FtRtEvent = \
   FTRTC.cpp \
   FTRTS.cpp \
+  FtRtecEventCommC.cpp \
+  FtRtecEventCommS.cpp \
   FTRT_GroupManagerC.cpp \
   FTRT_GroupManagerS.cpp \
-  FtRtEvent/Utils/FTEC_Gateway.cpp \
-  FtRtEvent/Utils/Log.cpp \
-  FtRtEvent/Utils/Safe_InputCDR.cpp \
-  FtRtEvent/Utils/UUID.cpp \
   FtRtecEventChannelAdminC.cpp \
   FtRtecEventChannelAdminS.cpp \
-  FtRtecEventCommC.cpp \
-  FtRtecEventCommS.cpp
+  FtRtEvent/Utils/Safe_InputCDR.cpp \
+  FtRtEvent/Utils/FTEC_Gateway.cpp \
+  FtRtEvent/Utils/Log.cpp \
+  FtRtEvent/Utils/UUID.cpp
 
 lib_LTLIBRARIES += libTAO_FtRtEvent.la
 
@@ -3454,8 +2886,6 @@ libTAO_FtRtEvent_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_FTRTEVENT_BUILD_DLL
 
 libTAO_FtRtEvent_la_SOURCES = \
@@ -3465,76 +2895,76 @@ libTAO_FtRtEvent_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_FtRtEvent_la_LIBADD = \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_CosNaming.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_RTEvent.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ libTAO_FTORB_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORManip.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  FtRtEvent/Utils/Safe_InputCDR.h \
   FTRTC.h \
+  FtRtecEventCommC.h \
   FTRTS.h \
-  FTRTS_T.h \
+  FtRtecEventCommS.h \
   FTRT_GroupManagerC.h \
   FTRT_GroupManagerS.h \
-  FTRT_GroupManagerS_T.h \
-  FtRtEvent/Utils/FTEC_Gateway.h \
-  FtRtEvent/Utils/Log.h \
-  FtRtEvent/Utils/Safe_InputCDR.h \
-  FtRtEvent/Utils/UUID.h \
   FtRtecEventChannelAdminC.h \
   FtRtecEventChannelAdminS.h \
+  FtRtEvent/Utils/FTEC_Gateway.h \
+  FtRtEvent/Utils/UUID.h \
+  FtRtEvent/Utils/Log.h \
+  FTRTS_T.h \
+  FTRT_GroupManagerS_T.h \
+  Channel_Clients_T.h \
   FtRtecEventChannelAdminS_T.h \
-  FtRtecEventCommC.h \
-  FtRtecEventCommS.h \
   FtRtecEventCommS_T.h \
+  FtRtEvent/Utils/Safe_InputCDR.inl \
   FTRTC.inl \
+  FtRtecEventCommC.inl \
   FTRTS.inl \
-  FTRTS_T.inl \
+  FtRtecEventCommS.inl \
   FTRT_GroupManagerC.inl \
   FTRT_GroupManagerS.inl \
-  FTRT_GroupManagerS_T.inl \
-  FtRtEvent/Utils/FTEC_Gateway.inl \
-  FtRtEvent/Utils/Log.inl \
-  FtRtEvent/Utils/Safe_InputCDR.inl \
-  FtRtEvent/Utils/UUID.inl \
   FtRtecEventChannelAdminC.inl \
   FtRtecEventChannelAdminS.inl \
+  FtRtEvent/Utils/FTEC_Gateway.inl \
+  FtRtEvent/Utils/UUID.inl \
+  FtRtEvent/Utils/Log.inl \
+  FTRTS_T.inl \
+  FTRT_GroupManagerS_T.inl \
+  Channel_Clients_T.i \
   FtRtecEventChannelAdminS_T.inl \
-  FtRtecEventCommC.inl \
-  FtRtecEventCommS.inl \
   FtRtecEventCommS_T.inl \
   FTRTS_T.cpp \
   FTRT_GroupManagerS_T.cpp \
-  FtRtecEventChannelAdminS_T.cpp \
   FtRtecEventCommS_T.cpp \
-  FTRT.idl \
-  FTRT_GroupManager.idl \
-  FtRtecEventChannelAdmin.idl \
-  FtRtecEventComm.idl
+  FtRtecEventChannelAdminS_T.cpp \
+  Channel_Clients_T.cpp
 
-endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.FTRT_EventChannel.am 
 
-if BUILD_CORBA_MESSAGING
-if !BUILD_MINIMUM_CORBA
-
 FTRT_EventChannel = \
+  PortableGroup_Simple_DSC.cpp \
+  FtRtEvent/EventChannel/Update_Manager.cpp \
   FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp \
   FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp \
   FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp \
   FtRtEvent/EventChannel/Dynamic_Bitset.cpp \
+  FtRtEvent/EventChannel/FTEC_Factory.cpp \
   FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp \
   FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp \
   FtRtEvent/EventChannel/FTEC_Event_Channel.cpp \
   FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp \
-  FtRtEvent/EventChannel/FTEC_Factory.cpp \
   FtRtEvent/EventChannel/FTEC_Group_Manager.cpp \
   FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp \
   FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp \
@@ -3547,19 +2977,17 @@ FTRT_EventChannel = \
   FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp \
   FtRtEvent/EventChannel/GroupInfoPublisher.cpp \
   FtRtEvent/EventChannel/IOGR_Maker.cpp \
-  FtRtEvent/EventChannel/Identification_Service.cpp \
   FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp \
+  FtRtEvent/EventChannel/Identification_Service.cpp \
+  FtRtEvent/EventChannel/Request_Context_Repository.cpp \
   FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp \
   FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp \
   FtRtEvent/EventChannel/Replication_Service.cpp \
   FtRtEvent/EventChannel/Replication_Strategy.cpp \
-  FtRtEvent/EventChannel/Request_Context_Repository.cpp \
   FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp \
   FtRtEvent/EventChannel/Set_Update_Interceptor.cpp \
-  FtRtEvent/EventChannel/Update_Manager.cpp \
   FtRtEvent/EventChannel/UpdateableHandler.cpp \
-  FtRtEvent/EventChannel/create_persistent_poa.cpp \
-  PortableGroup_Simple_DSC.cpp
+  FtRtEvent/EventChannel/create_persistent_poa.cpp
 
 lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la
 
@@ -3568,8 +2996,6 @@ libTAO_FTRT_EventChannel_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel \
   -DTAO_FTRTEC_BUILD_DLL
 
@@ -3580,80 +3006,78 @@ libTAO_FTRT_EventChannel_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_FTRT_EventChannel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  libTAO_FtRtEvent.la \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h \
-  FtRtEvent/EventChannel/AMI_Replication_Strategy.h \
-  FtRtEvent/EventChannel/Basic_Replication_Strategy.h \
-  FtRtEvent/EventChannel/ConnectionHandler_T.h \
-  FtRtEvent/EventChannel/Dynamic_Bitset.h \
-  FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h \
-  FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h \
-  FtRtEvent/EventChannel/FTEC_Event_Channel.h \
-  FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h \
-  FtRtEvent/EventChannel/FTEC_Factory.h \
-  FtRtEvent/EventChannel/FTEC_Group_Manager.h \
-  FtRtEvent/EventChannel/FTEC_ORBInitializer.h \
-  FtRtEvent/EventChannel/FTEC_ProxyConsumer.h \
+ $(top_builddir)/tao/libTAO_Utils.la \
+ libTAO_FtRtEvent.la \
+ libTAO_CosNaming.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_RTEvent.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ libTAO_FTORB_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORManip.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  FtRtEvent/EventChannel/Fault_Detector_Loader.h \
+  FtRtEvent/EventChannel/create_persistent_poa.h \
+  FtRtEvent/EventChannel/Request_Context_Repository.h \
   FtRtEvent/EventChannel/FTEC_ProxySupplier.h \
+  FtRtEvent/EventChannel/FTEC_ProxyConsumer.h \
+  FtRtEvent/EventChannel/FTEC_Group_Manager.h \
   FtRtEvent/EventChannel/FTEC_SupplierAdmin.h \
-  FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h \
-  FtRtEvent/EventChannel/FT_ProxyAdmin_T.h \
-  FtRtEvent/EventChannel/Fault_Detector.h \
-  FtRtEvent/EventChannel/Fault_Detector_Loader.h \
-  FtRtEvent/EventChannel/Fault_Detector_T.h \
-  FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h \
-  FtRtEvent/EventChannel/FtEventServiceInterceptor.h \
-  FtRtEvent/EventChannel/GroupInfoPublisher.h \
-  FtRtEvent/EventChannel/IOGR_Maker.h \
   FtRtEvent/EventChannel/Identification_Service.h \
+  FtRtEvent/EventChannel/GroupInfoPublisher.h \
+  FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h \
+  FtRtEvent/EventChannel/Set_Update_Interceptor.h \
   FtRtEvent/EventChannel/ObjectGroupManagerHandler.h \
-  FtRtEvent/EventChannel/ProxyConsumerStateWorker.h \
+  FtRtEvent/EventChannel/Dynamic_Bitset.h \
   FtRtEvent/EventChannel/ProxySupplierStateWorker.h \
-  FtRtEvent/EventChannel/Replication_Service.h \
-  FtRtEvent/EventChannel/Replication_Strategy.h \
-  FtRtEvent/EventChannel/Request_Context_Repository.h \
   FtRtEvent/EventChannel/SCTP_Fault_Detector.h \
-  FtRtEvent/EventChannel/Set_Update_Interceptor.h \
-  FtRtEvent/EventChannel/Update_Manager.h \
+  FtRtEvent/EventChannel/Replication_Strategy.h \
+  FtRtEvent/EventChannel/IOGR_Maker.h \
+  FtRtEvent/EventChannel/FTEC_ORBInitializer.h \
+  FtRtEvent/EventChannel/FtEventServiceInterceptor.h \
+  FtRtEvent/EventChannel/Basic_Replication_Strategy.h \
+  FtRtEvent/EventChannel/FTEC_Factory.h \
+  FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h \
   FtRtEvent/EventChannel/UpdateableHandler.h \
-  FtRtEvent/EventChannel/create_persistent_poa.h \
+  FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h \
+  FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h \
+  FtRtEvent/EventChannel/Update_Manager.h \
+  FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h \
+  FtRtEvent/EventChannel/Fault_Detector.h \
+  FtRtEvent/EventChannel/Replication_Service.h \
+  FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h \
+  FtRtEvent/EventChannel/AMI_Replication_Strategy.h \
+  FtRtEvent/EventChannel/ProxyConsumerStateWorker.h \
+  FtRtEvent/EventChannel/FTEC_Event_Channel.h \
   FtRtEvent/EventChannel/ftrtec_export.h \
+  FtRtEvent/EventChannel/FT_ProxyAdmin_T.h \
+  FtRtEvent/EventChannel/ConnectionHandler_T.h \
+  FtRtEvent/EventChannel/Fault_Detector_T.h \
   FtRtEvent/EventChannel/Dynamic_Bitset.inl \
   FtRtEvent/EventChannel/ConnectionHandler_T.cpp \
-  FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp \
-  FtRtEvent/EventChannel/Fault_Detector_T.cpp
+  FtRtEvent/EventChannel/Fault_Detector_T.cpp \
+  FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_CORBA_MESSAGING
 
 ## Makefile.FT_ClientORB.am 
 
-if BUILD_ACE_UUID
-if !BUILD_MINIMUM_CORBA
-
 FT_ClientORB = \
+  FaultTolerance/FT_ClientRequest_Interceptor.cpp \
   FaultTolerance/FT_ClientORBInitializer.cpp \
   FaultTolerance/FT_ClientPolicyFactory.cpp \
   FaultTolerance/FT_ClientPolicy_i.cpp \
-  FaultTolerance/FT_ClientRequest_Interceptor.cpp \
   FaultTolerance/FT_ClientService_Activate.cpp \
   FaultTolerance/FT_Endpoint_Selector_Factory.cpp \
   FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp \
-  FaultTolerance/FT_Service_Callbacks.cpp \
-  PortableGroup_Simple_DSC.cpp
+  PortableGroup_Simple_DSC.cpp \
+  FaultTolerance/FT_Service_Callbacks.cpp
 
 lib_LTLIBRARIES += libTAO_FT_ClientORB.la
 
@@ -3662,8 +3086,6 @@ libTAO_FT_ClientORB_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_FT_CLIENTORB_BUILD_DLL
 
 libTAO_FT_ClientORB_la_SOURCES = \
@@ -3673,43 +3095,46 @@ libTAO_FT_ClientORB_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_FT_ClientORB_la_LIBADD = \
-  libTAO_PortableGroup.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FaultTolerance/FT_ClientORBInitializer.h \
-  FaultTolerance/FT_ClientPolicyFactory.h \
-  FaultTolerance/FT_ClientPolicy_i.h \
+ libTAO_PortableGroup.la \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ libTAO_FTORB_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORManip.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
   FaultTolerance/FT_ClientRequest_Interceptor.h \
-  FaultTolerance/FT_ClientService_Activate.h \
-  FaultTolerance/FT_Endpoint_Selector_Factory.h \
+  FaultTolerance/FT_ClientPolicy_i.h \
   FaultTolerance/FT_Invocation_Endpoint_Selectors.h \
+  FaultTolerance/FT_ClientORBInitializer.h \
+  FaultTolerance/FT_ClientPolicyFactory.h \
   FaultTolerance/FT_Service_Callbacks.h \
+  FaultTolerance/FT_Endpoint_Selector_Factory.h \
+  FaultTolerance/FT_ClientService_Activate.h \
+  Channel_Clients_T.h \
   FaultTolerance/FT_ClientPolicy_i.inl \
   FaultTolerance/FT_Invocation_Endpoint_Selectors.inl \
-  FaultTolerance/FT_Service_Callbacks.i
+  FaultTolerance/FT_Service_Callbacks.i \
+  Channel_Clients_T.i \
+  Channel_Clients_T.cpp
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACE_UUID
 
 ## Makefile.FT_ServerORB.am 
 
-if !BUILD_MINIMUM_CORBA
-
 FT_ServerORB = \
   FaultTolerance/FT_ServerORBInitializer.cpp \
   FaultTolerance/FT_ServerPolicyFactory.cpp \
   FaultTolerance/FT_ServerPolicy_i.cpp \
   FaultTolerance/FT_ServerRequest_Interceptor.cpp \
-  FaultTolerance/FT_ServerService_Activate.cpp \
-  PortableGroup_Simple_DSC.cpp
+  PortableGroup_Simple_DSC.cpp \
+  FaultTolerance/FT_ServerService_Activate.cpp
 
 lib_LTLIBRARIES += libTAO_FT_ServerORB.la
 
@@ -3718,8 +3143,6 @@ libTAO_FT_ServerORB_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_FT_SERVERORB_BUILD_DLL
 
 libTAO_FT_ServerORB_la_SOURCES = \
@@ -3729,187 +3152,170 @@ libTAO_FT_ServerORB_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_FT_ServerORB_la_LIBADD = \
-  libTAO_PortableGroup.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FaultTolerance/FT_ServerORBInitializer.h \
+ libTAO_PortableGroup.la \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ libTAO_FTORB_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORManip.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Channel_Clients_T.h \
   FaultTolerance/FT_ServerPolicyFactory.h \
-  FaultTolerance/FT_ServerPolicy_i.h \
   FaultTolerance/FT_ServerRequest_Interceptor.h \
+  FaultTolerance/FT_ServerPolicy_i.h \
+  FaultTolerance/FT_ServerORBInitializer.h \
   FaultTolerance/FT_ServerService_Activate.h \
-  FaultTolerance/FT_ServerPolicy_i.inl
+  Channel_Clients_T.i \
+  FaultTolerance/FT_ServerPolicy_i.inl \
+  Channel_Clients_T.cpp
 
-endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.FaultTolerance.am 
 
-if BUILD_ACE_UUID
-if !BUILD_MINIMUM_CORBA
-
 BUILT_SOURCES += \
   FT_CORBAS_T.cpp \
-  FT_CORBAC.inl \
-  FT_CORBAS.inl \
-  FT_CORBAS_T.inl \
   FT_CORBAC.cpp \
   FT_CORBAS.cpp \
   FT_CORBAC.h \
   FT_CORBAS.h \
-  FT_CORBAS_T.h
+  FT_CORBAS_T.h \
+  FT_CORBAC.inl \
+  FT_CORBAS.inl \
+  FT_CORBAS_T.inl
 
 CLEANFILES += \
   FT_CORBAS_T.cpp \
-  FT_CORBAC.inl \
-  FT_CORBAS.inl \
-  FT_CORBAS_T.inl \
   FT_CORBAC.cpp \
   FT_CORBAS.cpp \
   FT_CORBAC.h \
   FT_CORBAS.h \
   FT_CORBAS_T.h \
-  FT_CORBA-stamp
-
-FT_CORBAS_T.cpp FT_CORBAC.inl FT_CORBAS.inl FT_CORBAS_T.inl FT_CORBAC.cpp FT_CORBAS.cpp FT_CORBAC.h FT_CORBAS.h FT_CORBAS_T.h: FT_CORBA-stamp
+  FT_CORBAC.inl \
+  FT_CORBAS.inl \
+  FT_CORBAS_T.inl
 
-FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl
-	@touch $@
+FT_CORBAS_T.cpp FT_CORBAC.cpp FT_CORBAS.cpp FT_CORBAC.h FT_CORBAS.h FT_CORBAS_T.h FT_CORBAC.inl FT_CORBAS.inl FT_CORBAS_T.inl: FT_CORBA.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl
 
 BUILT_SOURCES += \
-  FT_FaultDetectorFactoryS_T.cpp \
-  FT_FaultDetectorFactoryC.inl \
-  FT_FaultDetectorFactoryS.inl \
-  FT_FaultDetectorFactoryS_T.inl \
-  FT_FaultDetectorFactoryC.cpp \
-  FT_FaultDetectorFactoryS.cpp \
-  FT_FaultDetectorFactoryC.h \
-  FT_FaultDetectorFactoryS.h \
-  FT_FaultDetectorFactoryS_T.h
+  FT_ReplicaS_T.cpp \
+  FT_ReplicaC.cpp \
+  FT_ReplicaS.cpp \
+  FT_ReplicaC.h \
+  FT_ReplicaS.h \
+  FT_ReplicaS_T.h \
+  FT_ReplicaC.inl \
+  FT_ReplicaS.inl \
+  FT_ReplicaS_T.inl
 
 CLEANFILES += \
-  FT_FaultDetectorFactoryS_T.cpp \
-  FT_FaultDetectorFactoryC.inl \
-  FT_FaultDetectorFactoryS.inl \
-  FT_FaultDetectorFactoryS_T.inl \
-  FT_FaultDetectorFactoryC.cpp \
-  FT_FaultDetectorFactoryS.cpp \
-  FT_FaultDetectorFactoryC.h \
-  FT_FaultDetectorFactoryS.h \
-  FT_FaultDetectorFactoryS_T.h \
-  FT_FaultDetectorFactory-stamp
-
-FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.inl FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS_T.h: FT_FaultDetectorFactory-stamp
+  FT_ReplicaS_T.cpp \
+  FT_ReplicaC.cpp \
+  FT_ReplicaS.cpp \
+  FT_ReplicaC.h \
+  FT_ReplicaS.h \
+  FT_ReplicaS_T.h \
+  FT_ReplicaC.inl \
+  FT_ReplicaS.inl \
+  FT_ReplicaS_T.inl
 
-FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl
-	@touch $@
+FT_ReplicaS_T.cpp FT_ReplicaC.cpp FT_ReplicaS.cpp FT_ReplicaC.h FT_ReplicaS.h FT_ReplicaS_T.h FT_ReplicaC.inl FT_ReplicaS.inl FT_ReplicaS_T.inl: FT_Replica.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl
 
 BUILT_SOURCES += \
   FT_NotifierS_T.cpp \
-  FT_NotifierC.inl \
-  FT_NotifierS.inl \
-  FT_NotifierS_T.inl \
   FT_NotifierC.cpp \
   FT_NotifierS.cpp \
   FT_NotifierC.h \
   FT_NotifierS.h \
-  FT_NotifierS_T.h
+  FT_NotifierS_T.h \
+  FT_NotifierC.inl \
+  FT_NotifierS.inl \
+  FT_NotifierS_T.inl
 
 CLEANFILES += \
   FT_NotifierS_T.cpp \
-  FT_NotifierC.inl \
-  FT_NotifierS.inl \
-  FT_NotifierS_T.inl \
   FT_NotifierC.cpp \
   FT_NotifierS.cpp \
   FT_NotifierC.h \
   FT_NotifierS.h \
   FT_NotifierS_T.h \
-  FT_Notifier-stamp
-
-FT_NotifierS_T.cpp FT_NotifierC.inl FT_NotifierS.inl FT_NotifierS_T.inl FT_NotifierC.cpp FT_NotifierS.cpp FT_NotifierC.h FT_NotifierS.h FT_NotifierS_T.h: FT_Notifier-stamp
+  FT_NotifierC.inl \
+  FT_NotifierS.inl \
+  FT_NotifierS_T.inl
 
-FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl
-	@touch $@
+FT_NotifierS_T.cpp FT_NotifierC.cpp FT_NotifierS.cpp FT_NotifierC.h FT_NotifierS.h FT_NotifierS_T.h FT_NotifierC.inl FT_NotifierS.inl FT_NotifierS_T.inl: FT_Notifier.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl
 
 BUILT_SOURCES += \
-  FT_ReplicaS_T.cpp \
-  FT_ReplicaC.inl \
-  FT_ReplicaS.inl \
-  FT_ReplicaS_T.inl \
-  FT_ReplicaC.cpp \
-  FT_ReplicaS.cpp \
-  FT_ReplicaC.h \
-  FT_ReplicaS.h \
-  FT_ReplicaS_T.h
+  FT_FaultDetectorFactoryS_T.cpp \
+  FT_FaultDetectorFactoryC.cpp \
+  FT_FaultDetectorFactoryS.cpp \
+  FT_FaultDetectorFactoryC.h \
+  FT_FaultDetectorFactoryS.h \
+  FT_FaultDetectorFactoryS_T.h \
+  FT_FaultDetectorFactoryC.inl \
+  FT_FaultDetectorFactoryS.inl \
+  FT_FaultDetectorFactoryS_T.inl
 
 CLEANFILES += \
-  FT_ReplicaS_T.cpp \
-  FT_ReplicaC.inl \
-  FT_ReplicaS.inl \
-  FT_ReplicaS_T.inl \
-  FT_ReplicaC.cpp \
-  FT_ReplicaS.cpp \
-  FT_ReplicaC.h \
-  FT_ReplicaS.h \
-  FT_ReplicaS_T.h \
-  FT_Replica-stamp
-
-FT_ReplicaS_T.cpp FT_ReplicaC.inl FT_ReplicaS.inl FT_ReplicaS_T.inl FT_ReplicaC.cpp FT_ReplicaS.cpp FT_ReplicaC.h FT_ReplicaS.h FT_ReplicaS_T.h: FT_Replica-stamp
+  FT_FaultDetectorFactoryS_T.cpp \
+  FT_FaultDetectorFactoryC.cpp \
+  FT_FaultDetectorFactoryS.cpp \
+  FT_FaultDetectorFactoryC.h \
+  FT_FaultDetectorFactoryS.h \
+  FT_FaultDetectorFactoryS_T.h \
+  FT_FaultDetectorFactoryC.inl \
+  FT_FaultDetectorFactoryS.inl \
+  FT_FaultDetectorFactoryS_T.inl
 
-FT_Replica-stamp: $(srcdir)/FT_Replica.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl
-	@touch $@
+FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS_T.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.inl: FT_FaultDetectorFactory.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl
 
 BUILT_SOURCES += \
   FT_ReplicationManagerS_T.cpp \
-  FT_ReplicationManagerC.inl \
-  FT_ReplicationManagerS.inl \
-  FT_ReplicationManagerS_T.inl \
   FT_ReplicationManagerC.cpp \
   FT_ReplicationManagerS.cpp \
   FT_ReplicationManagerC.h \
   FT_ReplicationManagerS.h \
-  FT_ReplicationManagerS_T.h
+  FT_ReplicationManagerS_T.h \
+  FT_ReplicationManagerC.inl \
+  FT_ReplicationManagerS.inl \
+  FT_ReplicationManagerS_T.inl
 
 CLEANFILES += \
   FT_ReplicationManagerS_T.cpp \
-  FT_ReplicationManagerC.inl \
-  FT_ReplicationManagerS.inl \
-  FT_ReplicationManagerS_T.inl \
   FT_ReplicationManagerC.cpp \
   FT_ReplicationManagerS.cpp \
   FT_ReplicationManagerC.h \
   FT_ReplicationManagerS.h \
   FT_ReplicationManagerS_T.h \
-  FT_ReplicationManager-stamp
-
-FT_ReplicationManagerS_T.cpp FT_ReplicationManagerC.inl FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.inl FT_ReplicationManagerC.cpp FT_ReplicationManagerS.cpp FT_ReplicationManagerC.h FT_ReplicationManagerS.h FT_ReplicationManagerS_T.h: FT_ReplicationManager-stamp
+  FT_ReplicationManagerC.inl \
+  FT_ReplicationManagerS.inl \
+  FT_ReplicationManagerS_T.inl
 
-FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl
-	@touch $@
+FT_ReplicationManagerS_T.cpp FT_ReplicationManagerC.cpp FT_ReplicationManagerS.cpp FT_ReplicationManagerC.h FT_ReplicationManagerS.h FT_ReplicationManagerS_T.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.inl: FT_ReplicationManager.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl
 
 FaultTolerance = \
   FT_CORBAC.cpp \
   FT_CORBAS.cpp \
-  FT_FaultDetectorFactoryC.cpp \
-  FT_FaultDetectorFactoryS.cpp \
-  FT_NotifierC.cpp \
-  FT_NotifierS.cpp \
-  FT_ReplicaC.cpp \
   FT_ReplicaS.cpp \
-  FT_ReplicationManagerC.cpp \
-  FT_ReplicationManagerS.cpp
+  FT_ReplicaC.cpp \
+  FT_NotifierS.cpp \
+  FT_NotifierC.cpp \
+  FT_FaultDetectorFactoryS.cpp \
+  FT_FaultDetectorFactoryC.cpp \
+  FT_ReplicationManagerS.cpp \
+  FT_ReplicationManagerC.cpp
 
 lib_LTLIBRARIES += libTAO_FaultTolerance.la
 
@@ -3918,9 +3324,6 @@ libTAO_FaultTolerance_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
   -DTAO_FT_BUILD_DLL
 
 libTAO_FaultTolerance_la_SOURCES = \
@@ -3930,72 +3333,48 @@ libTAO_FaultTolerance_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_FaultTolerance_la_LIBADD = \
-  libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  libTAO_FT_ServerORB.la \
-  libTAO_FT_ClientORB.la \
-  libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FT_CORBAC.h \
-  FT_CORBAS.h \
-  FT_CORBAS_T.h \
-  FT_FaultDetectorFactoryC.h \
-  FT_FaultDetectorFactoryS.h \
+ libTAO_PortableGroup.la \
+ libTAO_CosNaming.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_FT_ServerORB.la \
+ libTAO_FT_ClientORB.la \
+ libTAO_FTORB_Utils.la \
+ $(top_builddir)/tao/libTAO_IORManip.la \
+ libTAO_CosNotification.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_DynamicAny.la \
+ libTAO_ETCL.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
   FT_FaultDetectorFactoryS_T.h \
-  FT_NotifierC.h \
-  FT_NotifierS.h \
-  FT_NotifierS_T.h \
-  FT_ReplicaC.h \
-  FT_ReplicaS.h \
-  FT_ReplicaS_T.h \
-  FT_ReplicationManagerC.h \
-  FT_ReplicationManagerS.h \
+  Channel_Clients_T.h \
   FT_ReplicationManagerS_T.h \
-  FT_CORBAC.inl \
-  FT_CORBAS.inl \
-  FT_CORBAS_T.inl \
-  FT_FaultDetectorFactoryC.inl \
-  FT_FaultDetectorFactoryS.inl \
+  FT_ReplicaS_T.h \
+  FT_NotifierS_T.h \
+  FT_CORBAS_T.h \
   FT_FaultDetectorFactoryS_T.inl \
-  FT_NotifierC.inl \
-  FT_NotifierS.inl \
-  FT_NotifierS_T.inl \
-  FT_ReplicaC.inl \
-  FT_ReplicaS.inl \
-  FT_ReplicaS_T.inl \
-  FT_ReplicationManagerC.inl \
-  FT_ReplicationManagerS.inl \
+  Channel_Clients_T.i \
   FT_ReplicationManagerS_T.inl \
+  FT_ReplicaS_T.inl \
+  FT_NotifierS_T.inl \
+  FT_CORBAS_T.inl \
   FT_CORBAS_T.cpp \
-  FT_FaultDetectorFactoryS_T.cpp \
-  FT_NotifierS_T.cpp \
   FT_ReplicaS_T.cpp \
   FT_ReplicationManagerS_T.cpp \
-  FT_CORBA.idl \
-  FT_FaultDetectorFactory.idl \
-  FT_Notifier.idl \
-  FT_Replica.idl \
-  FT_ReplicationManager.idl
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACE_UUID
+  FT_NotifierS_T.cpp \
+  FT_FaultDetectorFactoryS_T.cpp \
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  FaultTolerance.rc
 
 ## Makefile.IFRService.am 
 
-if !BUILD_MINIMUM_CORBA
-
 IFRService = \
   IFRService/AbstractInterfaceDef_i.cpp \
   IFRService/AliasDef_i.cpp \
@@ -4014,6 +3393,7 @@ IFRService = \
   IFRService/EventDef_i.cpp \
   IFRService/EventPortDef_i.cpp \
   IFRService/ExceptionDef_i.cpp \
+  IFRService/IFR_BaseS.cpp \
   IFRService/ExtAbstractInterfaceDef_i.cpp \
   IFRService/ExtAttributeDef_i.cpp \
   IFRService/ExtInterfaceDef_i.cpp \
@@ -4024,20 +3404,19 @@ IFRService = \
   IFRService/FixedDef_i.cpp \
   IFRService/HomeDef_i.cpp \
   IFRService/IDLType_i.cpp \
-  IFRService/IFR_BaseS.cpp \
-  IFRService/IFR_BasicS.cpp \
   IFRService/IFR_ComponentsS.cpp \
-  IFRService/IFR_ExtendedS.cpp \
+  IFRService/IFR_BasicS.cpp \
   IFRService/IFR_Service_Loader.cpp \
+  IFRService/IFR_ExtendedS.cpp \
   IFRService/IFR_Service_Utils.cpp \
-  IFRService/IRObject_i.cpp \
   IFRService/InterfaceAttrExtension_i.cpp \
+  IFRService/IRObject_i.cpp \
   IFRService/InterfaceDef_i.cpp \
+  IFRService/Options.cpp \
   IFRService/LocalInterfaceDef_i.cpp \
   IFRService/ModuleDef_i.cpp \
   IFRService/NativeDef_i.cpp \
   IFRService/OperationDef_i.cpp \
-  IFRService/Options.cpp \
   IFRService/PrimitiveDef_i.cpp \
   IFRService/ProvidesDef_i.cpp \
   IFRService/PublishesDef_i.cpp \
@@ -4061,8 +3440,6 @@ libTAO_IFRService_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_IFRSERVICE_BUILD_DLL
 
 libTAO_IFRService_la_SOURCES = \
@@ -4072,84 +3449,84 @@ libTAO_IFRService_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_IFRService_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_TypeCodeFactory.la \
+ $(top_builddir)/tao/libTAO_IFR_Client.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  IFRService/ComponentRepository_i.h \
+  IFRService/ExtAbstractInterfaceDef_i.h \
+  IFRService/ComponentContainer_i.h \
+  IFRService/InterfaceAttrExtension_i.h \
+  IFRService/IFR_BaseS.h \
+  IFRService/EventPortDef_i.h \
+  IFRService/FinderDef_i.h \
+  IFRService/EmitsDef_i.h \
+  IFRService/Container_i.h \
+  IFRService/AttributeDef_i.h \
+  IFRService/ConsumesDef_i.h \
+  IFRService/ProvidesDef_i.h \
+  IFRService/InterfaceDef_i.h \
+  IFRService/OperationDef_i.h \
+  IFRService/FactoryDef_i.h \
+  IFRService/EnumDef_i.h \
+  IFRService/ExtAttributeDef_i.h \
+  IFRService/FixedDef_i.h \
+  IFRService/ExtLocalInterfaceDef_i.h \
   IFRService/AbstractInterfaceDef_i.h \
+  IFRService/ExtInterfaceDef_i.h \
+  IFRService/LocalInterfaceDef_i.h \
+  IFRService/UnionDef_i.h \
   IFRService/AliasDef_i.h \
-  IFRService/ArrayDef_i.h \
-  IFRService/AttributeDef_i.h \
-  IFRService/ComponentContainer_i.h \
+  IFRService/PublishesDef_i.h \
   IFRService/ComponentDef_i.h \
   IFRService/ComponentModuleDef_i.h \
-  IFRService/ComponentRepository_i.h \
-  IFRService/ConstantDef_i.h \
-  IFRService/ConsumesDef_i.h \
+  IFRService/ValueMemberDef_i.h \
+  IFRService/ValueDef_i.h \
+  IFRService/TypedefDef_i.h \
+  IFRService/Options.h \
   IFRService/Contained_i.h \
-  IFRService/Container_i.h \
-  IFRService/EmitsDef_i.h \
-  IFRService/EnumDef_i.h \
+  IFRService/PrimitiveDef_i.h \
   IFRService/EventDef_i.h \
-  IFRService/EventPortDef_i.h \
   IFRService/ExceptionDef_i.h \
-  IFRService/ExtAbstractInterfaceDef_i.h \
-  IFRService/ExtAttributeDef_i.h \
-  IFRService/ExtInterfaceDef_i.h \
-  IFRService/ExtLocalInterfaceDef_i.h \
-  IFRService/ExtValueDef_i.h \
-  IFRService/FactoryDef_i.h \
-  IFRService/FinderDef_i.h \
-  IFRService/FixedDef_i.h \
+  IFRService/IFR_Service_Utils.h \
+  IFRService/ArrayDef_i.h \
+  IFRService/IFR_ExtendedS.h \
+  IFRService/StructDef_i.h \
   IFRService/HomeDef_i.h \
-  IFRService/IDLType_i.h \
-  IFRService/IFR_BaseS.h \
-  IFRService/IFR_BasicS.h \
+  IFRService/ConstantDef_i.h \
   IFRService/IFR_ComponentsS.h \
-  IFRService/IFR_ExtendedS.h \
-  IFRService/IFR_Service_Loader.h \
-  IFRService/IFR_Service_Utils.h \
-  IFRService/IRObject_i.h \
-  IFRService/InterfaceAttrExtension_i.h \
-  IFRService/InterfaceDef_i.h \
-  IFRService/LocalInterfaceDef_i.h \
+  IFRService/IFR_BasicS.h \
   IFRService/ModuleDef_i.h \
-  IFRService/NativeDef_i.h \
-  IFRService/OperationDef_i.h \
-  IFRService/Options.h \
-  IFRService/PrimitiveDef_i.h \
-  IFRService/ProvidesDef_i.h \
-  IFRService/PublishesDef_i.h \
+  IFRService/WstringDef_i.h \
+  IFRService/StringDef_i.h \
   IFRService/Repository_i.h \
   IFRService/SequenceDef_i.h \
-  IFRService/StringDef_i.h \
-  IFRService/StructDef_i.h \
-  IFRService/TypedefDef_i.h \
-  IFRService/UnionDef_i.h \
-  IFRService/UsesDef_i.h \
+  IFRService/IFR_Service_Loader.h \
+  IFRService/IDLType_i.h \
+  IFRService/ExtValueDef_i.h \
   IFRService/ValueBoxDef_i.h \
-  IFRService/ValueDef_i.h \
-  IFRService/ValueMemberDef_i.h \
-  IFRService/WstringDef_i.h \
+  IFRService/NativeDef_i.h \
+  IFRService/IRObject_i.h \
+  IFRService/UsesDef_i.h \
+  Channel_Clients_T.h \
   IFRService/IFR_BaseS.i \
-  IFRService/IFR_BasicS.i \
+  IFRService/IFR_ExtendedS.i \
   IFRService/IFR_ComponentsS.i \
-  IFRService/IFR_ExtendedS.i
-
-endif !BUILD_MINIMUM_CORBA
+  IFRService/IFR_BasicS.i \
+  Channel_Clients_T.i \
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  IFRService.rc
 
 ## Makefile.RTCORBAEvent.am 
 
-if BUILD_RT_CORBA
-
 RTCORBAEvent = \
   Event/EC_RTCORBA_Dispatching.cpp \
   Event/EC_RTCORBA_Factory.cpp
@@ -4161,8 +3538,6 @@ libTAO_RTCORBAEvent_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_RTCORBAEVENT_BUILD_DLL
 
 libTAO_RTCORBAEvent_la_SOURCES = \
@@ -4172,65 +3547,63 @@ libTAO_RTCORBAEvent_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTCORBAEvent_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ $(top_builddir)/tao/libTAO_RTPortableServer.la \
+ $(top_builddir)/tao/libTAO_RTCORBA.la \
+ libTAO_CosNaming.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_RTEvent.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Channel_Clients_T.h \
   Event/EC_RTCORBA_Dispatching.h \
   Event/EC_RTCORBA_Factory.h \
+  Channel_Clients_T.i \
   Event/EC_RTCORBA_Dispatching.inl \
-  Event/EC_RTCORBA_Factory.inl
+  Event/EC_RTCORBA_Factory.inl \
+  Channel_Clients_T.cpp
 
-endif BUILD_RT_CORBA
 
 ## Makefile.RTCosScheduling.am 
 
-if BUILD_RT_CORBA
-if BUILD_INTERCEPTORS
-
 BUILT_SOURCES += \
   RTCosSchedulingS_T.cpp \
-  RTCosSchedulingC.inl \
-  RTCosSchedulingS.inl \
-  RTCosSchedulingS_T.inl \
   RTCosSchedulingC.cpp \
   RTCosSchedulingS.cpp \
   RTCosSchedulingC.h \
   RTCosSchedulingS.h \
-  RTCosSchedulingS_T.h
+  RTCosSchedulingS_T.h \
+  RTCosSchedulingC.inl \
+  RTCosSchedulingS.inl \
+  RTCosSchedulingS_T.inl
 
 CLEANFILES += \
   RTCosSchedulingS_T.cpp \
-  RTCosSchedulingC.inl \
-  RTCosSchedulingS.inl \
-  RTCosSchedulingS_T.inl \
   RTCosSchedulingC.cpp \
   RTCosSchedulingS.cpp \
   RTCosSchedulingC.h \
   RTCosSchedulingS.h \
   RTCosSchedulingS_T.h \
-  RTCosScheduling-stamp
-
-RTCosSchedulingS_T.cpp RTCosSchedulingC.inl RTCosSchedulingS.inl RTCosSchedulingS_T.inl RTCosSchedulingC.cpp RTCosSchedulingS.cpp RTCosSchedulingC.h RTCosSchedulingS.h RTCosSchedulingS_T.h: RTCosScheduling-stamp
+  RTCosSchedulingC.inl \
+  RTCosSchedulingS.inl \
+  RTCosSchedulingS_T.inl
 
-RTCosScheduling-stamp: $(srcdir)/RTCosScheduling.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h $(srcdir)/RTCosScheduling.idl
-	@touch $@
+RTCosSchedulingS_T.cpp RTCosSchedulingC.cpp RTCosSchedulingS.cpp RTCosSchedulingC.h RTCosSchedulingS.h RTCosSchedulingS_T.h RTCosSchedulingC.inl RTCosSchedulingS.inl RTCosSchedulingS_T.inl: RTCosScheduling.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h $(srcdir)/RTCosScheduling.idl
 
 RTCosScheduling = \
+  RTCosSchedulingC.cpp \
+  RTCosSchedulingS.cpp \
   RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp \
   RTCosScheduling/RTCosScheduling_PCP_Manager.cpp \
-  RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp \
-  RTCosSchedulingC.cpp \
-  RTCosSchedulingS.cpp
+  RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
 
 lib_LTLIBRARIES += libTAO_RTCosScheduling.la
 
@@ -4239,8 +3612,6 @@ libTAO_RTCosScheduling_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_RTCOSSCHEDULING_BUILD_DLL
 
 libTAO_RTCosScheduling_la_SOURCES = \
@@ -4250,76 +3621,72 @@ libTAO_RTCosScheduling_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTCosScheduling_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  RTCosScheduling/RTCosScheduling_ClientScheduler_i.h \
-  RTCosScheduling/RTCosScheduling_PCP_Manager.h \
+ $(top_builddir)/tao/libTAO_RTPortableServer.la \
+ $(top_builddir)/tao/libTAO_RTCORBA.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
   RTCosScheduling/RTCosScheduling_ServerScheduler_i.h \
+  RTCosScheduling/RTCosScheduling_ClientScheduler_i.h \
   RTCosSchedulingC.h \
   RTCosSchedulingS.h \
+  RTCosScheduling/RTCosScheduling_PCP_Manager.h \
   RTCosSchedulingS_T.h \
-  RTCosScheduling/RTCosScheduling_ClientScheduler_i.i \
-  RTCosScheduling/RTCosScheduling_PCP_Manager.i \
   RTCosScheduling/RTCosScheduling_ServerScheduler_i.i \
+  RTCosScheduling/RTCosScheduling_ClientScheduler_i.i \
   RTCosSchedulingC.inl \
   RTCosSchedulingS.inl \
+  RTCosScheduling/RTCosScheduling_PCP_Manager.i \
   RTCosSchedulingS_T.inl \
-  RTCosSchedulingS_T.cpp \
-  RTCosScheduling.idl
+  RTCosSchedulingS_T.cpp
 
-endif BUILD_INTERCEPTORS
-endif BUILD_RT_CORBA
 
 ## Makefile.RTSched.am 
 
 BUILT_SOURCES += \
   RtecSchedulerS_T.cpp \
-  RtecSchedulerC.inl \
-  RtecSchedulerS.inl \
-  RtecSchedulerS_T.inl \
   RtecSchedulerC.cpp \
   RtecSchedulerS.cpp \
   RtecSchedulerC.h \
   RtecSchedulerS.h \
-  RtecSchedulerS_T.h
+  RtecSchedulerS_T.h \
+  RtecSchedulerC.inl \
+  RtecSchedulerS.inl \
+  RtecSchedulerS_T.inl
 
 CLEANFILES += \
   RtecSchedulerS_T.cpp \
-  RtecSchedulerC.inl \
-  RtecSchedulerS.inl \
-  RtecSchedulerS_T.inl \
   RtecSchedulerC.cpp \
   RtecSchedulerS.cpp \
   RtecSchedulerC.h \
   RtecSchedulerS.h \
   RtecSchedulerS_T.h \
-  RtecScheduler-stamp
-
-RtecSchedulerS_T.cpp RtecSchedulerC.inl RtecSchedulerS.inl RtecSchedulerS_T.inl RtecSchedulerC.cpp RtecSchedulerS.cpp RtecSchedulerC.h RtecSchedulerS.h RtecSchedulerS_T.h: RtecScheduler-stamp
+  RtecSchedulerC.inl \
+  RtecSchedulerS.inl \
+  RtecSchedulerS_T.inl
 
-RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl
-	@touch $@
+RtecSchedulerS_T.cpp RtecSchedulerC.cpp RtecSchedulerS.cpp RtecSchedulerC.h RtecSchedulerS.h RtecSchedulerS_T.h RtecSchedulerC.inl RtecSchedulerS.inl RtecSchedulerS_T.inl: RtecScheduler.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h $(srcdir)/RtecScheduler.idl
 
 Sched = \
   RtecSchedulerC.cpp \
   RtecSchedulerS.cpp \
+  Scheduler_Factory.cpp \
   Runtime_Scheduler.cpp \
+  Scheduler_Utilities.cpp \
+  Sched/Reconfig_Sched_Utils.cpp \
   Sched/Config_Scheduler.cpp \
   Sched/DynSched.cpp \
-  Sched/Reconfig_Sched_Utils.cpp \
   Sched/Reconfig_Scheduler.cpp \
   Sched/SchedEntry.cpp \
   Sched/Scheduler.cpp \
   Sched/Scheduler_Generic.cpp \
-  Sched/Strategy_Scheduler.cpp \
-  Scheduler_Factory.cpp \
-  Scheduler_Utilities.cpp
+  Sched/Strategy_Scheduler.cpp
 
 lib_LTLIBRARIES += libTAO_RTSched.la
 
@@ -4328,8 +3695,6 @@ libTAO_RTSched_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_RTSCHED_BUILD_DLL
 
 libTAO_RTSched_la_SOURCES = \
@@ -4339,46 +3704,51 @@ libTAO_RTSched_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTSched_la_LIBADD = \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  RtecSchedulerC.h \
-  RtecSchedulerS.h \
-  RtecSchedulerS_T.h \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
   Runtime_Scheduler.h \
   Sched/Config_Scheduler.h \
-  Sched/DynSched.h \
-  Sched/Reconfig_Sched_Utils.h \
   Sched/Reconfig_Scheduler.h \
-  Sched/SchedEntry.h \
+  Scheduler_Factory.h \
+  Sched/Reconfig_Sched_Utils.h \
+  RtecSchedulerC.h \
   Sched/Scheduler.h \
+  RtecSchedulerS.h \
+  Scheduler_Utilities.h \
   Sched/Scheduler_Generic.h \
+  Sched/SchedEntry.h \
+  Sched/DynSched.h \
   Sched/Strategy_Scheduler.h \
-  Scheduler_Factory.h \
-  Scheduler_Utilities.h \
-  RtecSchedulerC.inl \
-  RtecSchedulerS.inl \
-  RtecSchedulerS_T.inl \
+  Channel_Clients_T.h \
+  RtecSchedulerS_T.h \
   Runtime_Scheduler.i \
   Sched/Config_Scheduler.i \
-  Sched/DynSched.i \
-  Sched/Reconfig_Sched_Utils.i \
   Sched/Reconfig_Scheduler.i \
-  Sched/SchedEntry.i \
+  Scheduler_Factory.i \
+  Sched/Reconfig_Sched_Utils.i \
+  RtecSchedulerC.inl \
   Sched/Scheduler.i \
+  RtecSchedulerS.inl \
+  Scheduler_Utilities.i \
   Sched/Scheduler_Generic.i \
+  Sched/SchedEntry.i \
+  Sched/DynSched.i \
   Sched/Strategy_Scheduler.i \
-  Scheduler_Factory.i \
-  Scheduler_Utilities.i \
+  Channel_Clients_T.i \
+  RtecSchedulerS_T.inl \
   RtecSchedulerS_T.cpp \
-  RtecScheduler.idl
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  RTSched.rc
 
 ## Makefile.RTOLDEvent.am 
 
@@ -4391,8 +3761,8 @@ RTOLDEvent = \
   Event/Local_ESTypes.cpp \
   Event/Memory_Pools.cpp \
   Event/Module_Factory.cpp \
-  Event/RT_Task.cpp \
   Event/ReactorTask.cpp \
+  Event/RT_Task.cpp \
   Event/Timer_Module.cpp
 
 lib_LTLIBRARIES += libTAO_RTOLDEvent.la
@@ -4402,8 +3772,6 @@ libTAO_RTOLDEvent_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_RTOLDEVENT_BUILD_DLL
 
 libTAO_RTOLDEvent_la_SOURCES = \
@@ -4413,78 +3781,78 @@ libTAO_RTOLDEvent_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTOLDEvent_la_LIBADD = \
-  libTAO_RTSched.la \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_RTSched.la \
+ libTAO_CosNaming.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_RTEvent.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Event/ReactorTask.h \
+  Event/RT_Task.h \
   Event/BCU.h \
   Event/Dispatching_Modules.h \
-  Event/Event_Channel.h \
-  Event/Event_Manip.h \
-  Event/GPlot_File.h \
   Event/Local_ESTypes.h \
   Event/Memory_Pools.h \
   Event/Module_Factory.h \
-  Event/RT_Task.h \
-  Event/ReactorTask.h \
   Event/Timer_Module.h \
+  Event/GPlot_File.h \
+  Event/Event_Channel.h \
+  Event/Event_Manip.h \
+  Channel_Clients_T.h \
+  Event/RT_Task.i \
   Event/Dispatching_Modules.i \
-  Event/Event_Channel.i \
-  Event/Event_Manip.i \
-  Event/GPlot_File.i \
   Event/Local_ESTypes.i \
   Event/Memory_Pools.i \
-  Event/RT_Task.i \
-  Event/Timer_Module.i
+  Event/Timer_Module.i \
+  Event/GPlot_File.i \
+  Event/Event_Channel.i \
+  Event/Event_Manip.i \
+  Channel_Clients_T.i \
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  RTOldEvent.rc
 
 ## Makefile.RTEventLogAdmin.am 
 
 BUILT_SOURCES += \
   RTEventLogAdminS_T.cpp \
-  RTEventLogAdminC.inl \
-  RTEventLogAdminS.inl \
-  RTEventLogAdminS_T.inl \
   RTEventLogAdminC.cpp \
   RTEventLogAdminS.cpp \
   RTEventLogAdminC.h \
   RTEventLogAdminS.h \
-  RTEventLogAdminS_T.h
+  RTEventLogAdminS_T.h \
+  RTEventLogAdminC.inl \
+  RTEventLogAdminS.inl \
+  RTEventLogAdminS_T.inl
 
 CLEANFILES += \
   RTEventLogAdminS_T.cpp \
-  RTEventLogAdminC.inl \
-  RTEventLogAdminS.inl \
-  RTEventLogAdminS_T.inl \
   RTEventLogAdminC.cpp \
   RTEventLogAdminS.cpp \
   RTEventLogAdminC.h \
   RTEventLogAdminS.h \
   RTEventLogAdminS_T.h \
-  RTEventLogAdmin-stamp
-
-RTEventLogAdminS_T.cpp RTEventLogAdminC.inl RTEventLogAdminS.inl RTEventLogAdminS_T.inl RTEventLogAdminC.cpp RTEventLogAdminS.cpp RTEventLogAdminC.h RTEventLogAdminS.h RTEventLogAdminS_T.h: RTEventLogAdmin-stamp
+  RTEventLogAdminC.inl \
+  RTEventLogAdminS.inl \
+  RTEventLogAdminS_T.inl
 
-RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h $(srcdir)/RTEventLogAdmin.idl
-	@touch $@
+RTEventLogAdminS_T.cpp RTEventLogAdminC.cpp RTEventLogAdminS.cpp RTEventLogAdminC.h RTEventLogAdminS.h RTEventLogAdminS_T.h RTEventLogAdminC.inl RTEventLogAdminS.inl RTEventLogAdminS_T.inl: RTEventLogAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=Log/rteventlog_export.h $(srcdir)/RTEventLogAdmin.idl
 
 RTEventLog = \
-  Log/RTEventLogConsumer.cpp \
+  RTEventLogAdminC.cpp \
+  RTEventLogAdminS.cpp \
   Log/RTEventLogFactory_i.cpp \
-  Log/RTEventLogNotification.cpp \
   Log/RTEventLog_i.cpp \
-  RTEventLogAdminC.cpp \
-  RTEventLogAdminS.cpp
+  Log/RTEventLogConsumer.cpp \
+  Log/RTEventLogNotification.cpp
 
 lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la
 
@@ -4493,8 +3861,6 @@ libTAO_RTEventLogAdmin_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_RTEVENTLOG_BUILD_DLL
 
 libTAO_RTEventLogAdmin_la_SOURCES = \
@@ -4504,35 +3870,37 @@ libTAO_RTEventLogAdmin_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTEventLogAdmin_la_LIBADD = \
-  libTAO_DsLogAdmin_Serv.la \
-  libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_DsLogAdmin_Skel.la \
-  libTAO_DsLogAdmin.la \
-  libTAO_RTOLDEvent.la \
-  libTAO_RTSched.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Log/RTEventLogConsumer.h \
-  Log/RTEventLogFactory_i.h \
+ libTAO_DsLogAdmin.la \
+ $(top_builddir)/tao/libTAO_DynamicAny.la \
+ libTAO_ETCL.la \
+ libTAO_RTOLDEvent.la \
+ libTAO_RTSched.la \
+ libTAO_RTEvent.la \
+ libTAO_CosNaming.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Channel_Clients_T.h \
+  RTEventLogAdminS_T.h \
   Log/RTEventLogNotification.h \
   Log/RTEventLog_i.h \
   RTEventLogAdminC.h \
   RTEventLogAdminS.h \
-  RTEventLogAdminS_T.h \
-  RTEventLogAdminC.inl \
-  RTEventLogAdminS.inl \
+  Log/RTEventLogConsumer.h \
+  Log/RTEventLogFactory_i.h \
+  Channel_Clients_T.i \
   RTEventLogAdminS_T.inl \
   RTEventLogAdminS_T.cpp \
-  RTEventLogAdmin.idl
+  Channel_Clients_T.cpp
+
 
 ## Makefile.RTKokyuEvent.am 
 
@@ -4550,8 +3918,6 @@ libTAO_RTKokyuEvent_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(ACE_ROOT)/Kokyu \
   -DTAO_RTKOKYUEVENT_BUILD_DLL
 
@@ -4562,28 +3928,34 @@ libTAO_RTKokyuEvent_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTKokyuEvent_la_LIBADD = \
-  -lKokyu \
-  libTAO_RTSched.la \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ -lKokyu libTAO_RTSched.la \
+ libTAO_CosNaming.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_RTEvent.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Event/EC_Kokyu_Scheduling.h \
   Event/EC_Kokyu_Dispatching.h \
-  Event/EC_Kokyu_Factory.h \
   Event/EC_Kokyu_Filter.h \
   Event/EC_Kokyu_Filter_Builder.h \
-  Event/EC_Kokyu_Scheduling.h \
+  Event/EC_Kokyu_Factory.h \
+  Channel_Clients_T.h \
+  Event/EC_Kokyu_Scheduling.i \
   Event/EC_Kokyu_Dispatching.i \
-  Event/EC_Kokyu_Factory.i \
   Event/EC_Kokyu_Filter.i \
   Event/EC_Kokyu_Filter_Builder.i \
-  Event/EC_Kokyu_Scheduling.i
+  Event/EC_Kokyu_Factory.i \
+  Channel_Clients_T.i \
+  Channel_Clients_T.cpp
+
 
 ## Makefile.RTSchedEvent.am 
 
@@ -4602,8 +3974,6 @@ libTAO_RTSchedEvent_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_RTSCHEDEVENT_BUILD_DLL
 
 libTAO_RTSchedEvent_la_SOURCES = \
@@ -4613,37 +3983,38 @@ libTAO_RTSchedEvent_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTSchedEvent_la_LIBADD = \
-  libTAO_RTSched.la \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_RTSched.la \
+ libTAO_CosNaming.la \
+ $(top_builddir)/tao/libTAO_IORTable.la \
+ libTAO_RTEvent.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_Messaging.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Event/EC_Sched_Filter.h \
+  Event/EC_Priority_Scheduling.h \
   Event/EC_Gateway_Sched.h \
   Event/EC_Priority_Dispatching.h \
-  Event/EC_Priority_Scheduling.h \
   Event/EC_Sched_Factory.h \
-  Event/EC_Sched_Filter.h \
   Event/EC_Sched_Filter_Builder.h \
-  Event/EC_Priority_Dispatching.i \
+  Channel_Clients_T.h \
+  Event/EC_Sched_Filter.i \
   Event/EC_Priority_Scheduling.i \
+  Event/EC_Priority_Dispatching.i \
   Event/EC_Sched_Factory.i \
-  Event/EC_Sched_Filter.i \
-  Event/EC_Sched_Filter_Builder.i
+  Event/EC_Sched_Filter_Builder.i \
+  Channel_Clients_T.i \
+  Channel_Clients_T.cpp
 
-EXTRA_DIST += \
-  RTSchedEvent.rc
 
 ## Makefile.RT_Notification.am 
 
-if BUILD_RT_CORBA
-if !BUILD_MINIMUM_CORBA
-
 RT_Notify = \
   Notify/RT_Builder.cpp \
   Notify/RT_Factory.cpp \
@@ -4659,9 +4030,6 @@ libTAO_RT_Notification_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
   -DTAO_RT_NOTIFY_BUILD_DLL
 
 libTAO_RT_Notification_la_SOURCES = \
@@ -4671,264 +4039,231 @@ libTAO_RT_Notification_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RT_Notification_la_LIBADD = \
-  libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_ETCL.la \
-  libTAO_CosNotification_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_CosNotification.la \
+ libTAO_ETCL.la \
+ $(top_builddir)/tao/libTAO_RTCORBA.la \
+ $(top_builddir)/tao/libTAO_DynamicAny.la \
+ libTAO_Svc_Utils.la \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
+  Channel_Clients_T.h \
   Notify/RT_Builder.h \
+  Notify/RT_POA_Helper.h \
   Notify/RT_Factory.h \
   Notify/RT_Notify_Service.h \
-  Notify/RT_POA_Helper.h \
   Notify/RT_Properties.h \
   Notify/Structured/RT_StructuredProxyPushSupplier.h \
+  Channel_Clients_T.i \
   Notify/RT_Builder.inl \
+  Notify/RT_POA_Helper.inl \
   Notify/RT_Factory.inl \
   Notify/RT_Notify_Service.inl \
-  Notify/RT_POA_Helper.inl \
   Notify/RT_Properties.inl \
-  Notify/Structured/RT_StructuredProxyPushSupplier.inl
+  Notify/Structured/RT_StructuredProxyPushSupplier.inl \
+  Channel_Clients_T.cpp
 
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_RT_CORBA
-
-EXTRA_DIST += \
-  RT_Notification.rc
 
 ## Makefile.Security.am 
 
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-
 BUILT_SOURCES += \
   CSIS_T.cpp \
-  CSIC.inl \
-  CSIS.inl \
-  CSIS_T.inl \
   CSIC.cpp \
   CSIC.h \
   CSIS.h \
-  CSIS_T.h
+  CSIS_T.h \
+  CSIC.inl \
+  CSIS.inl \
+  CSIS_T.inl
 
 CLEANFILES += \
   CSIS_T.cpp \
-  CSIC.inl \
-  CSIS.inl \
-  CSIS_T.inl \
   CSIC.cpp \
   CSIC.h \
   CSIS.h \
   CSIS_T.h \
-  CSI-stamp
-
-CSIS_T.cpp CSIC.inl CSIS.inl CSIS_T.inl CSIC.cpp CSIC.h CSIS.h CSIS_T.h: CSI-stamp
+  CSIC.inl \
+  CSIS.inl \
+  CSIS_T.inl
 
-CSI-stamp: $(srcdir)/CSI.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl
-	@touch $@
+CSIS_T.cpp CSIC.cpp CSIC.h CSIS.h CSIS_T.h CSIC.inl CSIS.inl CSIS_T.inl: CSI.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/CSI.idl
 
 BUILT_SOURCES += \
   CSIIOPS_T.cpp \
-  CSIIOPC.inl \
-  CSIIOPS.inl \
-  CSIIOPS_T.inl \
   CSIIOPC.cpp \
   CSIIOPC.h \
   CSIIOPS.h \
-  CSIIOPS_T.h
+  CSIIOPS_T.h \
+  CSIIOPC.inl \
+  CSIIOPS.inl \
+  CSIIOPS_T.inl
 
 CLEANFILES += \
   CSIIOPS_T.cpp \
-  CSIIOPC.inl \
-  CSIIOPS.inl \
-  CSIIOPS_T.inl \
   CSIIOPC.cpp \
   CSIIOPC.h \
   CSIIOPS.h \
   CSIIOPS_T.h \
-  CSIIOP-stamp
-
-CSIIOPS_T.cpp CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl CSIIOPC.cpp CSIIOPC.h CSIIOPS.h CSIIOPS_T.h: CSIIOP-stamp
+  CSIIOPC.inl \
+  CSIIOPS.inl \
+  CSIIOPS_T.inl
 
-CSIIOP-stamp: $(srcdir)/CSIIOP.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl
-	@touch $@
+CSIIOPS_T.cpp CSIIOPC.cpp CSIIOPC.h CSIIOPS.h CSIIOPS_T.h CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl: CSIIOP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/CSIIOP.idl
 
 BUILT_SOURCES += \
   GSSUPS_T.cpp \
-  GSSUPC.inl \
-  GSSUPS.inl \
-  GSSUPS_T.inl \
   GSSUPC.cpp \
   GSSUPC.h \
   GSSUPS.h \
-  GSSUPS_T.h
+  GSSUPS_T.h \
+  GSSUPC.inl \
+  GSSUPS.inl \
+  GSSUPS_T.inl
 
 CLEANFILES += \
   GSSUPS_T.cpp \
-  GSSUPC.inl \
-  GSSUPS.inl \
-  GSSUPS_T.inl \
   GSSUPC.cpp \
   GSSUPC.h \
   GSSUPS.h \
   GSSUPS_T.h \
-  GSSUP-stamp
-
-GSSUPS_T.cpp GSSUPC.inl GSSUPS.inl GSSUPS_T.inl GSSUPC.cpp GSSUPC.h GSSUPS.h GSSUPS_T.h: GSSUP-stamp
+  GSSUPC.inl \
+  GSSUPS.inl \
+  GSSUPS_T.inl
 
-GSSUP-stamp: $(srcdir)/GSSUP.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl
-	@touch $@
+GSSUPS_T.cpp GSSUPC.cpp GSSUPC.h GSSUPS.h GSSUPS_T.h GSSUPC.inl GSSUPS.inl GSSUPS_T.inl: GSSUP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/GSSUP.idl
 
 BUILT_SOURCES += \
   SecurityS_T.cpp \
-  SecurityC.inl \
-  SecurityS.inl \
-  SecurityS_T.inl \
   SecurityC.cpp \
   SecurityS.cpp \
   SecurityC.h \
   SecurityS.h \
-  SecurityS_T.h
+  SecurityS_T.h \
+  SecurityC.inl \
+  SecurityS.inl \
+  SecurityS_T.inl
 
 CLEANFILES += \
   SecurityS_T.cpp \
-  SecurityC.inl \
-  SecurityS.inl \
-  SecurityS_T.inl \
   SecurityC.cpp \
   SecurityS.cpp \
   SecurityC.h \
   SecurityS.h \
   SecurityS_T.h \
-  Security-stamp
-
-SecurityS_T.cpp SecurityC.inl SecurityS.inl SecurityS_T.inl SecurityC.cpp SecurityS.cpp SecurityC.h SecurityS.h SecurityS_T.h: Security-stamp
+  SecurityC.inl \
+  SecurityS.inl \
+  SecurityS_T.inl
 
-Security-stamp: $(srcdir)/Security.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl
-	@touch $@
+SecurityS_T.cpp SecurityC.cpp SecurityS.cpp SecurityC.h SecurityS.h SecurityS_T.h SecurityC.inl SecurityS.inl SecurityS_T.inl: Security.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/Security.idl
 
 BUILT_SOURCES += \
   SecurityLevel1S_T.cpp \
-  SecurityLevel1C.inl \
-  SecurityLevel1S.inl \
-  SecurityLevel1S_T.inl \
   SecurityLevel1C.cpp \
   SecurityLevel1S.cpp \
   SecurityLevel1C.h \
   SecurityLevel1S.h \
-  SecurityLevel1S_T.h
+  SecurityLevel1S_T.h \
+  SecurityLevel1C.inl \
+  SecurityLevel1S.inl \
+  SecurityLevel1S_T.inl
 
 CLEANFILES += \
   SecurityLevel1S_T.cpp \
-  SecurityLevel1C.inl \
-  SecurityLevel1S.inl \
-  SecurityLevel1S_T.inl \
   SecurityLevel1C.cpp \
   SecurityLevel1S.cpp \
   SecurityLevel1C.h \
   SecurityLevel1S.h \
   SecurityLevel1S_T.h \
-  SecurityLevel1-stamp
-
-SecurityLevel1S_T.cpp SecurityLevel1C.inl SecurityLevel1S.inl SecurityLevel1S_T.inl SecurityLevel1C.cpp SecurityLevel1S.cpp SecurityLevel1C.h SecurityLevel1S.h SecurityLevel1S_T.h: SecurityLevel1-stamp
+  SecurityLevel1C.inl \
+  SecurityLevel1S.inl \
+  SecurityLevel1S_T.inl
 
-SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl
-	@touch $@
+SecurityLevel1S_T.cpp SecurityLevel1C.cpp SecurityLevel1S.cpp SecurityLevel1C.h SecurityLevel1S.h SecurityLevel1S_T.h SecurityLevel1C.inl SecurityLevel1S.inl SecurityLevel1S_T.inl: SecurityLevel1.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/SecurityLevel1.idl
 
 BUILT_SOURCES += \
   SecurityLevel2S_T.cpp \
-  SecurityLevel2C.inl \
-  SecurityLevel2S.inl \
-  SecurityLevel2S_T.inl \
   SecurityLevel2C.cpp \
   SecurityLevel2S.cpp \
   SecurityLevel2C.h \
   SecurityLevel2S.h \
-  SecurityLevel2S_T.h
+  SecurityLevel2S_T.h \
+  SecurityLevel2C.inl \
+  SecurityLevel2S.inl \
+  SecurityLevel2S_T.inl
 
 CLEANFILES += \
   SecurityLevel2S_T.cpp \
-  SecurityLevel2C.inl \
-  SecurityLevel2S.inl \
-  SecurityLevel2S_T.inl \
   SecurityLevel2C.cpp \
   SecurityLevel2S.cpp \
   SecurityLevel2C.h \
   SecurityLevel2S.h \
   SecurityLevel2S_T.h \
-  SecurityLevel2-stamp
-
-SecurityLevel2S_T.cpp SecurityLevel2C.inl SecurityLevel2S.inl SecurityLevel2S_T.inl SecurityLevel2C.cpp SecurityLevel2S.cpp SecurityLevel2C.h SecurityLevel2S.h SecurityLevel2S_T.h: SecurityLevel2-stamp
+  SecurityLevel2C.inl \
+  SecurityLevel2S.inl \
+  SecurityLevel2S_T.inl
 
-SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl
-	@touch $@
+SecurityLevel2S_T.cpp SecurityLevel2C.cpp SecurityLevel2S.cpp SecurityLevel2C.h SecurityLevel2S.h SecurityLevel2S_T.h SecurityLevel2C.inl SecurityLevel2S.inl SecurityLevel2S_T.inl: SecurityLevel2.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/SecurityLevel2.idl
 
 BUILT_SOURCES += \
   SecurityLevel3S_T.cpp \
-  SecurityLevel3C.inl \
-  SecurityLevel3S.inl \
-  SecurityLevel3S_T.inl \
   SecurityLevel3C.cpp \
   SecurityLevel3C.h \
   SecurityLevel3S.h \
-  SecurityLevel3S_T.h
+  SecurityLevel3S_T.h \
+  SecurityLevel3C.inl \
+  SecurityLevel3S.inl \
+  SecurityLevel3S_T.inl
 
 CLEANFILES += \
   SecurityLevel3S_T.cpp \
-  SecurityLevel3C.inl \
-  SecurityLevel3S.inl \
-  SecurityLevel3S_T.inl \
   SecurityLevel3C.cpp \
   SecurityLevel3C.h \
   SecurityLevel3S.h \
   SecurityLevel3S_T.h \
-  SecurityLevel3-stamp
-
-SecurityLevel3S_T.cpp SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3S.h SecurityLevel3S_T.h: SecurityLevel3-stamp
+  SecurityLevel3C.inl \
+  SecurityLevel3S.inl \
+  SecurityLevel3S_T.inl
 
-SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl
-	@touch $@
+SecurityLevel3S_T.cpp SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3S.h SecurityLevel3S_T.h SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl: SecurityLevel3.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/SecurityLevel3.idl
 
 Security = \
   CSIC.cpp \
   CSIIOPC.cpp \
   GSSUPC.cpp \
-  Security/CSI_Utils.cpp \
+  SecurityC.cpp \
+  SecurityS.cpp \
+  SecurityLevel1C.cpp \
+  SecurityLevel1S.cpp \
+  SecurityLevel2C.cpp \
+  SecurityLevel2S.cpp \
+  SecurityLevel3C.cpp \
   Security/SL2_EstablishTrustPolicy.cpp \
   Security/SL2_QOPPolicy.cpp \
-  Security/SL3_ContextEstablishmentPolicy.cpp \
   Security/SL3_CredentialsAcquirerFactory.cpp \
   Security/SL3_CredentialsCurator.cpp \
-  Security/SL3_ObjectCredentialsPolicy.cpp \
-  Security/SL3_PolicyFactory.cpp \
-  Security/SL3_SecurityCurrent.cpp \
-  Security/SL3_SecurityCurrent_Impl.cpp \
-  Security/SL3_SecurityManager.cpp \
-  Security/Security_Current.cpp \
   Security/Security_Current_Impl.cpp \
+  Security/Security_Current.cpp \
   Security/Security_ORBInitializer.cpp \
   Security/Security_PolicyFactory.cpp \
-  SecurityC.cpp \
-  SecurityLevel1C.cpp \
-  SecurityLevel1S.cpp \
-  SecurityLevel2C.cpp \
-  SecurityLevel2S.cpp \
-  SecurityLevel3C.cpp \
-  SecurityS.cpp
+  Security/CSI_Utils.cpp \
+  Security/SL3_ContextEstablishmentPolicy.cpp \
+  Security/SL3_ObjectCredentialsPolicy.cpp \
+  Security/SL3_PolicyFactory.cpp \
+  Security/SL3_SecurityManager.cpp \
+  Security/SL3_SecurityCurrent.cpp \
+  Security/SL3_SecurityCurrent_Impl.cpp
 
 lib_LTLIBRARIES += libTAO_Security.la
 
@@ -4937,8 +4272,6 @@ libTAO_Security_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_SECURITY_BUILD_DLL
 
 libTAO_Security_la_SOURCES = \
@@ -4948,223 +4281,76 @@ libTAO_Security_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_Security_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CSIC.h \
-  CSIIOPC.h \
-  CSIIOPS_T.h \
-  CSIS_T.h \
-  GSSUPC.h \
-  GSSUPS_T.h \
-  Security/CSI_Utils.h \
-  Security/SL2_EstablishTrustPolicy.h \
-  Security/SL2_QOPPolicy.h \
-  Security/SL3_ContextEstablishmentPolicy.h \
-  Security/SL3_CredentialsAcquirerFactory.h \
-  Security/SL3_CredentialsCurator.h \
+ $(top_builddir)/tao/libTAO_PortableServer.la \
+ $(top_builddir)/tao/libTAO_IORInterceptor.la \
+ $(top_builddir)/tao/libTAO_ObjRefTemplate.la \
+ $(top_builddir)/tao/libTAO_Valuetype.la \
+ $(top_builddir)/tao/libTAO.la \
+ $(top_builddir)/../ace/libACE.la
+
+noinst_HEADERS += \
   Security/SL3_ObjectCredentialsPolicy.h \
-  Security/SL3_PolicyFactory.h \
   Security/SL3_SecurityCurrent.h \
-  Security/SL3_SecurityCurrent_Impl.h \
   Security/SL3_SecurityManager.h \
-  Security/Security_Current.h \
-  Security/Security_Current_Impl.h \
+  SecurityC.h \
+  Security/SL2_QOPPolicy.h \
+  Security/SL3_CredentialsAcquirerFactory.h \
+  SecurityS.h \
+  Security/SL3_ContextEstablishmentPolicy.h \
+  Security/SL2_EstablishTrustPolicy.h \
   Security/Security_ORBInitializer.h \
+  Security/SL3_SecurityCurrent_Impl.h \
+  Security/SL3_PolicyFactory.h \
+  Security/Security_Current.h \
   Security/Security_PolicyFactory.h \
-  SecurityC.h \
+  CSIIOPC.h \
+  CSIC.h \
+  Security/Security_Current_Impl.h \
+  GSSUPC.h \
   SecurityLevel1C.h \
+  Security/SL3_CredentialsCurator.h \
   SecurityLevel1S.h \
-  SecurityLevel1S_T.h \
+  Security/CSI_Utils.h \
   SecurityLevel2C.h \
   SecurityLevel2S.h \
-  SecurityLevel2S_T.h \
   SecurityLevel3C.h \
   SecurityLevel3S_T.h \
-  SecurityS.h \
+  SecurityLevel1S_T.h \
+  GSSUPS_T.h \
+  Channel_Clients_T.h \
   SecurityS_T.h \
-  CSIC.inl \
-  CSIIOPC.inl \
-  CSIIOPS_T.inl \
-  CSIS_T.inl \
-  GSSUPC.inl \
-  GSSUPS_T.inl \
+  SecurityLevel2S_T.h \
+  CSIS_T.h \
+  CSIIOPS_T.h \
   Security/SL3_SecurityCurrent.inl \
-  Security/Security_Current.inl \
   SecurityC.inl \
+  SecurityS.inl \
+  Security/Security_Current.inl \
+  CSIIOPC.inl \
+  CSIC.inl \
+  GSSUPC.inl \
   SecurityLevel1C.inl \
   SecurityLevel1S.inl \
-  SecurityLevel1S_T.inl \
   SecurityLevel2C.inl \
   SecurityLevel2S.inl \
-  SecurityLevel2S_T.inl \
   SecurityLevel3C.inl \
   SecurityLevel3S_T.inl \
-  SecurityS.inl \
+  SecurityLevel1S_T.inl \
+  GSSUPS_T.inl \
+  Channel_Clients_T.i \
   SecurityS_T.inl \
-  CSIIOPS_T.cpp \
+  SecurityLevel2S_T.inl \
+  CSIS_T.inl \
+  CSIIOPS_T.inl \
   CSIS_T.cpp \
+  CSIIOPS_T.cpp \
   GSSUPS_T.cpp \
+  SecurityS_T.cpp \
   SecurityLevel1S_T.cpp \
   SecurityLevel2S_T.cpp \
   SecurityLevel3S_T.cpp \
-  SecurityS_T.cpp \
-  CSI.idl \
-  CSIIOP.idl \
-  GSSUP.idl \
-  Security.idl \
-  SecurityLevel1.idl \
-  SecurityLevel2.idl \
-  SecurityLevel3.idl
-
-endif BUILD_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  Security.rc
-
-## Makefile.SSLIOP.am 
-
-if BUILD_INTERCEPTORS
-if BUILD_CORBA_MESSAGING
-if BUILD_SSL
-
-BUILT_SOURCES += \
-  SSLIOPS_T.cpp \
-  SSLIOPC.inl \
-  SSLIOPS.inl \
-  SSLIOPS_T.inl \
-  SSLIOPC.cpp \
-  SSLIOPC.h \
-  SSLIOPS.h \
-  SSLIOPS_T.h
-
-CLEANFILES += \
-  SSLIOPS_T.cpp \
-  SSLIOPC.inl \
-  SSLIOPS.inl \
-  SSLIOPS_T.inl \
-  SSLIOPC.cpp \
-  SSLIOPC.h \
-  SSLIOPS.h \
-  SSLIOPS_T.h \
-  SSLIOP-stamp
-
-SSLIOPS_T.cpp SSLIOPC.inl SSLIOPS.inl SSLIOPS_T.inl SSLIOPC.cpp SSLIOPC.h SSLIOPS.h SSLIOPS_T.h: SSLIOP-stamp
-
-SSLIOP-stamp: $(srcdir)/SSLIOP.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl
-	@touch $@
-
-SSLIOP = \
-  SSLIOP/IIOP_SSL_Acceptor.cpp \
-  SSLIOP/IIOP_SSL_Connection_Handler.cpp \
-  SSLIOP/IIOP_SSL_Connector.cpp \
-  SSLIOP/IIOP_SSL_Transport.cpp \
-  SSLIOP/SSLIOP_Accept_Strategy.cpp \
-  SSLIOP/SSLIOP_Acceptor.cpp \
-  SSLIOP/SSLIOP_ClientCredentials.cpp \
-  SSLIOP/SSLIOP_Connection_Handler.cpp \
-  SSLIOP/SSLIOP_Connector.cpp \
-  SSLIOP/SSLIOP_Credentials.cpp \
-  SSLIOP/SSLIOP_CredentialsAcquirer.cpp \
-  SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp \
-  SSLIOP/SSLIOP_Current.cpp \
-  SSLIOP/SSLIOP_Current_Impl.cpp \
-  SSLIOP/SSLIOP_EVP_PKEY.cpp \
-  SSLIOP/SSLIOP_Endpoint.cpp \
-  SSLIOP/SSLIOP_Factory.cpp \
-  SSLIOP/SSLIOP_Invocation_Interceptor.cpp \
-  SSLIOP/SSLIOP_ORBInitializer.cpp \
-  SSLIOP/SSLIOP_OwnCredentials.cpp \
-  SSLIOP/SSLIOP_Profile.cpp \
-  SSLIOP/SSLIOP_SSL.cpp \
-  SSLIOP/SSLIOP_TargetCredentials.cpp \
-  SSLIOP/SSLIOP_Transport.cpp \
-  SSLIOP/SSLIOP_Util.cpp \
-  SSLIOP/SSLIOP_X509.cpp \
-  SSLIOP/ssl_endpoints.cpp \
-  SSLIOPC.cpp
-
-lib_LTLIBRARIES += libTAO_SSLIOP.la
-
-libTAO_SSLIOP_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  -DTAO_SSLIOP_BUILD_DLL
-
-libTAO_SSLIOP_la_SOURCES = \
-  $(SSLIOP)
-
-libTAO_SSLIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+  Channel_Clients_T.cpp
 
-libTAO_SSLIOP_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  SSLIOP/IIOP_SSL_Acceptor.h \
-  SSLIOP/IIOP_SSL_Connection_Handler.h \
-  SSLIOP/IIOP_SSL_Connector.h \
-  SSLIOP/IIOP_SSL_Transport.h \
-  SSLIOP/SSLIOP_Accept_Strategy.h \
-  SSLIOP/SSLIOP_Acceptor.h \
-  SSLIOP/SSLIOP_ClientCredentials.h \
-  SSLIOP/SSLIOP_Connection_Handler.h \
-  SSLIOP/SSLIOP_Connector.h \
-  SSLIOP/SSLIOP_Credentials.h \
-  SSLIOP/SSLIOP_CredentialsAcquirer.h \
-  SSLIOP/SSLIOP_CredentialsAcquirerFactory.h \
-  SSLIOP/SSLIOP_Current.h \
-  SSLIOP/SSLIOP_Current_Impl.h \
-  SSLIOP/SSLIOP_EVP_PKEY.h \
-  SSLIOP/SSLIOP_Endpoint.h \
-  SSLIOP/SSLIOP_Factory.h \
-  SSLIOP/SSLIOP_Invocation_Interceptor.h \
-  SSLIOP/SSLIOP_ORBInitializer.h \
-  SSLIOP/SSLIOP_OwnCredentials.h \
-  SSLIOP/SSLIOP_Profile.h \
-  SSLIOP/SSLIOP_SSL.h \
-  SSLIOP/SSLIOP_TargetCredentials.h \
-  SSLIOP/SSLIOP_Transport.h \
-  SSLIOP/SSLIOP_Util.h \
-  SSLIOP/SSLIOP_X509.h \
-  SSLIOP/ssl_endpoints.h \
-  SSLIOPC.h \
-  SSLIOPS_T.h \
-  SSLIOP/IIOP_SSL_Connection_Handler.inl \
-  SSLIOP/SSLIOP_Acceptor.i \
-  SSLIOP/SSLIOP_Connection_Handler.i \
-  SSLIOP/SSLIOP_Credentials.inl \
-  SSLIOP/SSLIOP_Current.inl \
-  SSLIOP/SSLIOP_Current_Impl.inl \
-  SSLIOP/SSLIOP_Endpoint.i \
-  SSLIOP/SSLIOP_Profile.i \
-  SSLIOP/ssl_endpoints.i \
-  SSLIOPC.inl \
-  SSLIOPS_T.inl \
-  SSLIOPS_T.cpp \
-  SSLIOP.idl
-
-endif BUILD_SSL
-endif BUILD_CORBA_MESSAGING
-endif BUILD_INTERCEPTORS
-
-EXTRA_DIST += \
-  SSLIOP.rc
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
index 26f4d5703b3..68cfe397c9a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -23,8 +23,8 @@
 
 #include "ace/SString.h"
 
-#include "orbsvcs/CosNamingC.h"
-#include "naming_serv_export.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "naming_export.h"
 
 /**
  * @class TAO_IntId
@@ -38,7 +38,7 @@
  * they can be stored together as a <value> for a <key> in a
  * hash table holding the state of a Transient Naming Context.
  */
-class TAO_Naming_Serv_Export TAO_IntId
+class TAO_Naming_Export TAO_IntId
 {
 public:
   // = Initialization and termination methods.
@@ -79,7 +79,7 @@ public:
  * they can be stored together as a <key> for a <value> in a
  * hash table holding the state of a Transient Naming Context.
  */
-class TAO_Naming_Serv_Export TAO_ExtId
+class TAO_Naming_Export TAO_ExtId
 {
 public:
   // = Initialization and termination methods.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
index d9fa7b9369f..8f093465ffe 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
@@ -30,7 +30,7 @@ void
 TAO_NS_FlatFileStream::remove ()
 {
   ACE_TRACE("remove");
-  ACE_OS::unlink(ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()));
+  ACE_OS::unlink(file_.c_str());
 }
 
 int
@@ -58,21 +58,21 @@ TAO_NS_FlatFileStream::open()
   if( strchr(mode_.c_str(), 'c') )
     flags |= O_CREAT;
 #ifndef ACE_WIN32
-  if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), 0666) != 0 )
+  if( ACE_OS::flock_init (&filelock_, flags, file_.c_str(), 0666) != 0 )
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot open file %s for mode %s: (%d) %s\n",
                        file_.c_str(), mode_.c_str(),
                        errno, ACE_OS::strerror(errno)),
                       -1);
 #else
-  if( (filelock_.handle_= ACE_OS::open (ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), flags, 0)) == ACE_INVALID_HANDLE )
+  if( (filelock_.handle_= ACE_OS::open (file_.c_str(), flags, 0)) == ACE_INVALID_HANDLE )
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot open file %s for mode %s: (%d) %s\n",
                        file_.c_str(), mode_.c_str(),
                        errno, ACE_OS::strerror(errno)),
                       -1);
 #endif
-  this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_CHAR_TO_TCHAR(fdmode));
+  this->fl_ = ACE_OS::fdopen(filelock_.handle_, fdmode);
   if (this->fl_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot fdopen file %s for mode %s: (%d) %s\n",
@@ -89,10 +89,9 @@ TAO_NS_FlatFileStream::close()
   ACE_OS::fflush(fl_);
 #ifndef ACE_WIN32
   ACE_OS::flock_destroy (&filelock_, 0);
+#else
+  ACE_OS::fclose (fl_);
 #endif
-  ACE_OS::fclose (fl_);  // even though flock_destroy closes the handle
-			 // we still need to destroy the FILE*
-
   fl_ = 0;
   return 0;
 }
@@ -134,11 +133,7 @@ TAO_NS_FlatFileStream::last_changed(void)
   ACE_TRACE("TAO_NS_FlatFileStream::last_changed");
   ACE_stat st;
   ACE_OS::fstat(filelock_.handle_, &st);
-#if !defined (ACE_HAS_WINCE)
   return st.st_mtime;
-#else
-  return st.st_mtime.sec ();
-#endif /* ACE_HAS_WINCE */
 }
 
 TAO_Storable_Base &
@@ -181,15 +176,15 @@ TAO_NS_FlatFileStream::operator <<(
   ACE_OS::fprintf(this->fl_, "%d\n", type);
 
   ACE_CString id = record.id();
-  ACE_OS::fprintf(this->fl_, ACE_TEXT_ALWAYS_CHAR(ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n"),
+  ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n",
                   id.length(), id.c_str());
 
   ACE_CString kind = record.kind();
-  ACE_OS::fprintf(this->fl_, ACE_TEXT_ALWAYS_CHAR(ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n"),
+  ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n",
                   kind.length(), kind.c_str());
 
   ACE_CString ref = record.ref();
-  ACE_OS::fprintf(this->fl_, ACE_TEXT_ALWAYS_CHAR(ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n"),
+  ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n",
                   ref.length(), ref.c_str());
 
   ACE_OS::fflush(this->fl_);
@@ -215,7 +210,7 @@ TAO_NS_FlatFileStream::operator >>(
   char *id = new char[bufSize+1];
   //char *id;
   //ACE_NEW_RETURN (id, char[bufSize+1], 1);
-  ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(id), bufSize+1, fl_);
+  ACE_OS::fgets(id, bufSize+1, fl_);
   ACE_CString newId(id);
   record.id(newId);
   delete [] id;
@@ -225,7 +220,7 @@ TAO_NS_FlatFileStream::operator >>(
   char *kind = new char[bufSize+1];
   //char *kind;
   //ACE_NEW (kind, char[bufSize+1]);
-  ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(kind), bufSize+1, fl_);
+  ACE_OS::fgets(kind, bufSize+1, fl_);
   kind[bufSize] = '\0';
   ACE_CString newKind(kind);
   record.kind(newKind);
@@ -236,7 +231,7 @@ TAO_NS_FlatFileStream::operator >>(
   char *ref = new char[bufSize+1];
   //char *ref;
   //ACE_NEW(ref, char[bufSize+1]);
-  ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(ref), bufSize+1, fl_);
+  ACE_OS::fgets(ref, bufSize+1, fl_);
   ACE_CString newRef(ref);
   record.ref(newRef);
   delete [] ref;
@@ -281,7 +276,7 @@ TAO_Storable_Base *TAO_NS_FlatFileFactory::create_stream(
   TAO_Storable_Base *stream = 0;
 
   ACE_NEW_RETURN (stream,
-                  TAO_NS_FlatFileStream(file, ACE_TEXT_ALWAYS_CHAR(mode)),
+                  TAO_NS_FlatFileStream(file, mode),
                   0);
   return stream;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index d3853190a0c..e8679086071 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Naming_Context_Interface.h"
-#include "naming_serv_export.h"
+#include "naming_export.h"
 
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/SString.h"
@@ -46,7 +46,7 @@
  * that we can write some code that would work with any of them,
  * i.e., TAO_Hash_Naming_Context.
  */
-class TAO_Naming_Serv_Export TAO_Bindings_Map
+class TAO_Naming_Export TAO_Bindings_Map
 {
 
 public:
@@ -111,7 +111,7 @@ public:
  * class TAO_Bindings_Map, which provides a common interface to the data structures
  * used in TAO_Persistent_Namng_Context and TAO_Transient_Naming_Context.
  */
-class TAO_Naming_Serv_Export TAO_Hash_Naming_Context :public TAO_Naming_Context_Impl
+class TAO_Naming_Export TAO_Hash_Naming_Context :public TAO_Naming_Context_Impl
 {
 public:
   // = Initialization and termination methods.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Makefile.am b/TAO/orbsvcs/orbsvcs/Naming/Makefile.am
new file mode 100644
index 00000000000..65f3bb1b56d
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Makefile.am
@@ -0,0 +1,42 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Naming Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Naming.la
+
+libTAO_Naming_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Naming_la_SOURCES = \
+        Entries.cpp \
+        Hash_Naming_Context.cpp \
+        Naming_Context.cpp \
+        Naming_Utils.cpp
+
+noinst_HEADERS = \
+        Entries.h \
+        Hash_Naming_Context.h \
+        Naming_Context.h \
+        Naming_Utils.h
+
+EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index d3b4db2c3bd..e500888109e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -15,9 +15,9 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosNamingS.h"
+#include "orbsvcs/orbsvcs/CosNamingS.h"
 
-#include "naming_serv_export.h"
+#include "naming_export.h"
 #include "ace/Null_Mutex.h"
 
 class TAO_Naming_Context_Impl;
@@ -41,7 +41,7 @@ class TAO_Naming_Context_Impl;
  * concrete implementors.
  */
 
-class TAO_Naming_Serv_Export TAO_Naming_Context :
+class TAO_Naming_Export TAO_Naming_Context :
   public virtual PortableServer::RefCountServantBase,
   public virtual POA_CosNaming::NamingContextExt
 {
@@ -304,7 +304,7 @@ protected:
  * Subclasses of TAO_Naming_Context_Impl provide concrete
  * implementations of the NamingContext functionality.
  */
-class TAO_Naming_Serv_Export TAO_Naming_Context_Impl
+class TAO_Naming_Export TAO_Naming_Context_Impl
 {
 
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index a5eee0e0f33..c2cb0964d12 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -90,7 +90,7 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
   return 0;
 }
 
-ACE_FACTORY_DEFINE (TAO_Naming_Serv, TAO_Naming_Loader)
+ACE_FACTORY_DEFINE (TAO_Naming, TAO_Naming_Loader)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Dynamic_Service<TAO_Naming_Loader>;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index 4e34848a46d..624b0a15949 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -22,9 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
-class TAO_Naming_Serv_Export TAO_Naming_Loader : public TAO_Object_Loader
+class TAO_Naming_Export TAO_Naming_Loader : public TAO_Object_Loader
 {
 public:
 
@@ -60,6 +60,6 @@ private:
   ACE_UNIMPLEMENTED_FUNC (TAO_Naming_Loader &operator = (const TAO_Naming_Loader &))
 };
 
-ACE_FACTORY_DECLARE (TAO_Naming_Serv, TAO_Naming_Loader)
+ACE_FACTORY_DECLARE (TAO_Naming, TAO_Naming_Loader)
 
 #endif /* TAO_NAMING_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
new file mode 100644
index 00000000000..29c50161624
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -0,0 +1,783 @@
+// $Id$
+
+#include "Naming_Utils.h"
+#include "Transient_Naming_Context.h"
+#include "Persistent_Context_Index.h"
+#include "Storable_Naming_Context.h"
+#include "Storable_Naming_Context_Activator.h"
+#include "Flat_File_Persistence.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+
+#include "tao/debug.h"
+#include "tao/default_ports.h"
+#include "tao/ORB_Core.h"
+
+#include "tao/IORTable/IORTable.h"
+#include "tao/Messaging/Messaging.h"
+
+#include "ace/Arg_Shifter.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
+
+ACE_RCSID (Naming,
+           Naming_Utils,
+           "$Id$")
+
+TAO_Naming_Server::TAO_Naming_Server (void)
+  : naming_context_ (),
+    ior_multicast_ (0),
+    naming_service_ior_ (),
+    context_index_ (0),
+    ior_output_file_ (0),
+    pid_file_name_ (0),
+    context_size_ (ACE_DEFAULT_MAP_SIZE),
+    persistence_file_name_ (0),
+    base_address_ (TAO_NAMING_BASE_ADDR),
+    multicast_ (0),
+    use_storable_context_ (0),
+    use_servant_activator_ (0),
+    use_redundancy_(0),
+    round_trip_timeout_ (0),
+    use_round_trip_timeout_ (0)
+{
+}
+
+TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb,
+                                      PortableServer::POA_ptr poa,
+                                      size_t context_size,
+                                      ACE_Time_Value *timeout,
+                                      int resolve_for_existing_naming_service,
+                                      const ACE_TCHAR *persistence_location,
+                                      void *base_addr,
+                                      int enable_multicast,
+                                      int use_storable_context,
+                                      int round_trip_timeout,
+                                      int use_round_trip_timeout)
+  : naming_context_ (),
+    ior_multicast_ (0),
+    naming_service_ior_ (),
+    context_index_ (0),
+    ior_output_file_ (0),
+    pid_file_name_ (0),
+    context_size_ (ACE_DEFAULT_MAP_SIZE),
+    persistence_file_name_ (0),
+    base_address_ (TAO_NAMING_BASE_ADDR),
+    multicast_ (0),
+    use_storable_context_ (use_storable_context),
+    use_servant_activator_ (0),
+    use_redundancy_(0),
+    round_trip_timeout_ (0),
+    use_round_trip_timeout_ (0)
+{
+  if (this->init (orb,
+                  poa,
+                  context_size,
+                  timeout,
+                  resolve_for_existing_naming_service,
+                  persistence_location,
+                  base_addr,
+                  enable_multicast,
+                  use_storable_context,
+                  round_trip_timeout,
+                  use_round_trip_timeout) == -1)
+    ACE_ERROR ((LM_ERROR,
+                "(%P|%t) %p\n",
+                "TAO_Naming_Server::init"));
+}
+
+
+int
+TAO_Naming_Server::init (CORBA::ORB_ptr orb,
+                         PortableServer::POA_ptr poa,
+                         size_t context_size,
+                         ACE_Time_Value *timeout,
+                         int resolve_for_existing_naming_service,
+                         const ACE_TCHAR *persistence_location,
+                         void *base_addr,
+                         int enable_multicast,
+                         int use_storable_context,
+                         int round_trip_timeout,
+                         int use_round_trip_timeout)
+{
+  if (resolve_for_existing_naming_service)
+    {
+      ACE_DECLARE_NEW_CORBA_ENV;
+      ACE_TRY
+        {
+          // Try to find an existing Naming Service.
+          CORBA::Object_var naming_obj =
+            orb->resolve_initial_references ("NameService",
+                                             timeout
+                                             ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          if (!CORBA::is_nil (naming_obj.in ()))
+            {
+              //
+              // Success in finding a Naming Service.
+              //
+              if (TAO_debug_level > 0)
+                ACE_DEBUG ((LM_DEBUG,
+                            "\nNameService found!\n"));
+
+              this->naming_context_ =
+                CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                                   ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              this->naming_service_ior_ =
+                orb->object_to_string (naming_obj.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              return 0;
+            }
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init");
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (-1);
+    }
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "\nWe'll become a NameService\n"));
+
+  // Become a Naming Service.
+  return this->init_new_naming (orb,
+                                poa,
+                                persistence_location,
+                                base_addr,
+                                context_size,
+                                enable_multicast,
+                                use_storable_context,
+                                round_trip_timeout,
+                                use_round_trip_timeout);
+}
+
+int
+TAO_Naming_Server::parse_args (int argc,
+                               ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_LIB_TEXT("b:do:p:s:f:m:u:r:z:"));
+
+  int c;
+  int size, result;
+
+  // This is declared this way to avoid warnings from
+  // some compilers that complain about mismatching types
+  // in the sscanf.
+#if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG
+  ptrdiff_t address;
+#else
+  long int address;
+#endif /* ACE_SIZEOF_VOID_P */
+
+  // Make sure only one persistence option is specified
+  int f_opt_used = 0;
+  int u_opt_used = 0;
+  int r_opt_used = 0;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':  // debug flag.
+        TAO_debug_level++;
+        break;
+      case 'o': // outputs the naming service ior to a file.
+        this->ior_output_file_ =
+          ACE_OS::fopen (get_opts.opt_arg (), ACE_LIB_TEXT("w"));
+
+        if (this->ior_output_file_ == 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+            ACE_LIB_TEXT("Unable to open %s for writing:(%u) %p\n"),
+            get_opts.opt_arg(), errno, ACE_LIB_TEXT("TAO_Naming_Server::parse_args()")), -1);
+        break;
+      case 'p':
+        this->pid_file_name_ = get_opts.opt_arg ();
+        break;
+      case 's':
+        size = ACE_OS::atoi (get_opts.opt_arg ());
+        if (size >= 0)
+          this->context_size_ = size;
+        break;
+      case 'b':
+        result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ()),
+#if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG
+                           ACE_INT64_FORMAT_SPECIFIER,
+#else
+                           "%ld",
+#endif /* ACE_SIZEOF_VOID_P */
+                           &address);
+        if (result == 0 || result == EOF)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Unable to process <-b> option"),
+                            -1);
+        this->base_address_ = (void *) address;
+        break;
+      case 'm':
+        this->multicast_ = ACE_OS::atoi(get_opts.opt_arg ());
+        break;
+      case 'f':
+        this->persistence_file_name_ = get_opts.opt_arg ();
+        f_opt_used = 1;
+        break;
+      case 'r':
+        this->use_redundancy_ = 1;
+        this->use_storable_context_ = 1;
+        this->persistence_file_name_ = get_opts.opt_arg ();
+        r_opt_used = 1;
+        break;
+      case 'u':
+        this->use_storable_context_ = 1;
+        this->persistence_file_name_ = get_opts.opt_arg ();
+        u_opt_used = 1;
+        break;
+      case 'z':
+        this->use_round_trip_timeout_ = 1;
+        this->round_trip_timeout_ = (int)1.0e7 * ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_LIB_TEXT ("usage:  %s ")
+                           ACE_LIB_TEXT ("-d ")
+                           ACE_LIB_TEXT ("-o <ior_output_file> ")
+                           ACE_LIB_TEXT ("-p <pid_file_name> ")
+                           ACE_LIB_TEXT ("-s <context_size> ")
+                           ACE_LIB_TEXT ("-b <base_address> ")
+                           ACE_LIB_TEXT ("-m <1=enable multicast, 0=disable multicast(default) ")
+                           ACE_LIB_TEXT ("-f <persistence_file_name> ")
+                           ACE_LIB_TEXT ("-u <storable_persistence_directory (not used with -f)> ")
+                           ACE_LIB_TEXT ("-r <redundant_persistence_directory> ")
+                           ACE_LIB_TEXT ("-z <relative round trip timeout> ")
+                           ACE_LIB_TEXT ("\n"),
+                           argv [0]),
+                          -1);
+      }
+
+  if (f_opt_used + u_opt_used + r_opt_used > 1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_LIB_TEXT ("Only one persistence option can be passed")
+                       ACE_LIB_TEXT ("\n")),
+                      -1);
+
+  return 0;
+}
+
+int
+TAO_Naming_Server::init_with_orb (int argc,
+                                  ACE_TCHAR *argv [],
+                                  CORBA::ORB_ptr orb)
+{
+  int result;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      // Duplicate the ORB
+      this->orb_ = CORBA::ORB::_duplicate (orb);
+
+      // Get the POA from the ORB.
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_LIB_TEXT(" (%P|%t) Unable to initialize the POA.\n")),
+                            -1);
+        }
+
+      // Check the non-ORB arguments.  this needs to come before we
+      // initialize my_naming_server so that we can pass on some of
+      // the command-line arguments.
+      result = this->parse_args (argc, argv);
+
+      if (result < 0)
+        return result;
+
+      // Get the POA object.
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // Get the POA_Manager.
+      PortableServer::POAManager_var poa_manager =
+        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      int numPolicies = 2;
+#if (TAO_HAS_MINIMUM_POA == 0)
+      if (this->use_storable_context_)
+        {
+          this->use_servant_activator_ = 1;
+        }
+
+      if (this->use_servant_activator_) {
+        numPolicies += 2;
+      }
+#endif /* TAO_HAS_MINIMUM_POA */
+
+      CORBA::PolicyList policies (numPolicies);
+      policies.length (numPolicies);
+
+      // Id Assignment policy
+      policies[0] =
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // Lifespan policy
+      policies[1] =
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
+                                                 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+      if (this->use_servant_activator_)
+        {
+          // Request Processing Policy
+          policies[2] =
+            this->root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
+                                                               ACE_ENV_ARG_PARAMETER);
+
+          // Servant Retention Policy
+          policies[3] =
+            this->root_poa_->create_servant_retention_policy (PortableServer::RETAIN
+                                                              ACE_ENV_ARG_PARAMETER);
+        }
+#endif /* TAO_HAS_MINIMUM_POA */
+
+      // We use a different POA, otherwise the user would have to change
+      // the object key each time it invokes the server.
+      this->ns_poa_ = this->root_poa_->create_POA ("NameService",
+                                                   poa_manager.in (),
+                                                   policies
+                                                   ACE_ENV_ARG_PARAMETER);
+      // Warning!  If create_POA fails, then the policies won't be
+      // destroyed and there will be hell to pay in memory leaks!
+      ACE_TRY_CHECK;
+
+      // Creation of the new POAs over, so destroy the Policy_ptr's.
+      for (CORBA::ULong i = 0;
+           i < policies.length ();
+           ++i)
+        {
+          CORBA::Policy_ptr policy = policies[i];
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      result = this->init (orb,
+                           this->ns_poa_.in (),
+                           this->context_size_,
+                           0,
+                           0,
+                           this->persistence_file_name_,
+                           this->base_address_,
+                           this->multicast_,
+                           this->use_storable_context_,
+                           this->round_trip_timeout_,
+                           this->use_round_trip_timeout_);
+      if (result == -1)
+        return result;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::init");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
+  if (this->ior_output_file_ != 0)
+    {
+      CORBA::String_var str =
+        this->naming_service_ior ();
+      ACE_OS::fprintf (this->ior_output_file_,
+                       "%s",
+                       str.in ());
+      ACE_OS::fclose (this->ior_output_file_);
+    }
+
+  if (this->pid_file_name_ != 0)
+    {
+      FILE *pidf = ACE_OS::fopen (this->pid_file_name_, ACE_LIB_TEXT("w"));
+      if (pidf != 0)
+        {
+          ACE_OS::fprintf (pidf,
+                           "%ld\n",
+                           ACE_static_cast (long, ACE_OS::getpid ()));
+          ACE_OS::fclose (pidf);
+        }
+    }
+  return 0;
+}
+
+int
+TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
+                                    PortableServer::POA_ptr poa,
+                                    const ACE_TCHAR *persistence_location,
+                                    void *base_addr,
+                                    size_t context_size,
+                                    int enable_multicast,
+                                    int use_storable_context,
+                                    int round_trip_timeout,
+                                    int use_round_trip_timeout)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      if (use_storable_context)
+        {
+          // In lieu of a fully implemented service configurator version
+          // of this Reader and Writer, let's just take something off the
+          // command line for now.
+          TAO_Naming_Service_Persistence_Factory *persFactory = 0;
+          ACE_NEW_RETURN(persFactory, TAO_NS_FlatFileFactory, -1);
+
+          // Was a location specified?
+          if (persistence_location == 0)
+            {
+              // No, assign the default location "NameService"
+              persistence_location = ACE_LIB_TEXT("NameService");
+            }
+
+          // Now make sure this directory exists
+          if (ACE_OS::access (persistence_location, W_OK|X_OK))
+            {
+              ACE_ERROR ((LM_ERROR, "Invalid persistence directory\n"));
+              return -1;
+            }
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+          if (this->use_servant_activator_)
+            {
+              TAO_Storable_Naming_Context_Activator *servant_activator;
+              ACE_NEW_THROW_EX (servant_activator,
+                                TAO_Storable_Naming_Context_Activator (orb,
+                                                                       persFactory,
+                                                                       persistence_location,
+                                                                       context_size),
+                                CORBA::NO_MEMORY ());
+              this->ns_poa_->set_servant_manager(servant_activator);
+            }
+#endif /* TAO_HAS_MINIMUM_POA */
+
+          this->naming_context_ =
+            TAO_Storable_Naming_Context::recreate_all (orb,
+                                                       poa,
+                                                       TAO_ROOT_NAMING_CONTEXT,
+                                                       context_size,
+                                                       0,
+                                                       persFactory,
+                                                       persistence_location,
+                                                       use_redundancy_
+                                                       ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else if (persistence_location != 0)
+        //
+        // Initialize Persistent Naming Service.
+        //
+        {
+          // Allocate and initialize Persistent Context Index.
+          ACE_NEW_RETURN (this->context_index_,
+                          TAO_Persistent_Context_Index (orb, poa),
+                          -1);
+
+          if (this->context_index_->open (persistence_location,
+                                          base_addr) == -1
+              || this->context_index_->init (context_size) == -1)
+            {
+              if (TAO_debug_level >0)
+                ACE_DEBUG ((LM_DEBUG,
+                            "TAO_Naming_Server: context_index initialization failed\n"));
+              return -1;
+            }
+
+          // Set the root Naming Context reference.
+          this->naming_context_ =
+            this->context_index_->root_context ();
+        }
+      else
+        {
+          //
+          // Initialize Transient Naming Service.
+          //
+          this->naming_context_ =
+            TAO_Transient_Naming_Context::make_new_context (poa,
+                                                            TAO_ROOT_NAMING_CONTEXT,
+                                                            context_size
+                                                            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+        }
+
+      // Set the ior of the root Naming Context.
+      this->naming_service_ior_=
+        orb->object_to_string (this->naming_context_.in ()
+                               ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var table_object =
+        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      IORTable::Table_var adapter =
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      if (CORBA::is_nil (adapter.in ()))
+        {
+          ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
+        }
+      else
+        {
+          CORBA::String_var ior =
+            orb->object_to_string (this->naming_context_.in ()
+                                   ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          adapter->bind ("NameService", ior.in () ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+#if defined (ACE_HAS_IP_MULTICAST)
+      if (enable_multicast)
+        {
+          // @@ Marina: is there anyway to implement this stuff
+          // without using ORB_Core_instance()? For example can you
+          // pass the ORB as an argument?
+
+          //
+          // Install ior multicast handler.
+          //
+          // Get reactor instance from TAO.
+          ACE_Reactor *reactor =
+            TAO_ORB_Core_instance ()->reactor ();
+
+          // See if the -ORBMulticastDiscoveryEndpoint option was specified.
+          ACE_CString mde (TAO_ORB_Core_instance ()->orb_params ()
+                           ->mcast_discovery_endpoint ());
+
+          // First, see if the user has given us a multicast port number
+          // on the command-line;
+          u_short port =
+            TAO_ORB_Core_instance ()->orb_params ()->service_port (NAMESERVICE);
+
+          if (port == 0)
+            {
+              // Check environment var. for multicast port.
+              const char *port_number =
+                ACE_OS::getenv ("NameServicePort");
+
+              if (port_number != 0)
+                port = ACE_static_cast (u_short, ACE_OS::atoi (port_number));
+            }
+
+          // Port wasn't specified on the command-line or in environment -
+          // use the default.
+          if (port == 0)
+            port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
+
+          // Instantiate a handler which will handle client requests for
+          // the root Naming Context ior, received on the multicast port.
+          ACE_NEW_RETURN (this->ior_multicast_,
+                          TAO_IOR_Multicast (),
+                          -1);
+
+          if (mde.length () != 0)
+            {
+              if (this->ior_multicast_->init (this->naming_service_ior_.in (),
+                                              mde.c_str (),
+                                              TAO_SERVICEID_NAMESERVICE) == -1)
+                return -1;
+            }
+          else
+            {
+              if (this->ior_multicast_->init (this->naming_service_ior_.in (),
+                                              port,
+                                              ACE_DEFAULT_MULTICAST_ADDR,
+                                              TAO_SERVICEID_NAMESERVICE) == -1)
+                return -1;
+            }
+
+          // Register event handler for the ior multicast.
+          if (reactor->register_handler (this->ior_multicast_,
+                                         ACE_Event_Handler::READ_MASK) == -1)
+            {
+              if (TAO_debug_level > 0)
+                ACE_DEBUG ((LM_DEBUG,
+                            "TAO_Naming_Server: cannot register Event handler\n"));
+              return -1;
+            }
+
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO_Naming_Server: The multicast server setup is done.\n"));
+        }
+#else
+  ACE_UNUSED_ARG (enable_multicast);
+#endif /* ACE_HAS_IP_MULTICAST */
+
+      if (use_round_trip_timeout == 1)
+      {
+        TimeBase::TimeT roundTripTimeoutVal = round_trip_timeout;
+        CORBA::Any anyObjectVal;
+        anyObjectVal <<= roundTripTimeoutVal;
+        CORBA::PolicyList polList (1);
+        polList.length (1);
+        polList[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
+                                         anyObjectVal);
+        ACE_TRY_CHECK;
+
+        // set a timeout on the orb
+        //
+        CORBA::Object_var orbPolicyManagerObj =
+	  orb->resolve_initial_references ("ORBPolicyManager"
+			                   ACE_ENV_ARG_PARAMETER);
+	ACE_TRY_CHECK;
+
+        CORBA::PolicyManager_var orbPolicyManager =
+          CORBA::PolicyManager::_narrow (orbPolicyManagerObj.in ());
+        ACE_TRY_CHECK;
+        orbPolicyManager->set_policy_overrides (polList, CORBA::SET_OVERRIDE);
+
+        polList[0]->destroy ();
+        ACE_TRY_CHECK;
+        polList[0] = CORBA::Policy::_nil ();
+      }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
+  return 0;
+}
+
+int
+TAO_Naming_Server::fini (void)
+{
+  // Destroy the child POA ns_poa that is created when initializing
+  // the Naming Service
+  ACE_TRY_NEW_ENV
+    {
+      this->ns_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+
+      CORBA::Object_var table_object =
+        this->orb_->resolve_initial_references ("IORTable"
+                                                ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      IORTable::Table_var adapter =
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      if (CORBA::is_nil (adapter.in ()))
+        {
+          ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
+        }
+      else
+        {
+          adapter->unbind ("NameService" ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      // Ignore
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+char*
+TAO_Naming_Server::naming_service_ior (void)
+{
+  return CORBA::string_dup (this->naming_service_ior_.in ());
+}
+
+CosNaming::NamingContext_ptr
+TAO_Naming_Server::operator-> (void) const
+{
+  return this->naming_context_.ptr ();
+}
+
+TAO_Naming_Server::~TAO_Naming_Server (void)
+{
+  if (this->ior_multicast_ != 0)
+    {
+      TAO_ORB_Core_instance ()->reactor ()->remove_handler
+        (this->ior_multicast_,
+         ACE_Event_Handler::READ_MASK | ACE_Event_Handler::DONT_CALL);
+      delete this->ior_multicast_;
+    }
+  delete context_index_;
+}
+
+
+CosNaming::NamingContext_ptr
+TAO_Naming_Client::operator -> (void) const
+{
+  return this->naming_context_.ptr ();
+}
+
+CosNaming::NamingContext_ptr
+TAO_Naming_Client::get_context (void) const
+{
+  // Must duplicate this pointer so it can be stored in a _var.
+  return CosNaming::NamingContext::_duplicate (this->naming_context_.ptr ());
+}
+
+int
+TAO_Naming_Client::init (CORBA::ORB_ptr orb,
+                         ACE_Time_Value *timeout)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      CORBA::Object_var naming_obj =
+        orb->resolve_initial_references ("NameService", timeout ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (naming_obj.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the NameService.\n"),
+                          -1);
+      this->naming_context_ =
+        CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                           ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
+  return 0;
+}
+
+TAO_Naming_Client::TAO_Naming_Client (void)
+{
+  // Do nothing
+}
+
+TAO_Naming_Client::~TAO_Naming_Client (void)
+{
+  // Do nothing
+}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
new file mode 100644
index 00000000000..e4d0d92e235
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
@@ -0,0 +1,285 @@
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    Naming_Utils.h
+ *
+ *  $Id$
+ *
+ *    Implement wrappers useful to Naming Service clients and servers.
+ *
+ *
+ *  @author Nagarajan Surendran (naga@cs.wustl.edu)
+ *  @author Matt Braun <mjb2@cs.wustl.edu>
+ *  @author and Douglas C. Schmidt <schmidt@cs.wustl.edu>.
+ */
+//=============================================================================
+
+
+#ifndef TAO_NAMING_UTILS_H
+#define TAO_NAMING_UTILS_H
+#include /**/ "ace/pre.h"
+
+#include "tao/ORB.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
+#include "Naming_Context_Interface.h"
+#include "nsconf.h"
+
+// Forward decl;
+class TAO_Persistent_Context_Index;
+class TAO_Storable_Naming_Context_Activator;
+
+/**
+ * @class TAO_Naming_Server
+ *
+ * @brief Defines a wrapper class that holds the root Naming Context.
+ *
+ * This class either finds an existing Naming Service (if the
+ * <resolve_for_existing_naming_service> flag is set) or creates
+ * one (if <resolve_for_existing_naming_service> flag isn't set or
+ * Naming Service was not found).  This class also defines the
+ * operator-> so that  <NamingContext> functions like <bind>,
+ * <unbind> .. can be called directly on a <TAO_Naming_Server>
+ * object, and be forwareded to the root Naming Context.
+ * This class is intended to simplify
+ * programs that want to play the role of a Naming Service
+ * server.  To simplify programs that want to play the role of
+ * Naming Service clients, use <TAO_Naming_Client>.
+ * If a Naming Service is created locally, a TAO_IOR_Multicast
+ * event handler is created and installed on the ORB's reactor.
+ * This event handler allows other clients on the network to
+ * discover and use this Naming Service.
+ * Event handler listens on a multicast port for messages from
+ * clients looking for a Naming Service, and sends back the ior
+ * of the root Naming Context.  For more information on how this
+ * bootstraping through a multicast process works, check out
+ * orbsvcs/orbsvcs/TAO_IOR_Multicast.*, implementation of
+ * <resolve_initial_references>, and orbsvcs/Naming/README.
+ */
+class TAO_Naming_Export TAO_Naming_Server
+{
+public:
+  /// Default constructor.
+  TAO_Naming_Server (void);
+
+  /**
+   * Constructor.  Attempts to find an existing Naming Service if
+   * <resolve_for_existing_naming_service> is set to true.  If it is
+   * false, or no Naming Service was found during a <timeout> period,
+   * create the Naming Service in this process.  If creating the
+   * Naming Service locally, make the root context of size
+   * <context_size>, register it under the <poa>, and make the Naming
+   * Service persistent if <persistence_location> is not 0.
+   * (<persistence_location> specifies name of the file to use for
+   * persistent storage, <base_addr> specifies the address used for
+   * memory mapping <persistent_location> file).
+   * If <enable_multicast> is not zero then the service will respond
+   * to multicast location queries.
+   */
+  TAO_Naming_Server (CORBA::ORB_ptr orb,
+                     PortableServer::POA_ptr poa,
+                     size_t context_size = ACE_DEFAULT_MAP_SIZE,
+                     ACE_Time_Value *timeout = 0,
+                     int resolve_for_existing_naming_service = 1,
+                     const ACE_TCHAR *persistence_location = 0,
+                     void *base_addr = TAO_NAMING_BASE_ADDR,
+                     int enable_multicast = 1,
+                     int use_storable_context = 0,
+                     int round_trip_timeout = 0,
+                     int use_round_trip_timeout = 0);
+
+  /**
+   * Initializer.  Attempts to find an existing Naming Service if
+   * <resolve_for_existing_naming_service> is set to true.  If it is
+   * false, or no Naming Service was found during a <timeout> period,
+   * create the Naming Service in this process.  If creating the
+   * Naming Service locally, make the root context of size
+   * <context_size>, register it under the <poa>, and make the Naming
+   * Service persistent if <persistence_location> is not 0.
+   * (<persistence_location> specifies name of the file to use for
+   * persistent storage, <base_addr> specifies the address used for
+   * memory mapping <persistent_location> file).
+   * If <enable_multicast> is not zero then the service will respond
+   * to multicast location queries.
+   */
+  int init (CORBA::ORB_ptr orb,
+            PortableServer::POA_ptr poa,
+            size_t context_size = ACE_DEFAULT_MAP_SIZE,
+            ACE_Time_Value *timeout = 0,
+            int resolve_for_existing_naming_service = 1,
+            const ACE_TCHAR *persistence_location = 0,
+            void *base_addr = TAO_NAMING_BASE_ADDR,
+            int enable_multicast = 1,
+            int use_storable_context = 0,
+            int round_trip_timeout = 0,
+            int use_round_trip_timeout = 0);
+
+  /// Initialize the Naming Service with the command line arguments and
+  /// the ORB.
+  int init_with_orb (int argc,
+                     ACE_TCHAR *argv [],
+                     CORBA::ORB_ptr orb);
+
+  /// Destroy the child POA created in <init_with_orb>
+  int fini (void);
+
+  /// Destructor.
+  ~TAO_Naming_Server (void);
+
+  /// Returns the IOR of the naming service.
+  char * naming_service_ior (void);
+
+  /// Returns a <NamingContext_ptr> for the root Naming Context.
+  CosNaming::NamingContext_ptr operator-> (void) const;
+
+protected:
+  /**
+   * Helper method: create Naming Service locally.
+   * Make the root context of size
+   * <context_size>, register it under the <root_poa>, and make the Naming
+   * Service persistent if <persistence_location> is not 0.
+   * (<persistence_location> specifies name of the file to use for
+   * persistent storage).
+   * If <enable_multicast> is not zero then the service will respond
+   * to multicast location queries.
+   */
+  int init_new_naming (CORBA::ORB_ptr orb,
+                       PortableServer::POA_ptr root_poa,
+                       const ACE_TCHAR *persistence_location,
+                       void *base_addr,
+                       size_t context_size,
+                       int enable_multicast,
+                       int use_storable_context,
+                       int round_trip_timeout = 0,
+                       int use_round_trip_timeout = 0);
+
+  /// parses the arguments.
+  int parse_args (int argc, ACE_TCHAR *argv[]);
+
+  /// Root NamingContext_ptr.
+  CosNaming::NamingContext_var naming_context_;
+
+  /// The ior_multicast event handler.
+  TAO_IOR_Multicast *ior_multicast_;
+
+  /// The IOR string of the root naming context.
+  CORBA::String_var naming_service_ior_;
+
+  /**
+   * Pointer to the object used to create/initialize
+   * the Naming Service when local persistent Naming Service is
+   * desired.
+   */
+  TAO_Persistent_Context_Index *context_index_;
+
+  /// The ORB
+  CORBA::ORB_var orb_;
+
+  /// The Root POA.
+  PortableServer::POA_var root_poa_;
+
+  /// The Naming Service POA.
+  PortableServer::POA_var ns_poa_;
+
+  /// File to output the Naming Service IOR.
+  FILE *ior_output_file_;
+
+  /// File to output the process id.
+  const ACE_TCHAR *pid_file_name_;
+
+  /**
+   * Size of the hash_table allocated upon the creation of the Naming
+   * Service context (if one is created).  Note: all the contexts
+   * created under the given context will use the same size for their
+   * initial hash table allocations.
+   */
+  size_t context_size_;
+
+  /// Path to the file to be used to store/read in Naming Service
+  /// persistent state.
+  const ACE_TCHAR *persistence_file_name_;
+
+  /// Address to be used for memory mapping Naming Service state file,
+  /// identified by the <persistence_file_name_>.
+  void *base_address_;
+
+  /// After how long the server should stop listening to requests (in
+  /// seconds).
+  size_t time_;
+
+  /// If not zero multicast is enabled.
+  int multicast_;
+
+  /// If not zero use flat file persistence
+  int use_storable_context_;
+
+  /**
+   * If not zero use servant activator that uses flat file persistence.
+   */
+  int use_servant_activator_;
+
+  /**
+   * Need to retain the servant activator between calls to
+   * init_with_orb() and init_new_naming().
+   */
+  TAO_Storable_Naming_Context_Activator *servant_activator_;
+
+  /**
+   * If not zero support redundant naming servers.
+   */
+  int use_redundancy_;
+  
+  // If not zero use round trip timeout policy set to value specified
+  int round_trip_timeout_;
+  int use_round_trip_timeout_;
+};
+
+/**
+ * @class TAO_Naming_Client
+ *
+ * @brief This class is intended to simplify programs that want to play
+ * the role of Naming Service clients.
+ *
+ * Wrapper class that locates the root Naming Context.  It also
+ * defines the operator-> so that <NamingContext> functions like
+ * <resolve>, etc. can be directly called on a
+ * <TAO_Naming_Client> object, and will be forwarded to the root
+ * Naming Context.
+ */
+class TAO_Naming_Export TAO_Naming_Client
+{
+public:
+  // = Initialization and termination methods.
+
+  /// Default constructor.
+  TAO_Naming_Client (void);
+
+  /**
+   * Look for a Naming Service for a period of <timeout> using
+   * <resolve_initial_references>.  Return 0 if Naming Service is
+   * successfully located, and -1 on failure.
+   */
+  int init (CORBA::ORB_ptr orb,
+            ACE_Time_Value *timeout = 0);
+
+  /// Destructor.
+  ~TAO_Naming_Client (void);
+
+  /// Returns a pointer to the root Naming Context.
+  CosNaming::NamingContext_ptr operator-> (void) const;
+
+  /**
+   * Returns a pointer to the root Naming Context.  This ptr is
+   * duplicated via <_duplicate> so that it can be stored into a
+   * <*_var>.
+   */
+  CosNaming::NamingContext_ptr get_context (void) const;
+
+protected:
+  /// Reference to the root Naming Context.
+  CosNaming::NamingContext_var naming_context_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* TAO_NAMING_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index b97f3469164..c343a0ba7d0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -16,7 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Persistent_Entries.h"
-#include "naming_serv_export.h"
+#include "naming_export.h"
 #include "nsconf.h"
 #include "tao/PortableServer/PortableServer.h"
 
@@ -41,7 +41,7 @@
  * facilitates Persistent Naming Context servant initialization
  * upon Naming Server start-up.
  */
-class TAO_Naming_Serv_Export TAO_Persistent_Context_Index
+class TAO_Naming_Export TAO_Persistent_Context_Index
 {
 public:
   // = Some typedefs for convenience.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
index 59a65b3dd85..bc4d9f22dad 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
@@ -16,8 +16,8 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Hash_Map_With_Allocator_T.h"
-#include "orbsvcs/CosNamingC.h"
-#include "naming_serv_export.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "naming_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,7 +37,7 @@
  * Memory for the ior isn't allocated/deallocated, this class just
  * copies a pointer.
  */
-class TAO_Naming_Serv_Export TAO_Persistent_IntId
+class TAO_Naming_Export TAO_Persistent_IntId
 {
 public:
   // = Initialization and termination methods.
@@ -80,7 +80,7 @@ public:
  * Memory for id and kind isn't allocated/deallocated, this
  * class just copies pointers.
  */
-class TAO_Naming_Serv_Export TAO_Persistent_ExtId
+class TAO_Naming_Export TAO_Persistent_ExtId
 {
 public:
   // = Initialization and termination methods.
@@ -142,7 +142,7 @@ public:
  * they can be stored together as a <value> for a <key> in a
  * hash table holding the state of a Persistent Context Index.
  */
-class TAO_Naming_Serv_Export TAO_Persistent_Index_IntId
+class TAO_Naming_Export TAO_Persistent_Index_IntId
 {
 public:
   // = Initialization and termination methods.
@@ -186,7 +186,7 @@ public:
  * provide <hash> function for it to work with
  * ACE_Hash_Map_Manager.
  */
-class TAO_Naming_Serv_Export TAO_Persistent_Index_ExtId
+class TAO_Naming_Export TAO_Persistent_Index_ExtId
 {
 public:
   // = Initialization and termination methods.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index d3baab97b89..2b98c6f524f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -16,7 +16,7 @@
 
 #include "Hash_Naming_Context.h"
 #include "Persistent_Entries.h"
-#include "naming_serv_export.h"
+#include "naming_export.h"
 
 /**
  * @class TAO_Persistent_Bindings_Map
@@ -29,7 +29,7 @@
  * from persistent storage) to make bindings persistent and
  * supports TAO_Bindings_Map interface.  Used by TAO_Persistent_Naming_Context.
  */
-class TAO_Naming_Serv_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map
+class TAO_Naming_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map
 {
 public:
 
@@ -157,7 +157,7 @@ class TAO_Persistent_Context_Index;
  * process boundaries.  Derives from TAO_Hash_Naming_Context and
  * uses TAO_Persistent_Bindings_Map to store name to object bindings.
  */
-class TAO_Naming_Serv_Export TAO_Persistent_Naming_Context : public TAO_Hash_Naming_Context
+class TAO_Naming_Export TAO_Persistent_Naming_Context : public TAO_Hash_Naming_Context
 {
 public:
   /// Underlying data structure - typedef for ease of use.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index b3098abee20..62a189abd12 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -1,8 +1,6 @@
 #include "Storable_Naming_Context.h"
 #include "Bindings_Iterator_T.h"
 
-#include <tao/debug.h>
-
 // The following #pragma is needed to disable a warning that occurs
 // in MSVC 6 due to the overly long debugging symbols generated for
 // the ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_...> > template
@@ -19,126 +17,19 @@
 
 const char * TAO_Storable_Naming_Context::root_name_;
 ACE_UINT32 TAO_Storable_Naming_Context::gcounter_;
-ACE_Auto_Ptr<TAO_Storable_Base> TAO_Storable_Naming_Context::gfl_;
+TAO_Storable_Base * TAO_Storable_Naming_Context::gfl_;
 int TAO_Storable_Naming_Context::redundant_;
 
 ACE_RCSID (Naming,
            Storable_Naming_Context,
            "$Id$")
 
-TAO_Storable_IntId::TAO_Storable_IntId (void)
-  : ref_ (""),
-    type_ (CosNaming::nobject)
-{
-}
-
-TAO_Storable_IntId::TAO_Storable_IntId (const char * ior,
-                                            CosNaming::BindingType type)
-  : ref_ (ior),
-    type_ (type)
-{
-}
-
-TAO_Storable_IntId::TAO_Storable_IntId (const TAO_Storable_IntId &rhs)
-{
-  ref_ = rhs.ref_;
-  type_ = rhs.type_;
-}
-
-TAO_Storable_IntId::~TAO_Storable_IntId (void)
-{
-}
-
-void
-TAO_Storable_IntId::operator= (const TAO_Storable_IntId &rhs)
-{
-  // check for self assignment.
-  if (&rhs == this)
-    return;
-
-  type_ = rhs.type_;
-  ref_ = rhs.ref_;
-}
-
-TAO_Storable_ExtId::TAO_Storable_ExtId (void)
-  : id_ (""),
-    kind_ ("")
-{
-}
-
-TAO_Storable_ExtId::TAO_Storable_ExtId (const char *id,
-                                            const char *kind)
-  : id_ (id)
-  , kind_ (kind)
-{
-}
-
-TAO_Storable_ExtId::TAO_Storable_ExtId (const TAO_Storable_ExtId &rhs)
-{
-  id_ = rhs.id_;
-  kind_ = rhs.kind_;
-}
-
-TAO_Storable_ExtId::~TAO_Storable_ExtId (void)
-{
-}
-
-void
-TAO_Storable_ExtId::operator= (const TAO_Storable_ExtId &rhs)
-{
-  // Check for self assignment.
-  if (&rhs == this)
-    return;
-
-  id_ = rhs.id_;
-  kind_ = rhs.kind_;
-}
-
-bool
-TAO_Storable_ExtId::operator== (const TAO_Storable_ExtId &rhs) const
-{
-  return (ACE_OS::strcmp (id_.in(), rhs.id_.in()) == 0)
-    && (ACE_OS::strcmp (kind_.in(), rhs.kind_.in()) == 0);
-}
-
-bool
-TAO_Storable_ExtId::operator!= (const TAO_Storable_ExtId &rhs) const
-{
-  return (ACE_OS::strcmp (id_.in(), rhs.id_.in()) != 0)
-    || (ACE_OS::strcmp (kind_.in(), rhs.kind_.in()) != 0);
-}
-
-u_long
-TAO_Storable_ExtId::hash (void) const
-{
-  // @CJC I wager this could be optimized a bit better, but I'm not
-  // sure how much it's called.  At the very least, we could allocate
-  // just one ACE_CString, and copy id_ and kind_ into that, rather than
-  // taking a double-hit on allocations.
-  ACE_CString temp (id_.in());
-  temp += kind_.in();
-
-  return temp.hash ();
-}
-
-const char *
-TAO_Storable_ExtId::id (void)
-{
-  return id_.in();
-}
-
-const char *
-TAO_Storable_ExtId::kind (void)
-{
-  return kind_.in();
-}
-
 int
 TAO_Storable_Bindings_Map::unbind (const char *id,
                                    const char *kind)
 {
   ACE_TRACE("unbind");
-  TAO_Storable_ExtId name (id, kind);
+  TAO_Persistent_ExtId name (id, kind);
   return this->map_.unbind (name);
 }
 
@@ -169,8 +60,8 @@ TAO_Storable_Bindings_Map::find (const char *id,
                                  CosNaming::BindingType &type)
 {
   ACE_TRACE("find");
-  TAO_Storable_ExtId name (id, kind);
-  TAO_Storable_IntId entry;
+  TAO_Persistent_ExtId name (id, kind);
+  TAO_Persistent_IntId entry;
 
   if (this->map_.find (name,
                        entry) != 0)
@@ -180,7 +71,7 @@ TAO_Storable_Bindings_Map::find (const char *id,
   else
     {
       ACE_DECLARE_NEW_CORBA_ENV;
-      obj = orb_->string_to_object (entry.ref_.in() ACE_ENV_ARG_PARAMETER);
+      obj = orb_->string_to_object (entry.ref_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       type = entry.type_;
 
@@ -230,10 +121,9 @@ TAO_Storable_Bindings_Map::shared_bind (const char * id,
                                         int rebind)
 {
   ACE_TRACE("shared_bind");
-  TAO_Storable_ExtId new_name (id, kind);
-  CORBA::String_var ior = orb_->object_to_string(obj);
-  TAO_Storable_IntId new_entry (ior.in(), type);
-  TAO_Storable_IntId old_entry;
+  TAO_Persistent_ExtId new_name (CORBA::string_dup(id), CORBA::string_dup(kind));
+  TAO_Persistent_IntId new_entry (orb_->object_to_string(obj), type);
+  TAO_Persistent_IntId old_entry;
 
   if (rebind == 0)
     {
@@ -268,12 +158,12 @@ void TAO_Storable_Naming_Context::Write(TAO_Storable_Base& wrtr)
   if( storable_context_->current_size() == 0 )
     return;
 
-  ACE_Hash_Map_Iterator<TAO_Storable_ExtId,TAO_Storable_IntId,
+  ACE_Hash_Map_Iterator<TAO_Persistent_ExtId,TAO_Persistent_IntId,
                         ACE_Null_Mutex> it = storable_context_->map().begin();
-  ACE_Hash_Map_Iterator<TAO_Storable_ExtId,TAO_Storable_IntId,
+  ACE_Hash_Map_Iterator<TAO_Persistent_ExtId,TAO_Persistent_IntId,
                         ACE_Null_Mutex> itend = storable_context_->map().end();
 
-  ACE_Hash_Map_Entry<TAO_Storable_ExtId,TAO_Storable_IntId> ent = *it;
+  ACE_Hash_Map_Entry<TAO_Persistent_ExtId,TAO_Persistent_IntId> ent = *it;
 
   while (!(it == itend))
   {
@@ -302,11 +192,11 @@ void TAO_Storable_Naming_Context::Write(TAO_Storable_Base& wrtr)
     ACE_CString name;
     if (bt == CosNaming::nobject)
       {
-        name.set((*it).int_id_.ref_.in());
+        name.set((*it).int_id_.ref_);
       }
     else
       {
-        CORBA::Object_var obj = orb_->string_to_object((*it).int_id_.ref_.in());
+        CORBA::Object_var obj = orb_->string_to_object((*it).int_id_.ref_);
         PortableServer::ObjectId_var oid = poa_->reference_to_id(obj.in());
         CORBA::String_var nm = PortableServer::ObjectId_to_string(oid.in());
         const char *newname = nm.in();
@@ -330,7 +220,7 @@ TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck
 
   // create the new bindings map
   ACE_NEW_THROW_EX (bindings_map,
-                    TAO_Storable_Bindings_Map (hash_table_size_,orb_.in()),
+                    TAO_Storable_Bindings_Map (hash_table_size_,orb_),
                     CORBA::NO_MEMORY ());
 
   // get the data for this bindings map from the file
@@ -411,7 +301,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
   file_name += context->name_;
 
   // Create the stream
-  fl_ = context->factory_->create_stream(file_name, ACE_TEXT_CHAR_TO_TCHAR(mode));
+  fl_ = context->factory_->create_stream(file_name, mode);
   if (TAO_Storable_Naming_Context::redundant_)
   {
     if (fl_->open() != 0)
@@ -466,11 +356,6 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
       ACE_CHECK;
     }
   }
-  else
-    {
-      // Need to insure that fl_ gets deleted
-      delete fl_;
-    }
 }
 
 void
@@ -533,31 +418,14 @@ TAO_Storable_Naming_Context::TAO_Storable_Naming_Context (
 TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void)
 {
   ACE_TRACE("~TAO_Storable_Naming_Context");
+  // build the file name
+  ACE_CString file_name(persistence_directory_);
+  file_name += "/";
+  file_name += name_;
+  // and delete the file
+  TAO_Storable_Base * fl = factory_->create_stream(file_name, "w");
+  fl->remove();
 
-  // If we're in the DTOR as a result of the destroy() operation,
-  // then we go ahead and delete the file.  Otherwise, we leave the
-  // file around because they need to be there for persistence.
-  if (this->destroyed_)
-    {
-      // Make sure we delete the associated stream
-      ACE_CString file_name (this->persistence_directory_);
-      file_name += "/";
-      file_name += this->name_;
-
-      // Now delete the file
-      ACE_Auto_Ptr<TAO_Storable_Base>
-        fl (
-          this->factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()),
-                                        ACE_TEXT("r"))
-          );
-      if (fl.get())
-        {
-          if (TAO_debug_level > 5)
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) NameService: removing file %s\n",
-                        file_name.fast_rep()));
-          fl->remove ();
-        }
-    }
 }
 
 CosNaming::NamingContext_ptr
@@ -671,7 +539,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
     // acquire a lock on the file that holds our counter
     if (gfl_->open() != 0)
       {
-        delete gfl_.release();
+        delete gfl_;
         ACE_THROW_RETURN(CORBA::PERSIST_STORE(),
                          CosNaming::NamingContext::_nil ());
       }
@@ -679,7 +547,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
          ACE_THROW_RETURN (CORBA::INTERNAL(),
                            CosNaming::NamingContext::_nil ());
     // get the counter from disk
-    *gfl_.get() >> global;
+    *gfl_ >> global;
     gcounter_ = global.counter();
     // use it to generate a new name
   }
@@ -690,7 +558,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
                    gcounter_++);
   // then save it back on disk
   global.counter(gcounter_);
-  *gfl_.get() << global;
+  *gfl_ << global;
   if(redundant_)
   {
     // and release our lock
@@ -703,19 +571,19 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
   // Create a new context.
   TAO_Storable_Naming_Context *new_context = 0;
   CosNaming::NamingContext_var result =
-    make_new_context (this->orb_.in (),
+    make_new_context (this->orb_,
                       this->poa_.in (),
                       poa_id,
                       this->storable_context_->total_size (),
                       this->factory_,
-                      ACE_TEXT_CHAR_TO_TCHAR (this->persistence_directory_.c_str ()),
+                      this->persistence_directory_.c_str (),
                       &new_context
                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Since this is a new context, make an empty map in it
   ACE_NEW_THROW_EX (new_context->storable_context_,
-                    TAO_Storable_Bindings_Map (hash_table_size_,orb_.in ()),
+                    TAO_Storable_Bindings_Map (hash_table_size_,orb_),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
   new_context->context_ = new_context->storable_context_;
@@ -1356,11 +1224,11 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
 
   // Silliness below is required because of broken old g++!!!  E.g.,
   // without it, we could have just said HASH_MAP::ITERATOR everywhere we use ITER_DEF.
-  typedef ACE_Hash_Map_Manager<TAO_Storable_ExtId,
-                               TAO_Storable_IntId,
+  typedef ACE_Hash_Map_Manager<TAO_Persistent_ExtId,
+                               TAO_Persistent_IntId,
                                ACE_Null_Mutex>::ITERATOR ITER_DEF;
-  typedef ACE_Hash_Map_Manager<TAO_Storable_ExtId,
-                               TAO_Storable_IntId,
+  typedef ACE_Hash_Map_Manager<TAO_Persistent_ExtId,
+                               TAO_Persistent_IntId,
                                ACE_Null_Mutex>::ENTRY ENTRY_DEF;
 
   // Typedef to the type of BindingIterator servant for ease of use.
@@ -1478,10 +1346,10 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Now does this already exist on disk?
-  ACE_TString file_name(persistence_directory);
-  file_name += ACE_TEXT("/");
-  file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id);
-  ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("r")));
+  ACE_CString file_name(persistence_directory);
+  file_name += "/";
+  file_name += poa_id;
+  TAO_Storable_Base * fl = factory->create_stream(file_name, "r");
   if (fl->exists())
   {
     // Load the map from disk
@@ -1502,20 +1370,20 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
   }
 
   // build the global file name
-  file_name += ACE_TEXT("_global");
+  file_name += "_global";
 
   // Create the stream for the counter used to uniquely creat context names
-  gfl_.reset(factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("crw")));
+  gfl_ = factory->create_stream(file_name, "crw");
   if (gfl_->open() != 0)
     {
-      delete gfl_.release();
+      delete gfl_;
       ACE_THROW_RETURN(CORBA::PERSIST_STORE(),
                        CosNaming::NamingContext::_nil ());
     }
 
   // get the counter from disk
   TAO_NS_Persistence_Global global;
-  *gfl_.get() >> global;
+  *gfl_ >> global;
   gcounter_ = global.counter();
   if(redundant_) gfl_->close();
 
@@ -1528,29 +1396,7 @@ template class ACE_Unbounded_List_Iterator<ACE_CString>;
 template class ACE_Unbounded_List<ACE_CString>;
 template class ACE_NS_Node<ACE_CString>;
 template class ACE_Auto_Basic_Ptr<TAO_Storable_Naming_Context>;
-template class ACE_Hash_Map_Manager<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId>;
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>;
-template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex > >;
-template class TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> >;
-template class ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> > >;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> >
-#pragma instantiate TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> >
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> > >
 #pragma instantiate ACE_Unbounded_List_Iterator<ACE_CString>
 #pragma instantiate ACE_Unbounded_List<ACE_CString>
 #pragma instantiate ACE_NS_Node<ACE_CString>
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index a8d6c62f634..d7353f68281 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -16,6 +16,7 @@
 
 #include "Hash_Naming_Context.h"
 #include "ace/Hash_Map_Manager.h"
+#include "Persistent_Entries.h"
 
 #include "Storable.h"
 
@@ -23,87 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_Naming_Serv_Export TAO_Storable_IntId
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_Storable_IntId (void);
-
-  /// Constructor.
-  TAO_Storable_IntId (/* in */ const char * ior,
-                        CosNaming::BindingType type /* = CosNaming::nobject */);
-
-  /// Copy constructor.
-  TAO_Storable_IntId (const TAO_Storable_IntId & rhs);
-
-  /// Destructor.
-  ~TAO_Storable_IntId (void);
-
-  /// Assignment operator.
-  void operator= (const TAO_Storable_IntId & rhs);
-
-  // = Data members.
-
-  /// Stringified IOR to be stored in a Persistent Naming Context.
-  CORBA::String_var  ref_;
-
-  /// Binding type for <ref_>.
-  CosNaming::BindingType type_;
-};
-
-class TAO_Naming_Serv_Export TAO_Storable_ExtId
-{
-public:
-  // = Initialization and termination methods.
-
-  /// Constructor.
-  TAO_Storable_ExtId (void);
-
-  /// Constructor.
-  TAO_Storable_ExtId (/* in */ const char *id,
-                        /* in */ const char *kind);
-
-  /// Copy constructor.
-  TAO_Storable_ExtId (const TAO_Storable_ExtId & rhs);
-
-  /// Destructor.
-  ~TAO_Storable_ExtId (void);
-
-  // = Assignment and comparison methods.
-
-  /// Assignment operator (does copy memory).
-  void operator= (const TAO_Storable_ExtId & rhs);
-
-  /// Equality comparison operator (must match both id_ and kind_).
-  bool operator== (const TAO_Storable_ExtId &rhs) const;
-
-  /// Inequality comparison operator.
-  bool operator!= (const TAO_Storable_ExtId &rhs) const;
-
-  /// <hash> function is required in order for this class to be usable by
-  /// ACE_Hash_Map_Manager.
-  u_long hash (void) const;
-
-  // = Data members.
-
-  /// <id> portion of the name to be associated with some object
-  /// reference in a Storable Naming Context.
-  CORBA::String_var id_;
-
-  /// <kind> portion of the name to be associated with some object
-  /// reference in a Storable Naming Context.
-  CORBA::String_var kind_;
-
-  // Accessors.
-  // follow the mapping rules!
-
-  const char * id (void);
-  const char * kind (void);
-
-};
-
-
 /**
  * @class TAO_Storable_Bindings_Map
  *
@@ -113,13 +33,13 @@ public:
  * A thin wrapper on top of ACE_Hash_Map_Manager.  Supports
  * TAO_Bindings_Map interface.  Used by TAO_Transient_Naming_Context.
  */
-class TAO_Naming_Serv_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map
+class TAO_Naming_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map
 {
 public:
 
   /// Underlying data structure - typedef for ease of use.
-  typedef ACE_Hash_Map_Manager<TAO_Storable_ExtId,
-                               TAO_Storable_IntId,
+  typedef ACE_Hash_Map_Manager<TAO_Persistent_ExtId,
+                               TAO_Persistent_IntId,
                                ACE_Null_Mutex> HASH_MAP;
 
   // = Initialization and termination methods.
@@ -196,7 +116,7 @@ private:
   /// Hash map used for storage.
   HASH_MAP map_;
 
-  CORBA::ORB_var orb_;
+  CORBA::ORB_ptr orb_;
 
 };
 
@@ -213,7 +133,7 @@ private:
  * TAO_Hash_Naming_Context and uses TAO_Storable_Bindings_Map to
  * store name to object bindings.
  */
-class TAO_Naming_Serv_Export TAO_Storable_Naming_Context : public TAO_Hash_Naming_Context
+class TAO_Naming_Export TAO_Storable_Naming_Context : public TAO_Hash_Naming_Context
 {
 
 public:
@@ -377,7 +297,7 @@ protected:
    */
   TAO_Storable_Bindings_Map *storable_context_;
 
-  CORBA::ORB_var orb_;
+  CORBA::ORB_ptr orb_;
 
   ACE_CString name_;
 
@@ -400,7 +320,7 @@ protected:
   static const char * root_name_;
 
   /// The pointer to the global file used to allocate new contexts
-  static ACE_Auto_Ptr<TAO_Storable_Base> gfl_;
+  static TAO_Storable_Base *gfl_;
 
 /**
  * @class File_Open_Lock_and_Check
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index 5402c1faed9..48edea3d915 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -34,7 +34,6 @@ TAO_Storable_Naming_Context_Activator (CORBA::ORB_ptr orb,
 
 TAO_Storable_Naming_Context_Activator::~TAO_Storable_Naming_Context_Activator ()
 {
-  delete factory_;
 }
 
 PortableServer::Servant
@@ -57,10 +56,10 @@ TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId
   // the persistence elment needs to be read in.
 
   // Does this already exist on disk?
-  ACE_TString file_name(persistence_directory_);
-  file_name += ACE_TEXT("/");
-  file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id.in());
-  TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("rw"));
+  ACE_CString file_name(persistence_directory_);
+  file_name += "/";
+  file_name += poa_id.in();
+  TAO_Storable_Base * fl = factory_->create_stream(file_name, "rw");
   if (!fl->exists()) {
     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
                       0);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
index c761c23661e..c3fa3cbf2ac 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -17,12 +17,11 @@
 #define TAO_STORABLE_NAMING_CONTEXT_ACTIVATOR_H
 #include /**/ "ace/pre.h"
 
-#include <tao/PortableServer/PortableServer.h>
-#include <tao/LocalObject.h>
+#include "tao/PortableServer/PortableServer.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#include "naming_serv_export.h"
+#include "naming_export.h"
 
 class TAO_Naming_Service_Persistence_Factory;
 
@@ -32,8 +31,8 @@ class TAO_Naming_Service_Persistence_Factory;
  * "lazily" created on demand in other processes by reading the
  * context file off disk only when a request to the context is made.
  */
-class TAO_Naming_Serv_Export TAO_Storable_Naming_Context_Activator :
-  public virtual PortableServer::ServantActivator
+class TAO_Naming_Export TAO_Storable_Naming_Context_Activator :
+  public PortableServer::ServantActivator
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index 94ba088fb30..a4bfdca61d0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -31,7 +31,7 @@
  * A thin wrapper on top of ACE_Hash_Map_Manager.  Supports
  * TAO_Bindings_Map interface.  Used by TAO_Transient_Naming_Context.
  */
-class TAO_Naming_Serv_Export TAO_Transient_Bindings_Map : public TAO_Bindings_Map
+class TAO_Naming_Export TAO_Transient_Bindings_Map : public TAO_Bindings_Map
 {
 public:
 
@@ -126,7 +126,7 @@ private:
  * TAO_Hash_Naming_Context and uses TAO_Transient_Bindings_Map to
  * store name to object bindings.
  */
-class TAO_Naming_Serv_Export TAO_Transient_Naming_Context : public TAO_Hash_Naming_Context
+class TAO_Naming_Export TAO_Transient_Naming_Context : public TAO_Hash_Naming_Context
 {
 
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index c01902fea7e..92d8788807f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (Notify,
            TAO_Notify_Admin,
            "$Id$")
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 
 #include "Container_T.h"
 #include "Proxy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index c2c384df821..f26fd54b02d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,7 +35,7 @@ template <class TYPE> class TAO_Notify_Container_T;
  *
  */
 
-class TAO_Notify_Serv_Export TAO_Notify_Admin : public virtual TAO_Notify_Object
+class TAO_Notify_Export TAO_Notify_Admin : public virtual TAO_Notify_Object
 {
   friend class TAO_Notify_Builder;
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index 1d373b8eac8..74b0ec9f268 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (Notify,
            TAO_Notify_AdminProperties, 
            "$Id$")
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void)
   : max_global_queue_length_ (CosNotification::MaxQueueLength, 0)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
index e7f51ebc5a0..dada530013a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,7 +37,7 @@
  * @brief The AdminProperties per EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_AdminProperties 
+class TAO_Notify_Export TAO_Notify_AdminProperties 
   : public TAO_Notify_PropertySeq
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index d97e7bc2b7e..69e19fce382 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -23,7 +23,7 @@
 #include "../Event.h"
 #include "../EventType.h"
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 class TAO_Notify_Consumer;
 
@@ -33,7 +33,7 @@ class TAO_Notify_Consumer;
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Event
+class TAO_Notify_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Event
 {
   friend class TAO_Notify_Builder;
 public:
@@ -85,7 +85,7 @@ protected:
  * @brief AnyEvent implementation.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_AnyEvent : public TAO_Notify_AnyEvent_No_Copy
+class TAO_Notify_Export TAO_Notify_AnyEvent : public TAO_Notify_AnyEvent_No_Copy
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index 7cb9b02f115..d1bfcce96ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 #include "../ProxyConsumer_T.h"
 
@@ -37,7 +37,7 @@
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushConsumer
+class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushConsumer
   : public virtual TAO_Notify_ProxyConsumer_T <POA_CosEventChannelAdmin::ProxyPushConsumer>
 {
  friend class TAO_Notify_Builder;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index 69acbdcdacc..a03473c6ca1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 
 #include "../ProxySupplier_T.h"
 
@@ -32,7 +32,7 @@
 #endif /* _MSC_VER */
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
@@ -42,7 +42,7 @@ TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>;
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushSupplier
+class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushSupplier
   : public virtual TAO_Notify_ProxySupplier_T <POA_CosEventChannelAdmin::ProxyPushSupplier>
 {
   friend class TAO_Notify_Builder;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index 6c732c772ad..06267731c7a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 #include "../ProxyConsumer_T.h"
 
 #if defined(_MSC_VER)
@@ -36,7 +36,7 @@
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ProxyPushConsumer
+class TAO_Notify_Export TAO_Notify_ProxyPushConsumer
   : public virtual TAO_Notify_ProxyConsumer_T <
                        POA_CosNotifyChannelAdmin::ProxyPushConsumer
                      >
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index c24668ef7e8..4402cb21ad4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -20,8 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/Event_ForwarderS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_ForwarderS.h"
 
 #include "../ProxySupplier_T.h"
 
@@ -33,7 +33,7 @@
 #endif /* _MSC_VER */
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
@@ -43,7 +43,7 @@ TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>;
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ProxyPushSupplier
+class TAO_Notify_Export TAO_Notify_ProxyPushSupplier
   : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier>
 {
   friend class TAO_Notify_Builder;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index d26302a2cee..fd1ee695630 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (Notify,
            "$Id$")
 
 #include "ace/Refcounted_Auto_Ptr.h"
-#include "orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
 #include "../Event.h"
 
 TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index f5ca3aa8af9..5186338831e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "../Consumer.h"
 
 /**
@@ -28,7 +28,7 @@
  * @brief Wrapper for the PushConsumer that connect to the EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_PushConsumer : public TAO_Notify_Consumer
+class TAO_Notify_Export TAO_Notify_PushConsumer : public TAO_Notify_Consumer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index 9f9ab07131e..9beba8f8d00 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "../Supplier.h"
 
 class TAO_Notify_ProxyConsumer;
@@ -31,7 +31,7 @@ class TAO_Notify_ProxyConsumer;
  * @brief Wrapper for the PushSupplier that connect to the EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplier
+class TAO_Notify_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplier
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index 55acfa6f5dc..01eb6d0b631 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (Notify,
 
 #include "ace/Message_Queue.h"
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 #include "Method_Request.h"
 #include "Notify_Extensions.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index fb2bdc4627c..d9159c14863 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,7 +23,7 @@
 #include "ace/Null_Condition.h"
 #include "ace/Message_Queue.h"
 
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 
 #include "Property.h"
 #include "Property_T.h"
@@ -40,7 +40,7 @@ typedef ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Notify_Message_Queue;
  * @brief Base Strategy to enqueue and dequeue items from a Message Queue.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Buffering_Strategy
+class TAO_Notify_Export TAO_Notify_Buffering_Strategy
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index bcf5abd6bec..d5c959508d3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,8 +22,8 @@
 
 #include "tao/PortableServer/PortableServer.h"
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "AdminProperties.h"
 
@@ -40,7 +40,7 @@ class TAO_Notify_Object;
  * @brief Helper class to create and activate CORBA objects.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Builder
+class TAO_Notify_Export TAO_Notify_Builder
 {
 public:
   TAO_Notify_Builder (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index bac8a0cbded..f7ff532b790 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -14,14 +14,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 #include "Peer.h"
 #include "Event.h"
@@ -35,7 +35,7 @@ class TAO_Notify_Proxy;
  * @brief Astract Base class for wrapping consumer objects that connect to the EventChannel
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Consumer : public TAO_Notify_Peer
+class TAO_Notify_Export TAO_Notify_Consumer : public TAO_Notify_Peer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 5552b0df58b..3f9a5f08608 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (RT_Notify,
            "$Id$")
 
 #include "ace/Auto_Ptr.h"
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "Subscription_Change_Worker.h"
 #include "Proxy.h"
 #include "EventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 99964a7cd11..394f43568b0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -14,13 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/NotifyExtS.h"
+#include "orbsvcs/orbsvcs/NotifyExtS.h"
 
 #include "Admin.h"
 
@@ -37,7 +37,7 @@
  * @brief Implementation of CosNotifyChannelAdmin::ConsumerAdmin
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : public POA_NotifyExt::ConsumerAdmin
+class TAO_Notify_Export TAO_Notify_ConsumerAdmin : public POA_NotifyExt::ConsumerAdmin
                                              , public virtual TAO_Notify_Admin
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
index 7a296f0d5b5..ce37ae65180 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index f3dddbcffe4..e469099bfa1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -9,8 +9,8 @@
 #include "Factory.h"
 #include "POA_Helper.h"
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "Container_T.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
index 6713775b023..59a953d6a46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -14,13 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 /**
  * @class TAO_Notify_Container_T
@@ -30,7 +30,7 @@
  *
  */
 template <class TYPE>
-class TAO_Notify_Serv_Export TAO_Notify_Container_T
+class TAO_Notify_Export TAO_Notify_Container_T
 {
   typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION;
  public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
index 5dccf6d8084..323ce71551c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_COSNOTIFY_INITIALIZER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,7 +25,7 @@
  * @brief  Helper to load the Cos Notification service into the service conf. for static links.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_CosNotify_Initializer
+class TAO_Notify_Export TAO_Notify_CosNotify_Initializer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 4fcfbe8081e..5e97efabfa8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -8,7 +8,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/ORB_Core.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 #include "tao/debug.h"
 
 ACE_RCSID (Notify,
@@ -260,7 +260,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CosNotify_Service,
                        0)
 
 
-ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_CosNotify_Service)
+ACE_FACTORY_DEFINE (TAO_Notify, TAO_CosNotify_Service)
 
 /*********************************************************************************************************************/
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index 680d8d2432f..0d42cc867eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_COSNOTIFY_SERVICE_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,7 +32,7 @@ class TAO_Notify_EventChannelFactory;
  * @brief A service object for creating the  Notify Service Factory.
  *
  */
-class TAO_Notify_Serv_Export TAO_CosNotify_Service : public TAO_Notify_Service
+class TAO_Notify_Export TAO_CosNotify_Service : public TAO_Notify_Service
 {
 public:
   /// Constuctor
@@ -75,7 +75,7 @@ protected:
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_CosNotify_Service)
-ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_CosNotify_Service)
+ACE_FACTORY_DECLARE (TAO_Notify, TAO_CosNotify_Service)
 
 ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_EMO_Factory_OLD)
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index 7f50ca0368e..4dc6a1be779 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -10,8 +10,8 @@ ACE_RCSID (Notify,
            TAO_Notify_Default_Factory, 
            "$Id$")
 
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h"
 
 #include "EventChannelFactory.h"
 #include "EventChannel.h"
@@ -192,7 +192,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy
                     CORBA::NO_MEMORY ());
 }
 
-ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_Default_Factory)
+ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_Factory)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
index e82cab43b1b..f80e6704156 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_DEFAULT_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,7 +27,7 @@
  * @brief Default_Factory interface for creating Notify Objects.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Default_Factory : public TAO_Notify_Factory
+class TAO_Notify_Export TAO_Notify_Default_Factory : public TAO_Notify_Factory
 {
 public:
   /// Constructor
@@ -91,7 +91,7 @@ public:
   virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 };
 
-ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Default_Factory)
+ACE_FACTORY_DECLARE (TAO_Notify, TAO_Notify_Default_Factory)
 
 #if defined (__ACE_INLINE__)
 #include "Default_Factory.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index af16effffeb..8f7f4c667bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_ETCL_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +22,7 @@
 #include "ace/Containers_T.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Atomic_Op.h"
-#include "orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
 #include "Notify_Constraint_Interpreter.h"
 #include "ace/Null_Mutex.h"
 
@@ -39,7 +39,7 @@
  * @brief Implementation of CosNotifyFilter::Filter servant.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase
+class TAO_Notify_Export TAO_Notify_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index 4c01423eb95..a1984684d40 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -78,4 +78,4 @@ TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ());
 }
 
-ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory)
+ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_ETCL_FilterFactory)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 5c67cbb8f5a..290d305d385 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -14,13 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
 
 #include "FilterFactory.h"
 
@@ -37,7 +37,7 @@
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory
+class TAO_Notify_Export TAO_Notify_ETCL_FilterFactory
   : public virtual PortableServer::RefCountServantBase,
     public virtual POA_CosNotifyFilter::FilterFactory,
     public virtual TAO_Notify_FilterFactory
@@ -86,7 +86,7 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory)
+ACE_FACTORY_DECLARE (TAO_Notify, TAO_Notify_ETCL_FilterFactory)
 
 #if defined (__ACE_INLINE__)
 #include "ETCL_FilterFactory.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
index b731ccf5f4d..60fbdcbec72 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (Notify,
            "$Id$")
 
 #include "tao/debug.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 TAO_Notify_Event::TAO_Notify_Event (void)
   :priority_ (CosNotification::Priority, CosNotification::DefaultPriority),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index 66a8c40bff3..595e666c059 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,9 +23,9 @@
 #include "ace/Copy_Disabled.h"
 #include "ace/Refcounted_Auto_Ptr.h"
 
-#include "orbsvcs/Event_ForwarderS.h"
-#include "orbsvcs/CosNotifyFilterC.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/Event_ForwarderS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 #include "Property.h"
 #include "Property_T.h"
@@ -39,7 +39,7 @@ class TAO_Notify_EventType;
  * @brief Base class abstraction for Events flowing through the EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Event : private ACE_Copy_Disabled
+class TAO_Notify_Export TAO_Notify_Event : private ACE_Copy_Disabled
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index e334a2f03e5..b2fcdf3618c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -14,13 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 #include "Object.h"
 
@@ -42,7 +42,7 @@ template <class TYPE> class TAO_Notify_Container_T;
  * @brief Implementation of CosNotifyChannelAdmin::EventChannel
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_EventChannel 
+class TAO_Notify_Export TAO_Notify_EventChannel 
   : public POA_CosNotifyChannelAdmin::EventChannel, 
     public virtual TAO_Notify_Object
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index c93fffd92a2..21db8d744e0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -14,14 +14,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtS.h"
 
 #include "Object.h"
 
@@ -41,7 +41,7 @@ template <class TYPE> class TAO_Notify_Container_T;
  * @brief Implementation of CosNotifyChannelAdmin::EventChannelFactory
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory 
+class TAO_Notify_Export TAO_Notify_EventChannelFactory 
   : public virtual POA_NotifyExt::EventChannelFactory, 
     public virtual TAO_Notify_Object
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index 3fcd875060d..c4a43ef34b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -14,13 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 /**
  * @class TAO_Notify_EventType
@@ -31,7 +31,7 @@
  * It is used by the Event Manager as a key to find subscription lists.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_EventType
+class TAO_Notify_Export TAO_Notify_EventType
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index 9f492e605e7..9d785fb16e6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_EVENTTYPESEQ_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,7 +28,7 @@
  * @brief Allows operations using the CosNotification::EventTypeSeq type.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_EventTypeSeq : public ACE_Unbounded_Set <TAO_Notify_EventType>
+class TAO_Notify_Export TAO_Notify_EventTypeSeq : public ACE_Unbounded_Set <TAO_Notify_EventType>
 {
  typedef ACE_Unbounded_Set <TAO_Notify_EventType> inherited;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index bb9aaa8159d..05bd7babae0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -14,13 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 #include "tao/orbconf.h"
 
@@ -47,7 +47,7 @@ typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer,
  * @brief A class that manages the Consumer and Supplier maps.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Event_Manager
+class TAO_Notify_Export TAO_Notify_Event_Manager
 {
 public:
   /// Constuctor
@@ -118,7 +118,7 @@ protected:
  * @brief Inform ProxyConsumer of updates.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer>
+class TAO_Notify_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer>
 {
 public:
   TAO_Notify_ProxyConsumer_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
@@ -139,7 +139,7 @@ protected:
  * @brief Inform ProxySupplier of updates.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
+class TAO_Notify_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
 {
 public:
   TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index 089a32adca0..a9b78c54179 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (Notify,
            TAO_Notify_Event_Map_Entry_T, 
            "$Id$")
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "Properties.h"
 #include "Factory.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
index 869803a26b7..772248e88eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 77de698806d..bad6e640cac 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -4,7 +4,7 @@
 #define TAO_Notify_EVENT_MAP_T_C
 
 #include "Event_Map_T.h"
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "Event_Map_Entry_T.h"
 #include "Properties.h"
 #include "Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index 27567a9c7a2..12f22d596db 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_EVENT_MAP_T_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
index d2b7122a09d..aabe006a916 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
@@ -65,7 +65,7 @@ typedef TAO_ESF_Proxy_Collection<TAO_Notify_Proxy> TAO_Notify_Proxy_Collection;
  * @brief Factory interface for creating Notify Objects.
  *
  */
-class /*TAO_Notify_Serv_Export*/ TAO_Notify_Factory : public ACE_Service_Object
+class /*TAO_Notify_Export*/ TAO_Notify_Factory : public ACE_Service_Object
 {
 public:
   /// Create ProxySupplier Collection
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index 4e40b0b5ac9..7f7eb146061 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
 
 #include "ace/Hash_Map_Manager.h"
 
 #include "ID_Factory.h"
 #include "Event.h"
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 /**
  * @class TAO_Notify_FilterAdmin
@@ -29,7 +29,7 @@
  * @brief FilterAdmin interface methods implementation.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
+class TAO_Notify_Export TAO_Notify_FilterAdmin
 {
 
  public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
index 689aacf4857..d15325cb57f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +30,7 @@
  * @brief Service Object to obtain a CosNotifyFilter::FilterFactory reference.
  *
  */
-class /*TAO_Notify_Serv_Export*/ TAO_Notify_FilterFactory : public ACE_Service_Object
+class /*TAO_Notify_Export*/ TAO_Notify_FilterFactory : public ACE_Service_Object
 {
 public:
   /// Factory method to create a FilterFactory reference
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
index 554a52395a7..9fcf4aa8c7f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -13,14 +13,14 @@
 #define TAO_Notify_FIND_WORKER_T_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 #include "Container_T.h"
 #include "Object.h"
 
@@ -31,7 +31,7 @@
  *
  */
 template <class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION>
-class TAO_Notify_Serv_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TYPE>
+class TAO_Notify_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TYPE>
 {
   typedef TAO_Notify_Container_T<TYPE> CONTAINER;
   typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
index f3f6e3127b0..0a0ba05df0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +30,7 @@
  * @brief A simple factory for generating ID's for objects created by Notify.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ID_Factory
+class TAO_Notify_Export TAO_Notify_ID_Factory
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index 6134050823d..545a4d968ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,7 +34,7 @@ class TAO_Notify_Method_Request;
  * @brief Base class for Method Requests that do not copy the event.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_No_Copy
+class TAO_Notify_Export TAO_Notify_Method_Request_No_Copy
 {
 public:
   /// Execute the Request
@@ -52,7 +52,7 @@ public:
  * @brief Interface for NS method Requests
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request : public ACE_Message_Block
+class TAO_Notify_Export TAO_Notify_Method_Request : public ACE_Message_Block
 {
 public:
   enum {PRIORITY_BASE = 32768};
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index 156dadf13e9..a4150de15f8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_DISPATCH_METHOD_REQUEST_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,7 +36,7 @@ typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var
                                          , const TAO_Notify_Event_var&
                                          , TAO_Notify_ProxySupplier*>  TAO_Notify_Method_Request_Dispatch_Base;
 
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch : public TAO_Notify_Method_Request_Dispatch_Base
+class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch : public TAO_Notify_Method_Request_Dispatch_Base
                                                        , public TAO_Notify_Method_Request
 {
 public:
@@ -64,7 +64,7 @@ typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event*
                                          , const TAO_Notify_Event*
                                          , TAO_Notify_ProxySupplier*>  TAO_Notify_Method_Request_Dispatch_No_Copy_Base;
 
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy : public TAO_Notify_Method_Request_Dispatch_No_Copy_Base
+class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch_No_Copy : public TAO_Notify_Method_Request_Dispatch_No_Copy_Base
                                                                  , public TAO_Notify_Method_Request_No_Copy
 {
 public:
@@ -95,7 +95,7 @@ typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var&
                                          , const TAO_Notify_Event_var&
                                          , TAO_Notify_ProxySupplier*>  TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base;
 
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy_Ex : public TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base
+class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch_No_Copy_Ex : public TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base
                                                                  , public TAO_Notify_Method_Request_No_Copy
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
index 961db8c576b..9deef7494eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
index 2703fef2955..4405bcf25d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_METHOD_REQUEST_EVENT_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,7 +27,7 @@
  * @brief A method request for storing events.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Event : public TAO_Notify_Method_Request
+class TAO_Notify_Export TAO_Notify_Method_Request_Event : public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index 42bb57b38e7..e2c29af3b0d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -13,13 +13,13 @@
 #define TAO_Notify_LOOKUP_METHOD_REQUEST_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 #include "Method_Request.h"
 #include "ProxyConsumer.h"
 #include "Consumer_Map.h"
@@ -38,7 +38,7 @@ typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event_var
  * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup : public TAO_Notify_Method_Request_Lookup_Base
+class TAO_Notify_Export TAO_Notify_Method_Request_Lookup : public TAO_Notify_Method_Request_Lookup_Base
                                                        , public TAO_Notify_Method_Request
 {
 public:
@@ -65,7 +65,7 @@ typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event*
  * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_No_Copy : public TAO_Notify_Method_Request_Lookup_No_Copy_Base
+class TAO_Notify_Export TAO_Notify_Method_Request_Lookup_No_Copy : public TAO_Notify_Method_Request_Lookup_No_Copy_Base
                                                                , public TAO_Notify_Method_Request_No_Copy
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
index f9f830b5d3e..9f99375103e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
@@ -13,13 +13,13 @@
 #define TAO_Notify_METHOD_REQUEST_LOOKUP_T_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 #include "ProxySupplier.h"
 
 /**
@@ -29,7 +29,7 @@
  *
  */
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
+class TAO_Notify_Export TAO_Notify_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
index 2491f9c2862..3f25e988bdc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_METHOD_REQUEST_SHUTDOWN_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,7 +29,7 @@ class TAO_Notify_ThreadPool_Task;
  * @brief Shutdown message for the ThreadPool_Task
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request
+class TAO_Notify_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index 25943a091de..ed4059e674e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_METHOD_REQUEST_UPDATES_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,7 +36,7 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq
  * @brief Command Object to send updates to proxys.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base
+class TAO_Notify_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base
                                                         ,public TAO_Notify_Method_Request
 {
 public:
@@ -64,7 +64,7 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq&
  * @brief Command Object to send updates to proxys.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base
+class TAO_Notify_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base
                                                                 ,public TAO_Notify_Method_Request_No_Copy
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
index bfe4e4de89f..79ae18d313d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,7 +34,7 @@ namespace CORBA
  *
  */
 template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM>
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_T
+class TAO_Notify_Export TAO_Notify_Method_Request_Updates_T
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index efc137b0972..6d38a1e3013 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -15,15 +15,15 @@
 #define TAO_NOTIFY_CONSTRAINT_INTERPRETER_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/ETCL/ETCL_Interpreter.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/CosNotifyFilterC.h"
-#include "notify_serv_export.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterC.h"
+#include "notify_export.h"
 
 class TAO_Notify_Constraint_Visitor;
 
@@ -32,7 +32,7 @@ class TAO_Notify_Constraint_Visitor;
  *
  * @brief "ETCL" Interpreter for the Notify queries.
  */
-class TAO_Notify_Serv_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter
+class TAO_Notify_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter
 {
 public:
   // = Initialization and termination methods.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 55fe28b9c8b..2b47025061a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -1,8 +1,8 @@
 /* $Id$ */
 
 #include "Notify_Constraint_Visitors.h"
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/ETCL/ETCL_y.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h"
 #include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/DynamicAny/DynArray_i.h"
 #include "tao/DynamicAny/DynSequence_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
index 431da6aaa51..c97c326b4ed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
@@ -22,18 +22,18 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 #include "tao/Typecode.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 class TAO_ETCL_Constraint;
 class TAO_ETCL_Literal_Constraint;
 class TAO_Notify_Property_Constraint;
 
-class TAO_Notify_Serv_Export TAO_Notify_Constraint_Visitor
+class TAO_Notify_Export TAO_Notify_Constraint_Visitor
   : public TAO_ETCL_Constraint_Visitor
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
index c42ff3682a1..c178ea925d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
@@ -15,7 +15,7 @@
 #define NOTIFY_DEFAULT_CO_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,7 +28,7 @@
  *
  * Maintained for backward compatibility.
  */
-class TAO_Notify_Serv_Export TAO_Notify_Default_CO_Factory
+class TAO_Notify_Export TAO_Notify_Default_CO_Factory
 {
 public:
   /// Helper function to register the default factory into the service
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
index 42bbdb9af3c..a39f87c19b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
@@ -14,7 +14,7 @@
 #define NOTIFY_DEFAULT_COLLECTION_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,7 +27,7 @@
  *
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Default_Collection_Factory
+class TAO_Notify_Export TAO_Notify_Default_Collection_Factory
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
index 7cb29c5264a..f4372df65a8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
@@ -14,7 +14,7 @@
 #define NOTIFY_DEFAULT_EMO_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,7 +26,7 @@
  * @brief Maintained for backward compatibility.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Default_EMO_Factory
+class TAO_Notify_Export TAO_Notify_Default_EMO_Factory
 {
 public:
   /// Helper function to register the default factory into the service
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
index b80d61f9b53..d6d6bfa8583 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
@@ -14,7 +14,7 @@
 #define TAO_NOTIFY_DEFAULT_POA_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,7 +25,7 @@
  *
  * @brief Maintained for backward compatibility.
  */
-class TAO_Notify_Serv_Export TAO_Notify_Default_POA_Factory
+class TAO_Notify_Export TAO_Notify_Default_POA_Factory
 {
 public:
   /// Helper function to register the default factory into the service
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index 91278b601ca..21fdb8359bc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -13,8 +13,8 @@
 #define NOTIFY_EVENTCHANNELFACTORY_I_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "notify_serv_export.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -26,7 +26,7 @@
  * @brief Class maintained for Backward compatibility.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory_i
+class TAO_Notify_Export TAO_Notify_EventChannelFactory_i
 {
 public:
   /// Create a factory servant and activates it with the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index cf1f1044fac..216dcb9cd8c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +22,7 @@
 
 #include "tao/PortableServer/Servant_Base.h"
 
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "QoSProperties.h"
 #include "AdminProperties.h"
@@ -39,7 +39,7 @@ class TAO_Notify_Timer;
  * @brief Base Object for RT_Notify's CORBA Objects.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Object : public TAO_Notify_Refcountable
+class TAO_Notify_Export TAO_Notify_Object : public TAO_Notify_Refcountable
 {
   friend class TAO_Notify_Builder;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
index 831b0dc163d..c5ca6bcd714 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +30,7 @@
  * @brief POA Abstraction.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled
+class TAO_Notify_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled
 {
 public:
   /// Default Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index deaf6fc66ea..710dd3e1202 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -13,13 +13,13 @@
 #define TAO_Notify_PEER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 #include "EventTypeSeq.h"
 
 class TAO_Notify_Proxy;
@@ -33,7 +33,7 @@ class TAO_Notify_Peer;
  *        This object delegates its reference count to its creator proxy object.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Peer
+class TAO_Notify_Export TAO_Notify_Peer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index f9f7f9d567f..ecdfac34c9b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Properties.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 #include "tao/debug.h"
 
 #if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 4542a14bff6..5d938efd4dc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,7 +24,7 @@
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 class TAO_Notify_Factory;
 class TAO_Notify_Builder;
@@ -35,7 +35,7 @@ class TAO_Notify_Builder;
  * @brief Global properties that strategize Notify's run-time behaviour.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Properties
+class TAO_Notify_Export TAO_Notify_Properties
 {
   friend class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>;
 
@@ -136,7 +136,7 @@ protected:
 
 typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES;
 
-TAO_NOTIFY_SERV_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYNCH_MUTEX)
+TAO_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYNCH_MUTEX)
 
 #if defined (__ACE_INLINE__)
 #include "Properties.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h
index e190ce11d32..f551b53c1a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,7 +23,7 @@
 #include "tao/orbconf.h"
 #include "tao/TimeBaseC.h"
 
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 template <class LOCK, class TYPE> class ACE_Atomic_Op;
 template <class TYPE> class TAO_Notify_Property_T;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
index ca241e7bbee..72554b0170d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -14,13 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/SString.h"
@@ -32,7 +32,7 @@
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_PropertySeq
+class TAO_Notify_Export TAO_Notify_PropertySeq
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
index a0eeef05462..71cf25ad690 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
@@ -14,13 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 class TAO_Notify_PropertySeq;
 
@@ -32,7 +32,7 @@ class TAO_Notify_PropertySeq;
  */
 /*******************************************************************************/
 
-class TAO_Notify_Serv_Export TAO_Notify_Property_Boolean
+class TAO_Notify_Export TAO_Notify_Property_Boolean
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index ff39b43a068..88362f193b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +22,7 @@
 
 #include "ace/SString.h"
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 class TAO_Notify_PropertySeq;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index 59a4c347909..6a3bd3f04ad 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,7 +35,7 @@ class TAO_Notify_Peer;
  * @brief Base class proxy for all proxys in NS.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Proxy : public virtual TAO_Notify_Object
+class TAO_Notify_Export TAO_Notify_Proxy : public virtual TAO_Notify_Object
 {
   friend class TAO_Notify_Peer;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 349c9c7b150..523c572b0a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #include "ace/Auto_Ptr.h"
 
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 
 #include "Refcountable_Guard_T.h"
 #include "Event.h"
@@ -38,7 +38,7 @@ class TAO_Notify_Supplier;
  * @brief Base class for all types of ProxyConsumer implementations.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy
+class TAO_Notify_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index 6524ce1c0ab..051b7cf9af1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +30,7 @@
  *
  */
 template <class SERVANT_TYPE>
-class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T 
+class TAO_Notify_Export TAO_Notify_ProxyConsumer_T 
   : public virtual TAO_Notify_Proxy_T <SERVANT_TYPE>, 
     public virtual TAO_Notify_ProxyConsumer
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index 272c9c3f1ea..641aab7f7b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_PROXYSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +22,7 @@
 #include "Event.h"
 #include "Proxy.h"
 #include "Refcountable_Guard_T.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 
 class TAO_Notify_Consumer;
 class TAO_Notify_ConsumerAdmin;
@@ -33,7 +33,7 @@ class TAO_Notify_ConsumerAdmin;
  * @brief Base class for all the ProxySuppliers.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notify_Proxy
+class TAO_Notify_Export TAO_Notify_ProxySupplier : public virtual TAO_Notify_Proxy
 {
   friend class TAO_Notify_Consumer;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index ba545f61ff5..06068e72619 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_PROXYSUPPLIER_T_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index 7a2726c251c..2ff51b1b7ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -125,21 +125,21 @@ public:
 };
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_Proxy_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_Proxy_T<POA_Event_Forwarder::ProxyPushSupplier>;
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushSupplier>;
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>;
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>;
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::ProxyPushConsumer>;
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
index ba418a24cca..a4bbde9d275 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,7 +31,7 @@
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_QoSProperties : public TAO_Notify_PropertySeq
+class TAO_Notify_Export TAO_Notify_QoSProperties : public TAO_Notify_PropertySeq
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index ecbcb9a205d..3850565c129 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -7,7 +7,7 @@
 #include "ETCL_FilterFactory.h"
 #include "RT_POA_Helper.h"
 #include "Properties.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 #include "Object.h"
 
 #if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 4a507f456f7..6c049c0713e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -3,7 +3,7 @@
 #include "RT_POA_Helper.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/debug.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 #include "RT_Properties.h"
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index 24b3491f52c..85bcdecd998 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "POA_Helper.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 /**
  * @class TAO_Notify_RT_POA_Helper
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index f0b9451f074..efa23ea9ecd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,7 +31,7 @@ class TAO_Notify_Timer_Reactor;
  * @brief A reactive worker task. Simply executes the command in the caller's context.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task : public TAO_Notify_Worker_Task
+class TAO_Notify_Export TAO_Notify_Reactive_Task : public TAO_Notify_Worker_Task
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index bd8a7d5423c..696d491e724 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,7 +31,7 @@
  * @brief Thread-safe refounting, calls the <release> method when refcount falls to 0.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Refcountable
+class TAO_Notify_Export TAO_Notify_Refcountable
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
index ac1af0f4323..4c7143bbb11 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index 8c0f1949151..356bbde952f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -13,14 +13,14 @@
 #define TAO_Notify_SEQ_WORKER_T_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 #include "Container_T.h"
 
 /**
@@ -30,7 +30,7 @@
  *
  */
 template <class TYPE>
-class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T : public TAO_ESF_Worker<TYPE>
+class TAO_Notify_Export TAO_Notify_Seq_Worker_T : public TAO_ESF_Worker<TYPE>
 {
   typedef TAO_Notify_Container_T<TYPE> CONTAINER;
   typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
index b49b367c654..e0b582a537b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
@@ -28,7 +28,7 @@
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Batch_Buffering_Strategy : public TAO_Notify_Buffering_Strategy
+class TAO_Notify_Export TAO_Notify_Batch_Buffering_Strategy : public TAO_Notify_Buffering_Strategy
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index b6d77b5d187..21e6c057798 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 #include "../ProxyConsumer_T.h"
 
@@ -37,7 +37,7 @@
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushConsumer
+class TAO_Notify_Export TAO_Notify_SequenceProxyPushConsumer
   : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>
 {
   friend class TAO_Notify_Builder;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 0e34de6a20b..640e8a0f1b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 #include "../ProxySupplier_T.h"
 
@@ -32,7 +32,7 @@
 #endif /* _MSC_VER */
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
@@ -43,7 +43,7 @@ TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
  *
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushSupplier
+class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier
   : public virtual TAO_Notify_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
 {
   friend class TAO_Notify_Builder;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index 6cbe894caa3..297d35f5b80 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -38,7 +38,7 @@ class TAO_Notify_Timer;
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_SequencePushConsumer : public ACE_Event_Handler, public TAO_Notify_Consumer
+class TAO_Notify_Export TAO_Notify_SequencePushConsumer : public ACE_Event_Handler, public TAO_Notify_Consumer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index a74f32fe500..ef22534d68a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "../Supplier.h"
 
 class TAO_Notify_ProxyConsumer;
@@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer;
  * @brief Wrapper for the SequencePushSupplier that connect to the EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_SequencePushSupplier : public TAO_Notify_Supplier
+class TAO_Notify_Export TAO_Notify_SequencePushSupplier : public TAO_Notify_Supplier
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index 06881c5b999..06536f80d13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_SERVICE_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +22,7 @@
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 #include "tao/PortableServer/PortableServer.h"
 
 /**
@@ -33,7 +33,7 @@
  *        Note that a Service creates only 1 Factory object.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Service : public ACE_Service_Object
+class TAO_Notify_Export TAO_Notify_Service : public ACE_Service_Object
 {
 public:
   /// Define Service_Object method otherwise SunCC compiler complains.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index d6edc36aa28..c964fdc8937 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -20,7 +20,7 @@
 
 #include "../Event.h"
 #include "../EventType.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 /**
  * @class TAO_Notify_StructuredEvent_No_Copy
@@ -29,7 +29,7 @@
  *
  */
 
-class TAO_Notify_Serv_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event
+class TAO_Notify_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event
 {
 public:
   /// Constuctor
@@ -80,7 +80,7 @@ protected:
  * @brief StructuredEvent implementation.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_StructuredEvent : public TAO_Notify_StructuredEvent_No_Copy
+class TAO_Notify_Export TAO_Notify_StructuredEvent : public TAO_Notify_StructuredEvent_No_Copy
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 4d12ce3a297..143f1d5bd03 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 #include "../ProxyConsumer_T.h"
 
@@ -37,7 +37,7 @@
  * @brief CosNotifyChannelAdmin::StructuredProxyPushConsumer implementation.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer
+class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer
   : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
 {
   friend class TAO_Notify_Builder;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index b308766a4ce..d71db430726 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -20,8 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/Event_ForwarderS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_ForwarderS.h"
 
 #include "../ProxySupplier_T.h"
 
@@ -33,7 +33,7 @@
 #endif /* _MSC_VER */
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Notify_Serv_Export
+template class TAO_Notify_Export
 TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
@@ -44,7 +44,7 @@ TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
  *
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushSupplier
+class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier
   : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
 {
   friend class TAO_Notify_Builder;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index 1dca5c25440..36f6f7f8096 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "../Consumer.h"
 
 class TAO_Notify_ProxySupplier;
@@ -30,7 +30,7 @@ class TAO_Notify_ProxySupplier;
  * @brief Wrapper for the StructuredPushConsumer that connect to the EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_StructuredPushConsumer : public TAO_Notify_Consumer
+class TAO_Notify_Export TAO_Notify_StructuredPushConsumer : public TAO_Notify_Consumer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index f2329db3542..65e95c3d175 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "../Supplier.h"
 
 class TAO_Notify_ProxyConsumer;
@@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer;
  * @brief Wrapper for the StructuredPushSupplier that connect to the EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_StructuredPushSupplier : public TAO_Notify_Supplier
+class TAO_Notify_Export TAO_Notify_StructuredPushSupplier : public TAO_Notify_Supplier
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
index 4c8813d5055..5763746a3c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
@@ -13,14 +13,14 @@
 #define TAO_SUBSCRIPTION_CHANGE_WORKER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotificationC.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
 
 class TAO_Notify_Proxy;
 
@@ -30,7 +30,7 @@ class TAO_Notify_Proxy;
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Subscription_Change_Worker : public TAO_ESF_Worker<TAO_Notify_Proxy>
+class TAO_Notify_Export TAO_Notify_Subscription_Change_Worker : public TAO_ESF_Worker<TAO_Notify_Proxy>
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
index 5a2d12d05f0..8494f431b98 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_SUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,7 +21,7 @@
 
 #include "Peer.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 class TAO_Notify_ProxyConsumer;
 
 /**
@@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer;
  * @brief Base Wrappers for Suppliers that connect to the EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Supplier : public TAO_Notify_Peer
+class TAO_Notify_Export TAO_Notify_Supplier : public TAO_Notify_Peer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 37823207801..5df0e4487eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (RT_Notify,
            TAO_Notify_SupplierAdmin, 
            "$Id$")
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "Builder.h"
 #include "Proxy.h"
 #include "EventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index bb1233eeae0..c9ae1a3ff5d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -14,13 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/NotifyExtS.h"
+#include "orbsvcs/orbsvcs/NotifyExtS.h"
 
 #include "Admin.h"
 
@@ -37,7 +37,7 @@
  * @brief Implementation of CosNotifyChannelAdmin::SupplierAdmin
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin 
+class TAO_Notify_Export TAO_Notify_SupplierAdmin 
   : public virtual POA_NotifyExt::SupplierAdmin, 
     public virtual TAO_Notify_Admin
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
index 609f419193a..d34b04ec8f3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_SUPPLIER_MAP_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index c2f41442f98..11572744df0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,7 +36,7 @@ class TAO_Notify_Timer_Queue;
  * @brief Implements a Thread Pool Worker Task.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, public ACE_Task<ACE_NULL_SYNCH>
+class TAO_Notify_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, public ACE_Task<ACE_NULL_SYNCH>
 {
   friend class TAO_Notify_Method_Request_Shutdown;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
index 502bc9724ec..bee6d611f8a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_TIMER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +30,7 @@ class ACE_Event_Handler;
  * @brief Interface for scheduling timers.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Timer : public TAO_Notify_Refcountable
+class TAO_Notify_Export TAO_Notify_Timer : public TAO_Notify_Refcountable
 {
 public:
   /// Destructor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
index 17410fdfd4a..d080e94ea38 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_TIMER_QUEUE_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,7 +31,7 @@
  * @brief ACE_Timer_Queue based timer.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer
+class TAO_Notify_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
index 0ec20ac850e..01fa5803054 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_TIMER_REACTOR_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,7 +29,7 @@ class ACE_Reactor;
  * @brief Reactor::instance based timer. The timers are dispatched by the main thread.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer
+class TAO_Notify_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index 394e3651059..bd6722bc464 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,7 +37,7 @@ class TAO_Notify_Buffering_Strategy;
  * the <shutdown> method should be called to release memory.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable
+class TAO_Notify_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index 4a02b0f3e09..e81eab1b0c3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba {
+project(PortableGroup) : orbsvcslib, core, naming, iormanip, minimum_corba {
   sharedname   = TAO_PortableGroup
-  idlflags    += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h
+  idlflags    += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h
   dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL
   tagchecks   += PortableGroup
   after       += FTORB_Utils
@@ -27,7 +27,4 @@ project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_
       PortableGroup
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index da03189be1b..eaa82e6fa23 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -16,7 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index 3f9ae599e2b..ec531c6db41 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -31,7 +31,7 @@ namespace TAO
 /////////////////////////////////
 // Includes needed by this header
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
index ff2033929ff..383c2d212eb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
@@ -24,7 +24,7 @@
 
 #include "PG_Factory_Set.h"
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
index 3bca619031f..f02e4ef24d7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #include "ace/Array_Base.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 8123d3d3828..2f9cd627c70 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -25,7 +25,7 @@
 #include "PG_Factory_Map.h"
 #include "portablegroup_export.h"
 #include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "ace/Null_Mutex.h"
 
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 46a592332ce..a4ed36858b7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -13,9 +13,9 @@
 #include "PG_Group_Factory.h"
 #include "PG_Property_Utils.h"
 #include "PG_conf.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "PG_Object_Group.h"
-#include <orbsvcs/PortableGroup/PG_Utils.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h>
 
 ACE_RCSID (PortableGroup,
            PG_Group_Factory,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index e5b47d0434c..5ee17c6fe25 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -24,7 +24,7 @@
 #include "ace/Hash_Map_Manager.h"
 #include "portablegroup_export.h"
 #include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "PG_Object_Group_Manipulator.h"
 
 //////////////////
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
index 224daf9c011..afeb6b0f0e3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
@@ -24,7 +24,7 @@
 
 #include "PG_Operators.h"
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
index 105ef25e6db..e79eee61713 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "ace/ACE.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
index 6786897aa0f..803c91fef12 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
@@ -25,7 +25,7 @@
 #include "PG_Location_Hash.h"
 #include "PG_Location_Equal_To.h"
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #include "ace/Array_Base.h"
 #include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
index 919c58f7ca5..b0946aee165 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "ace/Unbounded_Set.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
index 573430ccf66..ca507057adb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
@@ -16,7 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index 962a9a1232a..8a3610bf7b4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
index b754df541a2..0f43e24cfb6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
@@ -24,7 +24,7 @@
 
 #include "PG_MemberInfo.h"
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #include "tao/PortableServer/Key_Adapters.h"
 #include "tao/PortableServer/PortableServerC.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index cd3af12150b..80cebd62071 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -558,7 +558,7 @@ TAO::PG_Object_Group::locations_of_members (ACE_ENV_SINGLE_ARG_DECL)
   size_t pos = 0;
   for (MemberMap_Iterator it = this->members_.begin();
       it != this->members_.end();
-      ++it)
+      this->members_.begin())
   {
     const PortableGroup::Location & location = (*it).ext_id_;
     PortableGroup::Location & out = (*result)[pos];
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 1dd180acf08..fd15c9ed07a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -33,7 +33,7 @@
 #include "PG_Location_Hash.h"
 #include "PG_Location_Equal_To.h"
 #include "PG_Object_Group_Manipulator.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/ACE.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
index 0dcd056438c..3efa0733b9b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
@@ -15,7 +15,7 @@
 #define TAO_PG_OBJECT_GROUP_MANIPULATOR_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
index 881c5330403..955edabcb44 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
@@ -23,7 +23,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 /// Global CosNaming::Name equality operator.
 /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
index d171ec5590a..a44f8f08cf3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -19,8 +19,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroupS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "portablegroup_export.h"
 
 #include "ace/Vector_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 3d49398a974..bcb172e10ed 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -24,7 +24,7 @@
 
 #include "PG_Default_Property_Validator.h"
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
 
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index ebfdf10f3d1..df3ef19c8bd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -21,8 +21,8 @@
 #include /**/ "ace/pre.h"
 
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
index ca02b71a413..f92ee4608d3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 
 namespace TAO_PG
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
index f919cbbbba6..e06cb37338a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLEGROUP_UTILS_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
index dcb0e3d5a5e..cb517a5b7fb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
@@ -22,7 +22,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #ifndef TAO_PG_MAX_OBJECT_GROUPS  // @@ why create arbitrary limits?
 /// The maximum number of object groups to be managed by the
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
index f1bb0a0dadf..a5468f224ab 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
@@ -23,7 +23,7 @@
 
 #include "portablegroup_export.h"
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 // Forward references
 class PortableGroup_Request_Dispatcher;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 234c493816d..f632dcd0e42 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -4,11 +4,10 @@
 
 #include "PortableGroup_Loader.h"
 #include "PortableGroup_ORBInitializer.h"
-#include "ace/Dynamic_Service.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_Loader,
+ACE_RCSID (PortableGroup, 
+           PortableGroup_Loader, 
            "$Id$")
 
 TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void)
@@ -20,6 +19,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
                                 char* /*argv*/ [])
 {
   ACE_TRACE ("TAO_PortableGroup_Loader::init");
+
   // Register the ORB initializer.
   ACE_TRY_NEW_ENV
     {
@@ -56,17 +56,10 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
 int
 TAO_PortableGroup_Loader::Initializer (void)
 {
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_PortableGroup_Loader);
-  TAO_PortableGroup_Loader *tmp =
-    ACE_Dynamic_Service<TAO_PortableGroup_Loader>::instance (
-      "PortableGroup_Loader");
+  ACE_Service_Config::static_svcs ()->
+    insert (&ace_svc_desc_TAO_PortableGroup_Loader);
 
-  if (tmp != 0)
-    {
-      return tmp->init (0, 0);
-    }
-
-  return -1;
+  return 0;
 }
 
 ACE_STATIC_SVC_DEFINE (TAO_PortableGroup_Loader,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index e98a74c367d..53defa5a3b8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -23,7 +23,7 @@
 #include "ace/Hash_Map_Manager_T.h"
 
 #include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #include "tao/Object_KeyC.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 870c1dd57e4..4f050964da1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -145,14 +145,10 @@ TAO_UIPMC_Connection_Handler::open (void*)
                  this->local_addr_.get_port_number ()));
   }
 
+  // Set the id in the transport now that we're active.
+  this->transport ()->id ((size_t) this->udp_socket_.get_handle ());
   this->using_mcast_ = 0;
 
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->udp_socket_.get_handle ()))
-    return -1;
-
   return 0;
 }
 
@@ -191,7 +187,16 @@ TAO_UIPMC_Connection_Handler::close_connection (void)
 int
 TAO_UIPMC_Connection_Handler::handle_input (ACE_HANDLE h)
 {
-  return this->handle_input_eh (h, this);
+  int result =
+    this->handle_input_eh (h, this);
+
+  if (result == -1)
+    {
+      this->close_connection ();
+      return 0;
+    }
+
+  return result;
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index efd15ccd74f..52e225f76a3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -15,7 +15,8 @@
 #include "UIPMC_Profile.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (tao,
+ACE_RCSID (tao, 
+
            UIPMC_Connector, "$Id$")
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -24,9 +25,9 @@ template class ACE_NonBlocking_Connect_Handler<TAO_UIPMC_Connection_Handler>;
 
 template class ACE_Map_Entry<ACE_INET_Addr,
                              TAO_UIPMC_Connection_Handler *>;
-template class ACE_Hash_Map_Iterator_Base_Ex <ACE_INET_Addr,
+template class ACE_Hash_Map_Iterator_Base_Ex <ACE_INET_Addr, 
                                               TAO_UIPMC_Connection_Handler *,
-                                              ACE_Hash<ACE_INET_Addr>,
+                                              ACE_Hash<ACE_INET_Addr>, 
                                               ACE_Equal_To <ACE_INET_Addr>,
                                               ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr,
@@ -173,7 +174,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *,
 
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) UIPMC_Connector::make_connection, ")
+                    ACE_TEXT ("(%P|%t) UIPMC_Connector::connect - ")
                     ACE_TEXT ("new connection on HANDLE %d\n"),
                     svc_handler->get_handle ()));
    }
@@ -260,26 +261,17 @@ TAO_UIPMC_Connector::init_uipmc_properties (void)
   return 0;
 }
 
-int
-TAO_UIPMC_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  ACE_UNUSED_ARG(svc_handler);
-
-  // Noop
-  return 0;
-}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash <ACE_INET_Addr>;
 template class ACE_Equal_To <ACE_INET_Addr>;
-template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr,
-                                       TAO_UIPMC_Connection_Handler *,
-                                       ACE_Hash <ACE_INET_Addr>,
-                                       ACE_Equal_To <ACE_INET_Addr>,
+template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, 
+                                       TAO_UIPMC_Connection_Handler *, 
+                                       ACE_Hash <ACE_INET_Addr>, 
+                                       ACE_Equal_To <ACE_INET_Addr>, 
                                        ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_INET_Addr,
+template class ACE_Hash_Map_Entry<ACE_INET_Addr, 
                                   TAO_UIPMC_Connection_Handler *>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -288,7 +280,7 @@ template class ACE_Hash_Map_Entry<ACE_INET_Addr,
 #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, \
                                             TAO_UIPMC_Connection_Handler *, \
                                             ACE_Hash <ACE_INET_Addr>, \
-                                            ACE_Equal_To <ACE_INET_Addr>,
+                                            ACE_Equal_To <ACE_INET_Addr>, 
                                             ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, \
                                        TAO_UIPMC_Connection_Handler *>
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index 1a61217fe5f..b51a33166ad 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -74,8 +74,6 @@ protected:
   /// initialize <uipmc_properties_>.
   int init_uipmc_properties (void);
 
-  /// Cancel the passed cvs handler from the connector
-  virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
 protected:
 
@@ -89,14 +87,14 @@ private:
                             TAO_UIPMC_Connection_Handler *,
                             ACE_Hash < ACE_INET_Addr >,
                             ACE_Equal_To < ACE_INET_Addr >,
-                            ACE_Null_Mutex >
+                            ACE_Null_Mutex > 
     svc_handler_table_;
 
   typedef ACE_Hash_Map_Iterator_Ex < ACE_INET_Addr,
                                      TAO_UIPMC_Connection_Handler *,
                                      ACE_Hash < ACE_INET_Addr >,
                                      ACE_Equal_To < ACE_INET_Addr >,
-                                     ACE_Null_Mutex >
+                                     ACE_Null_Mutex > 
     SvcHandlerIterator;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index ecd5b159eff..e86dd663778 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -12,8 +12,8 @@
 #include "tao/target_specification.h"
 #include "ace/os_include/os_ctype.h"
 
-#include "orbsvcs/miopC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/miopC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 ACE_RCSID (PortableGroup,
            UIPMC_Profile,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index d36affa5d6a..718e2189352 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -26,7 +26,7 @@
 #include "tao/Object_KeyC.h"
 #include "tao/target_specification.h"
 
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #include "UIPMC_Endpoint.h"
 #include "portablegroup_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index c8345528754..660ff9e4a0a 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 0c9b289bb2b..b1b8db89c92 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Property/property_export.h"
+#include "orbsvcs/orbsvcs/Property/property_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosPropertyServiceS.h"
+#include "orbsvcs/orbsvcs/CosPropertyServiceS.h"
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Property/Makefile.am b/TAO/orbsvcs/orbsvcs/Property/Makefile.am
new file mode 100644
index 00000000000..b8235d16383
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Property/Makefile.am
@@ -0,0 +1,34 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Property Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Property.la
+
+libTAO_Property_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Property_la_SOURCES = \
+        CosPropertyService_i.cpp
+
+noinst_HEADERS = \
+        CosPropertyService_i.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
index f7f6b360f08..25a5b715b5e 100644
--- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
@@ -3,7 +3,7 @@
 
 project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, rtportableserver {
   sharedname   = TAO_RTCORBAEvent
-  idlflags    += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=orbsvcs/naming_export.h
+  idlflags    += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h
   dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL
   tagchecks   += RTCORBAEvent
 
@@ -16,7 +16,4 @@ project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, rtportableserver {
       Event/EC_RTCORBA_Factory.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
index 7f085c71104..6dc0951b364 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
@@ -1,9 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors {
+project(RTCosScheduling) : orbsvcslib, rtportableserver {
+  requires     += interceptors
   sharedname    = TAO_RTCosScheduling
-  idlflags     += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h
+  idlflags     += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h
   dynamicflags += TAO_RTCOSSCHEDULING_BUILD_DLL
   tagchecks    += RTCosScheduling
   
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
index dd082d74960..927ea184ddb 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
@@ -40,8 +40,8 @@
 #endif /* _MSC_VER */
 
 #include "ace/SString.h"
-#include <orbsvcs/RTCosSchedulingC.h>
-#include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
+#include <orbsvcs/orbsvcs/RTCosSchedulingC.h>
+#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/RTCORBA/Linear_Priority_Mapping.h"
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index e14252adbee..68736e46743 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -28,8 +28,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include <orbsvcs/RTCosSchedulingS.h>
-#include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
+#include <orbsvcs/orbsvcs/RTCosSchedulingS.h>
+#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
 #include "RTCosScheduling_PCP_Manager.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index d6db88b80d5..4c16b6563c9 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -3,7 +3,7 @@
 
 project(RTEvent) : orbsvcslib, core, svc_utils, messaging {
   sharedname   = TAO_RTEvent
-  idlflags    += -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h
+  idlflags    += -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h
   dynamicflags = TAO_RTEVENT_BUILD_DLL
   tagchecks   += RTEvent
   // Add this include path for precompiled headers
@@ -98,7 +98,4 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging {
       Event/EC_UDP_Admin.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index 3f21416f2b1..4db6a0244fd 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin_serv {
+project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin {
   sharedname   = TAO_RTEventLogAdmin
-  idlflags    += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h
+  idlflags    += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=Log/rteventlog_export.h
   dynamicflags = TAO_RTEVENTLOG_BUILD_DLL
   tagchecks   += RTEventLog
 
@@ -21,7 +21,4 @@ project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin_serv
       Log/RTEventLogNotification.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
index 65cc129d41c..05c798afe81 100644
--- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
@@ -18,7 +18,4 @@ project(RTKokyuEvent) : orbsvcslib, core, rtevent, rtsched, kokyu {
       Event/EC_Kokyu_Scheduling.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
index 8404a01fe2d..5dc01d0f008 100644
--- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
@@ -25,9 +25,6 @@ project(RTOLDEvent) : orbsvcslib, core, rtevent, rtsched {
     }
   }
 
-  Template_Files {
-  }
-
   // Since the resource file for RTOLDEvent does
   // not match the project name, we must explicitly list it.
   Resource_Files {
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index ef34a2ec2a6..10d1a12c805 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils {
+project(RTSched) : orbsvcslib, core, naming {
   sharedname   = TAO_RTSched
-  idlflags    += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h
+  idlflags    += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h
   dynamicflags = TAO_RTSCHED_BUILD_DLL
   tagchecks   += Sched
 
@@ -22,9 +22,6 @@ project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils {
     }
   }
 
-  Template_Files {
-  }
-
   // To avoid picking up RTSchedEvent.rc as well, explicitly list the files.
   Resource_Files {
     RTSched.rc
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
index d9573d62649..9772d7c9422 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
@@ -19,7 +19,4 @@ project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched {
       Event/EC_Sched_Filter_Builder.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
index fe038ea6723..fb309aff484 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv {
+project(RT_Notification) : orbsvcslib, core, svc_utils, dynamicany, rtcorba, notification {
   sharedname   = TAO_RT_Notification
-  idlflags    += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h
+  idlflags    += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=Notify/rt_notify_export.h
   dynamicflags = TAO_RT_NOTIFY_BUILD_DLL
   tagchecks   += RT_Notify
 
@@ -20,7 +20,4 @@ project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv {
       Notify/Structured/RT_StructuredProxyPushSupplier.cpp
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 1d8f66b8315..5f6507cdb91 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Runtime_Scheduler.i"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (orbsvcs,
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 18243c7d367..6c2430af091 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -18,9 +18,9 @@
 #define ACE_RUNTIME_SCHEDULER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/Sched/sched_export.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Sched/sched_export.h"
 
 class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Scheduler
 {
@@ -280,7 +280,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Runtime_Scheduler.i"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index 77799e6f58d..35e300730f6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -1,10 +1,10 @@
 // -*- MPC -*-
-//
 // $Id$
 
-project(SSLIOP) : orbsvcslib, core, security, ssl, interceptors {
+project(SSLIOP) : orbsvcslib, core, security, ssl {
+  requires    += interceptors
   sharedname   = TAO_SSLIOP
-  idlflags    += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h
+  idlflags    += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h
   dynamicflags = TAO_SSLIOP_BUILD_DLL
   tagchecks   += SSLIOP
   pch_header   =
@@ -17,10 +17,8 @@ project(SSLIOP) : orbsvcslib, core, security, ssl, interceptors {
   Source_Files(ORBSVCS_COMPONENTS) {
     SSLIOP {
       SSLIOPC.cpp
+      SSLIOPS.cpp
       SSLIOP
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index d4da8a87a43..5ea0b77669f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -24,7 +24,7 @@
 
 #include "SSLIOP_Current.h"
 
-#include "orbsvcs/SSLIOPC.h"
+#include "orbsvcs/orbsvcs/SSLIOPC.h"
 #include "tao/IIOP_Connection_Handler.h"
 
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index b2c65d931e1..a13d41276d7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -10,7 +10,6 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Connect_Strategy.h"
 #include "tao/Wait_Strategy.h"
-#include "tao/Profile_Transport_Resolver.h"
 
 #include "ace/Strategies_T.h"
 
@@ -126,7 +125,7 @@ TAO::IIOP_SSL_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) IIOP_SSL connection failed.\n")
+                      ACE_TEXT ("TAO (%P|%t) IIOP connection failed.\n")
                       ACE_TEXT ("TAO (%P|%t) This is most likely ")
                       ACE_TEXT ("due to a hostname lookup ")
                       ACE_TEXT ("failure.\n")));
@@ -140,7 +139,7 @@ TAO::IIOP_SSL_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 
 TAO_Transport *
 TAO::IIOP_SSL_Connector::make_connection (
-  TAO::Profile_Transport_Resolver *r,
+  TAO::Profile_Transport_Resolver *,
   TAO_Transport_Descriptor_Interface &desc,
   ACE_Time_Value *max_wait_time)
 {
@@ -164,16 +163,6 @@ TAO::IIOP_SSL_Connector::make_connection (
   this->active_connect_strategy_->synch_options (max_wait_time,
                                                  synch_options);
 
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked ())
-    {
-      synch_options.timeout (ACE_Time_Value::zero);
-      max_wait_time = &tmp_zero;
-    }
-
-
   IIOP_SSL_Connection_Handler *svc_handler = 0;
 
   // Connect.
@@ -200,45 +189,97 @@ TAO::IIOP_SSL_Connector::make_connection (
   // another thread pick up the completion and potentially deletes the
   // handler before we get a chance to increment the reference count.
 
-  // Make sure that we always do a remove_reference
-  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
+  // No immediate result.  Wait for completion.
+  if (result == -1 && errno == EWOULDBLOCK)
+    {
+      if (TAO_debug_level)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - IIOP_SSL_Connector::make_connection(), "
+                    "going to wait for connection completion on local"
+                    "handle [%d]\n",
+                    svc_handler->get_handle ()));
+
+      // Wait for connection completion.  No need to specify timeout
+      // to wait() since the correct timeout was passed to the
+      // Connector. The Connector will close the handler in the case
+      // of timeouts, so the event will complete (either success or
+      // failure) within timeout.
+      result =
+        this->active_connect_strategy_->wait (svc_handler,
+                                              0);
+
+      if (TAO_debug_level > 2)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - IIOP_SSL_Connector::make_connection(), "
+                      "wait done for handle[%d], result = %d\n",
+                      svc_handler->get_handle (), result));
+        }
 
-  TAO_Transport *transport =
-    svc_handler->transport ();
+      // There are three possibilities when wait() returns: (a)
+      // connection succeeded; (b) connection failed; (c) wait()
+      // failed because of some other error.  It is easy to deal with
+      // (a) and (b).  (c) is tricky since the connection is still
+      // pending and may get completed by some other thread.  The
+      // following code deals with (c).
 
-  if (result == -1)
-    {
-      // No immediate result, wait for completion
-      if (errno == EWOULDBLOCK)
+      // Check if the handler has been closed.
+      int closed =
+        svc_handler->is_closed ();
+
+      // In case of failures and close() has not be called.
+      if (result == -1 &&
+          !closed)
         {
-          // Try to wait until connection completion. Incase we block, then we
-          // get a connected transport or not. In case of non block we get
-          // a connected or not connected transport
-          if (!this->wait_for_connection_completion (r,
-                                                     transport,
-                                                     max_wait_time))
+          // First, cancel from connector.
+          this->base_connector_.cancel (svc_handler);
+
+          // Double check to make sure the handler has not been closed
+          // yet.  This double check is required to ensure that the
+          // connection handler was not closed yet by some other
+          // thread since it was still registered with the connector.
+          // Once connector.cancel() has been processed, we are
+          // assured that the connector will no longer open/close this
+          // handler.
+          closed =
+            svc_handler->is_closed ();
+
+          // If closed, there is nothing to do here.  If not closed,
+          // it was either opened or is still pending.
+          if (!closed)
             {
-              if (TAO_debug_level > 2)
-                ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_SSL_Connector::"
-                                      "make_connection, "
-                                      "wait for completion failed\n"));
+              // Check if the handler has been opened.
+              int open =
+                svc_handler->is_open ();
+
+              // Some other thread was able to open the handler even
+              // though wait failed for this thread.
+              if (open)
+                // Overwrite <result>.
+                result = 0;
+              else
+                {
+                  // Assert that it is still connecting.
+                  ACE_ASSERT (svc_handler->is_connecting ());
+
+                  // Force close the handler now.
+                  svc_handler->close ();
+                }
             }
         }
-      else
-        {
-          // Transport is not usable
-          transport = 0;
-        }
     }
 
-  // In case of errors transport is zero
-  if (transport == 0)
+  // Irrespective of success or failure, remove the extra #REFCOUNT#.
+  svc_handler->remove_reference ();
+
+  // In case of errors.
+  if (result == -1)
     {
       // Give users a clue to the problem.
       if (TAO_debug_level)
         {
           ACE_DEBUG ((LM_ERROR,
-                      "TAO (%P|%t) - IIOP_SSL_Connector::make_connection, "
+                      "TAO (%P|%t) - IIOP_Connector::make_connection, "
                       "connection to <%s:%d> failed (%p)\n",
                       iiop_endpoint->host (), iiop_endpoint->port (),
                       "errno"));
@@ -251,11 +292,14 @@ TAO::IIOP_SSL_Connector::make_connection (
   // #REFCOUNT# is one.
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - IIOP_SSL_Connector::make_connection, "
+                "TAO (%P|%t) - IIOP_Connector::make_connection, "
                 "new connection to <%s:%d> on Transport[%d]\n",
                 iiop_endpoint->host (), iiop_endpoint->port (),
                 svc_handler->peer ().get_handle ()));
 
+  TAO_Transport *transport =
+    svc_handler->transport ();
+
   // Add the handler to Cache
   int retval =
     this->orb_core ()->lane_resources ().transport_cache ().cache_transport (
@@ -271,54 +315,36 @@ TAO::IIOP_SSL_Connector::make_connection (
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      "TAO (%P|%t) - IIOP_SSL_Connector::make_connection, "
+                      "TAO (%P|%t) - IIOP_Connector::make_connection, "
                       "could not add the new connection to cache\n"));
         }
 
       return 0;
     }
 
-  if (transport->is_connected () &&
-      transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
+  // If the wait strategy wants us to be registered with the reactor
+  // then we do so. If registeration is required and it succeeds,
+  // #REFCOUNT# becomes two.
+  retval =  transport->wait_strategy ()->register_handler ();
 
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) transport->purge_entry ();
+  // Registration failures.
+  if (retval != 0)
+    {
+      // Purge from the connection cache.
+      transport->purge_entry ();
 
       // Close the handler.
-      (void) transport->close_connection ();
+      svc_handler->close ();
 
       if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - IIOP_SSL_Connector [%d]::make_connection, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    transport->id ()));
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                      "could not register the new connection in the reactor\n"));
+        }
 
       return 0;
     }
 
   return transport;
 }
-
-int
-TAO::IIOP_SSL_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  IIOP_SSL_Connection_Handler* handler=
-    dynamic_cast<IIOP_SSL_Connection_Handler*>(svc_handler);
-
-  if (handler)
-    {
-      // Cancel from the connector
-      this->base_connector_.cancel (handler);
-
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
index ab1b6449ec6..24f4481fc61 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
@@ -81,8 +81,6 @@ namespace TAO
     TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r,
                                     TAO_Transport_Descriptor_Interface &desc,
                                     ACE_Time_Value *timeout = 0);
-
-  virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
     //@}
 
   private:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index 35c7786ddc8..b0868330068 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -30,8 +30,8 @@
 #include "SSLIOP_Connection_Handler.h"
 #include "SSLIOP_Accept_Strategy.h"
 
-#include "orbsvcs/SSLIOPC.h"  /* CSIv1 */
-#include "orbsvcs/CSIIOPC.h"  /* CSIv2 */
+#include "orbsvcs/orbsvcs/SSLIOPC.h"  /* CSIv1 */
+#include "orbsvcs/orbsvcs/CSIIOPC.h"  /* CSIv2 */
 
 namespace TAO
 {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index d22485f2af1..286959c539d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "SSLIOP_ClientCredentials.h"
-#include "SSLIOP_OwnCredentials.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -9,12 +8,8 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-TAO::SSLIOP::ClientCredentials::ClientCredentials (
-  X509 * cert,
-  EVP_PKEY *evp,
-  SSL * ssl)
-  : SSLIOP_Credentials (cert, evp),
-    ssl_ (TAO::SSLIOP::OpenSSL_traits< ::SSL >::_duplicate (ssl))
+TAO::SSLIOP::ClientCredentials::ClientCredentials (X509 *cert, EVP_PKEY *evp)
+  : TAO::SSLIOP::Credentials (cert, evp)
 {
 }
 
@@ -86,53 +81,34 @@ SecurityLevel3::OwnCredentials_ptr
 TAO::SSLIOP::ClientCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  SecurityLevel3::OwnCredentials_ptr creds =
-    SecurityLevel3::OwnCredentials::_nil ();
-
-  ACE_NEW_THROW_EX (creds,
-                    TAO::SSLIOP::OwnCredentials (
-                      ::SSL_get_certificate (this->ssl_.in ()),
-                      ::SSL_get_privatekey (this->ssl_.in ())),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (creds);
-
-  return creds;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
+                    SecurityLevel3::OwnCredentials::_nil ());
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::client_authentication (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::client_authentication (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // If the client presented no certificate (i.e. cert_.ptr() == 0),
-  // the client was not authenticated.  Otherwise, verify the peer's
-  // certificate.
-
-  return
-    this->x509_.in () != 0
-    && SSL_get_verify_result (this->ssl_.in ()) == X509_V_OK;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
 TAO::SSLIOP::ClientCredentials::target_authentication (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
 TAO::SSLIOP::ClientCredentials::confidentiality (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // TAO's SSLIOP pluggable transport always provides integrity.  Note
-  // that if we 
-
-  return true;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index 647a42edd0b..c4a1b7e7240 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -16,16 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
-#include "orbsvcs/SSLIOP/SSLIOP_SSL.h"
+#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h"
 
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 #include "tao/LocalObject.h"
 
@@ -36,7 +35,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
 namespace TAO
 {
   namespace SSLIOP
@@ -50,14 +48,12 @@ namespace TAO
      */
     class TAO_SSLIOP_Export ClientCredentials
       : public virtual SecurityLevel3::ClientCredentials,
-        public virtual SSLIOP_Credentials
+        public virtual Credentials
     {
     public:
 
       /// Constructor
-      ClientCredentials (::X509 * cert,
-                         ::EVP_PKEY * evp,
-                         ::SSL * ssl);
+      ClientCredentials (::X509 *cert, ::EVP_PKEY *evp);
 
       /**
        * @name SecurityLevel3::Credentials Methods
@@ -131,12 +127,6 @@ namespace TAO
        */
       ~ClientCredentials (void);
 
-    private:
-
-      /// Reference to the OpenSSL @c SSL data structure associated
-      /// with the current security context (e.g. SSL connection).
-      TAO::SSLIOP::SSL_var ssl_;
-
     };
 
   } // End SSLIOP namespace
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 980a4d6cf68..6660602351c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -164,11 +164,10 @@ TAO::SSLIOP::Connection_Handler::open (void *)
                   this->peer ().get_handle ()));
     }
 
-  // Set that the transport is now connected, if fails we return -1
+  // Set the id in the transport now that we're active.
   // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
+  // compilers.
+  this->transport ()->id ((size_t) this->get_handle ());
 
   // @@ Not needed
   this->state_changed (TAO_LF_Event::LFS_SUCCESS);
@@ -191,7 +190,16 @@ TAO::SSLIOP::Connection_Handler::close_connection (void)
 int
 TAO::SSLIOP::Connection_Handler::handle_input (ACE_HANDLE h)
 {
-  return this->handle_input_eh (h, this);
+  const int result =
+    this->handle_input_eh (h, this);
+
+  if (result == -1)
+    {
+      this->close_connection ();
+      return 0;
+    }
+
+  return result;
 }
 
 int
@@ -230,7 +238,9 @@ TAO::SSLIOP::Connection_Handler::handle_close (ACE_HANDLE,
 int
 TAO::SSLIOP::Connection_Handler::close (u_long)
 {
-  return this->close_handler ();
+  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
+  this->transport ()->remove_reference ();
+  return 0;
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index ba933c34608..cc2f125e75a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -4,7 +4,7 @@
 #include "SSLIOP_Util.h"
 #include "SSLIOP_X509.h"
 
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -126,7 +126,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Connector::connect, ")
+                  ACE_TEXT ("TAO (%P|%t) Connector::connect - ")
                   ACE_TEXT ("looking for SSLIOP connection.\n")));
 
   TAO_Endpoint *endpoint = desc->endpoint ();
@@ -370,7 +370,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
 
   // If the invocation wants integrity without confidentiality but the
   // server does not support "no protection," then it won't be
-  // possible to provide integrity.  In order to support integrity
+  // possible provide integrity.  In order to support integrity
   // without confidentiality, encryption must be disabled but secure
   // hashes must remain enabled.  This is achieved using the "eNULL"
   // cipher.  However, the "eNULL" cipher is only enabled on the
@@ -411,29 +411,15 @@ TAO::SSLIOP::Connector::ssliop_connect (
     {
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ")
+                    ACE_TEXT ("(%P|%t) SSLIOP_Connector::connect ")
                     ACE_TEXT ("got existing transport[%d]\n"),
                     transport->id ()));
-
-      // When the transport is not connected wait for completion
-      if (!transport->is_connected())
-        {
-          if (!this->wait_for_connection_completion (resolver,
-                                                     transport,
-                                                     max_wait_time))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect,")
-                          ACE_TEXT ("wait for completion failed\n")));
-
-            }
-        }
     }
   else
     {
       if (TAO_debug_level > 4)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ")
+                    ACE_TEXT ("(%P|%t) SSLIOP_Connector::connect ")
                     ACE_TEXT ("making a new connection \n")));
 
       // Purge connections (if necessary)
@@ -461,7 +447,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT ("TAO (%P|%t) Unable to create SSLIOP ")
+                        ACE_TEXT ("(%P|%t) Unable to create SSLIOP ")
                         ACE_TEXT ("service handler.\n")));
 
           return 0;
@@ -515,7 +501,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
           ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
         }
 
-      TAO::SSLIOP::OwnCredentials_var credentials =
+      TAO::SSLIOP::Credentials_var credentials =
         this->retrieve_credentials (resolver->stub (),
                                     svc_handler->peer ().ssl ()
                                     ACE_ENV_ARG_PARAMETER);
@@ -529,15 +515,6 @@ TAO::SSLIOP::Connector::ssliop_connect (
       this->active_connect_strategy_->synch_options (max_wait_time,
                                                      synch_options);
 
-      // If we don't need to block for a transport just set the timeout to
-      // be zero.
-      ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-      if (!resolver->blocked ())
-        {
-          synch_options.timeout (ACE_Time_Value::zero);
-          max_wait_time = &tmp_zero;
-        }
-
       // We obtain the transport in the <svc_handler> variable.  As we
       // know now that the connection is not available in Cache we can
       // make a new connection
@@ -553,39 +530,91 @@ TAO::SSLIOP::Connector::ssliop_connect (
       // the #REFCOUNT# on the handler is one since close() gets
       // called on the handler.
 
-      // Make sure that we always do a remove_reference
-      ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
+      // No immediate result.  Wait for completion.
+      if (result == -1 && errno == EWOULDBLOCK)
+        {
+          if (TAO_debug_level > 2)
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO (%P|%t) - SSLIOP_Connector::ssliop_connect(), "
+                        "going to wait for connection completion on local"
+                        "handle [%d]\n",
+                        svc_handler->get_handle ()));
+
+          // Wait for connection completion.  No need to specify timeout
+          // to wait() since the correct timeout was passed to the
+          // Connector. The Connector will close the handler in the case
+          // of timeouts, so the event will complete (either success or
+          // failure) within timeout.
+          result =
+            this->active_connect_strategy_->wait (svc_handler,
+                                                  0);
+
+          if (TAO_debug_level > 2)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "TAO (%P|%t) - IIOP_Connector::make_connection"
+                          "wait done for handle[%d], result = %d\n",
+                          svc_handler->get_handle (), result));
+            }
 
-      transport =
-        svc_handler->transport ();
+          // There are three possibilities when wait() returns: (a)
+          // connection succeeded; (b) connection failed; (c) wait()
+          // failed because of some other error.  It is easy to deal with
+          // (a) and (b).  (c) is tricky since the connection is still
+          // pending and may get completed by some other thread.  The
+          // following code deals with (c).
 
-      if (result == -1)
-        {
-          // No immediate result, wait for completion
-          if (errno == EWOULDBLOCK)
+          // Check if the handler has been closed.
+          int closed =
+            svc_handler->is_closed ();
+
+          // In case of failures and close() has not be called.
+          if (result == -1 &&
+              !closed)
             {
-              // Try to wait until connection completion. Incase we block, then we
-              // get a connected transport or not. In case of non block we get
-              // a connected or not connected transport
-              if (!this->wait_for_connection_completion (resolver,
-                                                         transport,
-                                                         max_wait_time))
+              // First, cancel from connector.
+              this->base_connector_.cancel (svc_handler);
+
+              // Double check to make sure the handler has not been closed
+              // yet.  This double check is required to ensure that the
+              // connection handler was not closed yet by some other
+              // thread since it was still registered with the connector.
+              // Once connector.cancel() has been processed, we are
+              // assured that the connector will no longer open/close this
+              // handler.
+              closed =
+                svc_handler->is_closed ();
+
+              // If closed, there is nothing to do here.  If not closed,
+              // it was either opened or is still pending.
+              if (!closed)
                 {
-                  if (TAO_debug_level > 2)
-                    ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - SSLIOP_Connector::"
-                                          "ssliop_connect, "
-                                          "wait for completion failed\n"));
+                  // Check if the handler has been opened.
+                  int open =
+                    svc_handler->is_open ();
+
+                  // Some other thread was able to open the handler even
+                  // though wait failed for this thread.
+                  if (open)
+                    // Overwrite <result>.
+                    result = 0;
+                  else
+                    {
+                      // Assert that it is still connecting.
+                      ACE_ASSERT (svc_handler->is_connecting ());
+
+                      // Force close the handler now.
+                      svc_handler->close ();
+                    }
                 }
             }
-          else
-            {
-              // Transport is not usable
-              transport = 0;
-            }
         }
 
-      // In case of errors transport is zero
-      if (transport == 0)
+      // Irrespective of success or failure, remove the extra #REFCOUNT#.
+      svc_handler->remove_reference ();
+
+      // In case of errors.
+      if (result == -1)
         {
           // Give users a clue to the problem.
           if (TAO_debug_level)
@@ -594,7 +623,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
               ssl_endpoint->addr_to_string (buffer,
                                             sizeof (buffer) - 1);
               ACE_DEBUG ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t) - SSL connection to ")
+                          ACE_TEXT ("TAO (%P|%t) %N:%l, SSL connection to ")
                           ACE_TEXT ("<%s:%d> failed (%p)\n"),
                           buffer,
                           remote_address.get_port_number (),
@@ -608,11 +637,14 @@ TAO::SSLIOP::Connector::ssliop_connect (
       // #REFCOUNT# is one.
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, "
+                    "TAO (%P|%t) - SSLIOP_Connector::ssliop_connect(): "
                     "new SSL connection to port %d on transport[%d]\n",
                     remote_address.get_port_number (),
                     svc_handler->peer ().get_handle ()));
 
+      transport =
+        svc_handler->transport ();
+
       ssl_endpoint->qop (qop);
       ssl_endpoint->trust (trust);
       ssl_endpoint->credentials (credentials.in ());
@@ -632,31 +664,34 @@ TAO::SSLIOP::Connector::ssliop_connect (
           if (TAO_debug_level > 0)
             {
               ACE_ERROR ((LM_ERROR,
-                          "TAO (%P|%t) - SLIIOP_Connector::ssliop_connect, "
+                          "TAO (%P|%t) - IIOP_Connector::make_connection, "
                           "could not add the new connection to cache\n"));
             }
 
           return 0;
         }
 
-      if (transport->is_connected () &&
-          transport->wait_strategy ()->register_handler () != 0)
-        {
-          // Registration failures.
+      // If the wait strategy wants us to be registered with the reactor
+      // then we do so. If registeration is required and it succeeds,
+      // #REFCOUNT# becomes two.
+      retval =  transport->wait_strategy ()->register_handler ();
 
-          // Purge from the connection cache, if we are not in the cache, this
-          // just does nothing.
-          (void) transport->purge_entry ();
+      // Registration failures.
+      if (retval != 0)
+        {
+          // Purge from the connection cache.
+          transport->purge_entry ();
 
           // Close the handler.
-          (void) transport->close_connection ();
+          svc_handler->close ();
 
           if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        "TAO (%P|%t) - SSLIOP_Connector [%d]::ssliop_connect, "
-                        "could not register the transport "
-                        "in the reactor.\n",
-                        transport->id ()));
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                          "could not register the new connection in the "
+                          "reactor\n"));
+            }
 
           return 0;
         }
@@ -725,12 +760,6 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
       // Use the default certificate and private key, i.e. the one set
       // in the SSL_CTX that was used when creating the SSL data
       // structure.
-      
-      /**
-       * @todo Check if the CredentialsCurator contains a default set
-       *       of SSLIOP OwnCredentials.
-       */
-
       TAO::SSLIOP::OwnCredentials_ptr & c = ssliop_credentials.out ();
       ACE_NEW_THROW_EX (c,
                         TAO::SSLIOP::OwnCredentials (
@@ -742,23 +771,3 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
 
   return ssliop_credentials._retn ();
 }
-
-int
-TAO::SSLIOP::Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  TAO::SSLIOP::Connection_Handler* handler=
-    dynamic_cast<TAO::SSLIOP::Connection_Handler*>(svc_handler);
-
-  if (handler)
-    {
-      // Cancel from the connector
-      this->base_connector_.cancel (handler);
-
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index 9a3a5ddb1a2..85e4362153c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -81,9 +81,6 @@ namespace TAO
        */
       virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
-      /// Cancel the passed cvs handler from the connector
-      virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
-
       /// IIOP-specific connection establishment.
       /**
        * @note The IIOP endpoint is extracted from the SSLIOP endpoint.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 163f86e28e6..268cc69b796 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -2,6 +2,8 @@
 
 #include "tao/ORB_Constants.h"
 
+//#include <openssl/bn.h>
+
 
 ACE_RCSID (SSLIOP,
            SSLIOP_Credentials,
@@ -13,9 +15,9 @@ ACE_RCSID (SSLIOP,
 #endif /* __ACE_INLINE__ */
 
 
-TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp)
-  : x509_ (TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (cert)),
-    evp_ (TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (evp)),
+TAO::SSLIOP::Credentials::Credentials (::X509 *cert, ::EVP_PKEY *evp)
+  : x509_ (TAO::SSLIOP::_duplicate (cert)),
+    evp_ (TAO::SSLIOP::_duplicate (evp)),
     id_ (),
     creds_usage_ (SecurityLevel3::CU_Indefinite),
     expiry_time_ (),
@@ -74,33 +76,33 @@ TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp)
     }
 }
 
-TAO::SSLIOP_Credentials::~SSLIOP_Credentials (void)
+TAO::SSLIOP::Credentials::~Credentials (void)
 {
 }
 
 char *
-TAO::SSLIOP_Credentials::creds_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::Credentials::creds_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->id_.in ());
 }
 
 SecurityLevel3::CredentialsUsage
-TAO::SSLIOP_Credentials::creds_usage (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::Credentials::creds_usage (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CU_Indefinite;
 }
 
 TimeBase::UtcT
-TAO::SSLIOP_Credentials::expiry_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::Credentials::expiry_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->expiry_time_;
 }
 
 SecurityLevel3::CredentialsState
-TAO::SSLIOP_Credentials::creds_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Credentials::creds_state (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const ::X509 *x = this->x509_.in ();
@@ -148,7 +150,7 @@ TAO::SSLIOP_Credentials::creds_state (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO::SSLIOP_Credentials::add_relinquished_listener (
+TAO::SSLIOP::Credentials::add_relinquished_listener (
     SecurityLevel3::RelinquishedCredentialsListener_ptr /* listener */
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -157,7 +159,7 @@ TAO::SSLIOP_Credentials::add_relinquished_listener (
 }
 
 void
-TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */
+TAO::SSLIOP::Credentials::remove_relinquished_listener (const char * /* id */
                                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -165,58 +167,40 @@ TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */
 }
 
 bool
-TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs)
+TAO::SSLIOP::Credentials::operator== (const TAO::SSLIOP::Credentials &rhs)
 {
-  ::X509 * xa = this->x509_.in ();
-  ::X509 * xb = rhs.x509_.in ();
+  X509 * xa = this->x509_.in ();
+  X509 * xb = rhs.x509_.in ();
   // EVP_PKEY *ea = this->evp_.in ();
   // EVP_PKEY *eb = rhs.evp_.in ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  // No need for a full blown ACE_TRY/CATCH block.
-
-  const SecurityLevel3::CredentialsType lct =
-    this->creds_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  const SecurityLevel3::CredentialsType rct =
-    const_cast<TAO::SSLIOP_Credentials &> (rhs).creds_type (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // Don't bother check the creds_id and expiry_time attributes.  They
-  // are checked implicitly by the below X509_cmp() call.
-  //
-  // Additionally, the creds_state attribute is not included in the
-  // check since it is not considered important when distinguishing
-  // between two Credentials.
-
   return
-    lct == rct
-    && this->creds_usage_ == rhs.creds_usage_
-    && ((xa == xb) || (xa != 0 && xb != 0 && ::X509_cmp (xa, xb) == 0))
+//     this->accepting_options_supported_ == rhs.accepting_options_supported_
+//     && this->accepting_options_required_ == rhs.accepting_options_required_
+//     && this->invocation_options_supported_ == rhs.invocation_options_supported_    && this->invocation_options_required_ == rhs.invocation_options_required_
+    ((xa == xb) || (xa != 0 && xb != 0 && ::X509_cmp (xa, xb) == 0))
 //     && ((ea == eb) || (ea != 0 && eb != 0 && ::EVP_PKEY_cmp (ea, eb) == 0))
     ;
 }
 
 CORBA::ULong
-TAO::SSLIOP_Credentials::hash (void) const
+TAO::SSLIOP::Credentials::hash (void) const
 {
-  ::X509 * x509 = this->x509_.in ();
+  ::X509 *x509 = this->x509_.in ();
 
   return (x509 == 0 ? 0 : ::X509_issuer_name_hash (x509));
 }
 
 TAO::SSLIOP::Credentials_ptr
-TAO::SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj
+TAO::SSLIOP::Credentials::_narrow (CORBA::Object_ptr obj
                                  ACE_ENV_ARG_DECL_NOT_USED)
 {
-  return  TAO::SSLIOP_Credentials::_duplicate (
-              dynamic_cast<TAO::SSLIOP_Credentials *> (obj));
+  return  TAO::SSLIOP::Credentials::_duplicate (
+              dynamic_cast<TAO::SSLIOP::Credentials *> (obj));
 }
 
 TAO::SSLIOP::Credentials_ptr
-TAO::SSLIOP_Credentials::_duplicate (TAO::SSLIOP::Credentials_ptr obj)
+TAO::SSLIOP::Credentials::_duplicate (TAO::SSLIOP::Credentials_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
@@ -229,7 +213,7 @@ TAO::SSLIOP_Credentials::_duplicate (TAO::SSLIOP::Credentials_ptr obj)
 TAO::SSLIOP::Credentials_ptr
 tao_TAO_SSLIOP_Credentials_duplicate (TAO::SSLIOP::Credentials_ptr p)
 {
-  return TAO::SSLIOP_Credentials::_duplicate (p);
+  return TAO::SSLIOP::Credentials::_duplicate (p);
 }
 
 void
@@ -241,35 +225,22 @@ tao_TAO_SSLIOP_Credentials_release (TAO::SSLIOP::Credentials_ptr p)
 TAO::SSLIOP::Credentials_ptr
 tao_TAO_SSLIOP_Credentials_nil (void)
 {
-  return TAO::SSLIOP_Credentials::_nil ();
+  return TAO::SSLIOP::Credentials::_nil ();
 }
 
 TAO::SSLIOP::Credentials_ptr
 tao_TAO_SSLIOP_Credentials_narrow (CORBA::Object *p
                                    ACE_ENV_ARG_DECL)
 {
-  return TAO::SSLIOP_Credentials::_narrow (p
-                                           ACE_ENV_ARG_PARAMETER);
+  return TAO::SSLIOP::Credentials::_narrow (p
+                                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
 tao_TAO_SSLIOP_Credentials_upcast (void *src)
 {
-  TAO::SSLIOP_Credentials **tmp =
-    static_cast<TAO::SSLIOP_Credentials **> (src);
+  TAO::SSLIOP::Credentials **tmp =
+    static_cast<TAO::SSLIOP::Credentials **> (src);
 
   return *tmp;
 }
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Pseudo_Var_T<TAO::SSLIOP_Credentials>;
-template class TAO_Pseudo_Out_T<TAO::SSLIOP_Credentials, TAO::SSLIOP_Credentials_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Var_T<TAO::SSLIOP_Credentials>
-# pragma instantiate TAO_Pseudo_Out_T<TAO::SSLIOP_Credentials, TAO::SSLIOP_Credentials_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index 89b27c15a62..4a53212775d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -23,43 +23,36 @@
 
 #include "SSLIOP_X509.h"
 #include "SSLIOP_EVP_PKEY.h"
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 #include "tao/LocalObject.h"
 
 namespace TAO
 {
-  class SSLIOP_Credentials;
+  namespace SSLIOP
+  {
 
-   namespace SSLIOP
-   {
-     typedef SSLIOP_Credentials* Credentials_ptr;
-     typedef TAO_Pseudo_Var_T<SSLIOP_Credentials> Credentials_var;
-     typedef TAO_Pseudo_Out_T<SSLIOP_Credentials, Credentials_var> Credentials_out;
-   }
+    class Credentials;
+    typedef Credentials* Credentials_ptr;
+    typedef TAO_Pseudo_Var_T<Credentials> Credentials_var;
+    typedef TAO_Pseudo_Out_T<Credentials, Credentials_var> Credentials_out;
 
     /**
-     * @class SSLIOP_Credentials
+     * @class Credentials
      *
      * @brief SSLIOP-specific implementation of the
      *        SecurityLevel3::Credentials interface.
      *
      * This class encapsulates the X.509 certificate associated with a
      * given a principal.
-     *
-     * @note Why is this class not the TAO::SSLIOP namespace?  Because
-     *       brain damaged MSVC++ 6 cannot call a base class
-     *       constructor of class declared in a namespace that is more
-     *       than one level deep in a sub-class base member
-     *       initializer list.
      */
-    class TAO_SSLIOP_Export SSLIOP_Credentials
+    class TAO_SSLIOP_Export Credentials
       : public virtual SecurityLevel3::Credentials,
         public virtual TAO_Local_RefCounted_Object
     {
     public:
 
       /// Constructor
-      SSLIOP_Credentials (::X509 * cert, ::EVP_PKEY * evp);
+      Credentials (::X509 * cert, ::EVP_PKEY * evp);
 
       /**
        * @name SecurityLevel3::Credentials Methods
@@ -116,19 +109,19 @@ namespace TAO
       ::EVP_PKEY *evp (void);
       //@}
 
-      bool operator== (const SSLIOP_Credentials &rhs);
+      bool operator== (const Credentials &rhs);
 
       CORBA::ULong hash (void) const;
 
       // The static operations.
-      static SSLIOP::Credentials_ptr _duplicate (SSLIOP::Credentials_ptr obj);
+      static Credentials_ptr _duplicate (Credentials_ptr obj);
 
-      static SSLIOP::Credentials_ptr _narrow (CORBA::Object_ptr obj
-                                              ACE_ENV_ARG_DECL);
+      static Credentials_ptr _narrow (CORBA::Object_ptr obj
+                                      ACE_ENV_ARG_DECL);
 
-      static SSLIOP::Credentials_ptr _nil (void)
+      static Credentials_ptr _nil (void)
       {
-        return (SSLIOP::Credentials_ptr) 0;
+        return (Credentials_ptr) 0;
       }
 
       //@}
@@ -140,17 +133,17 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting  mechanism.
        */
-      ~SSLIOP_Credentials (void);
+      ~Credentials (void);
 
     protected:
 
       /// Reference to the X.509 certificate associated with this SSLIOP
       /// Credentials object.
-      SSLIOP::X509_var x509_;
+      X509_var x509_;
 
       /// Reference to the private key associated with the X.509
       /// certificate.
-      SSLIOP::EVP_PKEY_var evp_;
+      EVP_PKEY_var evp_;
 
       /// Credentials Identifier.
       CORBA::String_var id_;
@@ -166,7 +159,7 @@ namespace TAO
 
     };
 
-//   } // End SSLIOP namespace
+  } // End SSLIOP namespace
 }   // End TAO namespace
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
index 8c353c74cff..e33e9380658 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
@@ -3,15 +3,13 @@
 // $Id$
 
 ACE_INLINE ::X509 *
-TAO::SSLIOP_Credentials::x509 (void)
+TAO::SSLIOP::Credentials::x509 (void)
 {
-  return
-    TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (this->x509_.in ());
+  return TAO::SSLIOP::_duplicate (this->x509_.in ());
 }
 
 ACE_INLINE ::EVP_PKEY *
-TAO::SSLIOP_Credentials::evp (void)
+TAO::SSLIOP::Credentials::evp (void)
 {
-  return
-    TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (this->evp_.in ());
+  return TAO::SSLIOP::_duplicate (this->evp_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 088255970f4..d2eef3da6bf 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -32,7 +32,7 @@ TAO_SSLIOP_password_callback (char *buf,
   //    what you get when you try to be overly efficient.  :-)
   //        -Ossama
 
-  const char * password = static_cast<char *> (userdata);
+  const char *password = static_cast<char *> (userdata);
 
   int pwlen = -1;
 
@@ -41,7 +41,7 @@ TAO_SSLIOP_password_callback (char *buf,
       pwlen = ACE_OS::strlen (password);
 
       int copy_len = pwlen + 1;  // Include the NULL terminator
-
+ 
       // Clear the portion of the buffer that exceeds the space that
       // will be occupied by the password.
       if (copy_len < size)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index e1d1e5778bf..4a391c83497 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -15,16 +15,16 @@
 #define TAO_SSLIOP_CREDENTIALS_ACQUIRER_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Security/SL3_CredentialsCurator.h"
+#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h"
 
-#include "orbsvcs/SSLIOPC.h"
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SSLIOPC.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
index 6918b068b0d..791dcde0da5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
@@ -16,15 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
+#include "orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
 
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 
 namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index 9b18545640b..0b458f46647 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -114,7 +114,7 @@ TAO::SSLIOP::Current::setup (TAO::SSLIOP::Current_Impl *&prev_impl,
 
 void
 TAO::SSLIOP::Current::teardown (TAO::SSLIOP::Current_Impl *prev_impl,
-                                bool &setup_done)
+                              bool &setup_done)
 {
   if (setup_done)
     {
@@ -193,13 +193,128 @@ tao_TAO_SSLIOP_Current_upcast (
   return *tmp;
 }
 
+// *************************************************************
+// Operations for class TAO::SSLIOP::Current_var
+// *************************************************************
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+TAO::SSLIOP::Current_var::Current_var (void) // default constructor
+  : ptr_ (TAO::SSLIOP::Current::_nil ())
+{
+}
+
+::TAO::SSLIOP::Current_ptr
+TAO::SSLIOP::Current_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+TAO::SSLIOP::Current_var::Current_var (
+  const ::TAO::SSLIOP::Current_var &p)
+  : TAO_Base_var (),
+    ptr_ (TAO::SSLIOP::Current::_duplicate (p.ptr ()))
+{
+}
+
+TAO::SSLIOP::Current_var::~Current_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+TAO::SSLIOP::Current_var &
+TAO::SSLIOP::Current_var::operator= (TAO::SSLIOP::Current_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO::SSLIOP::Current_var &
+TAO::SSLIOP::Current_var::operator= (const ::TAO::SSLIOP::Current_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::TAO::SSLIOP::Current::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+TAO::SSLIOP::Current_var::operator const ::TAO::SSLIOP::Current_ptr &() const
+{
+  return this->ptr_;
+}
+
+TAO::SSLIOP::Current_var::operator ::TAO::SSLIOP::Current_ptr &()
+{
+  return this->ptr_;
+}
+
+::TAO::SSLIOP::Current_ptr
+TAO::SSLIOP::Current_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::TAO::SSLIOP::Current_ptr
+TAO::SSLIOP::Current_var::in (void) const
+{
+  return this->ptr_;
+}
 
-template class TAO_Pseudo_Var_T<TAO::SSLIOP::Current>;
+::TAO::SSLIOP::Current_ptr &
+TAO::SSLIOP::Current_var::inout (void)
+{
+  return this->ptr_;
+}
 
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+::TAO::SSLIOP::Current_ptr &
+TAO::SSLIOP::Current_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO::SSLIOP::Current::_nil ();
+  return this->ptr_;
+}
 
-# pragma instantiate TAO_Pseudo_Var_T<TAO::SSLIOP::Current>
+::TAO::SSLIOP::Current_ptr
+TAO::SSLIOP::Current_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::TAO::SSLIOP::Current_ptr val = this->ptr_;
+  this->ptr_ = ::TAO::SSLIOP::Current::_nil ();
+  return val;
+}
 
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+::TAO::SSLIOP::Current_ptr
+TAO::SSLIOP::Current_var::tao_duplicate (TAO::SSLIOP::Current_ptr p)
+{
+  return ::TAO::SSLIOP::Current::_duplicate (p);
+}
+
+void
+TAO::SSLIOP::Current_var::tao_release (TAO::SSLIOP::Current_ptr p)
+{
+  CORBA::release (p);
+}
+
+::TAO::SSLIOP::Current_ptr
+TAO::SSLIOP::Current_var::tao_nil (void)
+{
+  return ::TAO::SSLIOP::Current::_nil ();
+}
+
+::TAO::SSLIOP::Current_ptr
+TAO::SSLIOP::Current_var::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ::TAO::SSLIOP::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+TAO::SSLIOP::Current_var::tao_upcast (void *src)
+{
+  TAO::SSLIOP::Current **tmp =
+    static_cast<TAO::SSLIOP::Current **> (src);
+  return *tmp;
+}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 1921057cfc4..1ff1ab76fb4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -23,7 +23,7 @@
 
 #include "SSLIOP_Current_Impl.h"
 
-#include "orbsvcs/SSLIOPC.h"
+#include "orbsvcs/orbsvcs/SSLIOPC.h"
 #include "tao/ORB_Core.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -41,8 +41,8 @@ namespace TAO
   namespace SSLIOP
   {
     class Current;
+    class Current_var;
     typedef Current * Current_ptr;
-    typedef TAO_Pseudo_Var_T<Current> Current_var;
 
     /**
      * @class Current
@@ -112,12 +112,24 @@ namespace TAO
        * compiler for all IDL interfaces.
        */
       //@{
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+      typedef Current_ptr _ptr_type;
+      typedef Current_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
+
+      static int _tao_class_id;
+
       // The static operations.
       static Current_ptr _duplicate (Current_ptr obj);
 
       static Current_ptr _narrow (CORBA::Object_ptr obj
                                   ACE_ENV_ARG_DECL);
 
+
+      static Current_ptr _unchecked_narrow (CORBA::Object_ptr obj
+                                            ACE_ENV_ARG_DECL);
+
+
       static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
@@ -157,6 +169,42 @@ namespace TAO
 
     };
 
+    class Current_var : public TAO_Base_var
+    {
+    public:
+      Current_var (void); // default constructor
+      Current_var (Current_ptr p) : ptr_ (p) {}
+      Current_var (const Current_var &); // copy constructor
+      ~Current_var (void); // destructor
+
+      Current_var &operator= (Current_ptr);
+      Current_var &operator= (const Current_var &);
+      Current_ptr operator-> (void) const;
+
+      operator const Current_ptr &() const;
+      operator Current_ptr &();
+      // in, inout, out, _retn
+      Current_ptr in (void) const;
+      Current_ptr &inout (void);
+      Current_ptr &out (void);
+      Current_ptr _retn (void);
+      Current_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static Current_ptr tao_duplicate (Current_ptr);
+      static void tao_release (Current_ptr);
+      static Current_ptr tao_nil (void);
+      static Current_ptr tao_narrow (CORBA::Object *
+                                                ACE_ENV_ARG_DECL);
+      static CORBA::Object * tao_upcast (void *);
+
+    private:
+      Current_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      Current_var (const TAO_Base_var &rhs);
+      Current_var &operator= (const TAO_Base_var &rhs);
+    };
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index eb7ff19899a..ee65fa48380 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -34,9 +34,7 @@ TAO::SSLIOP::Current_Impl::client_credentials (
 
   SecurityLevel3::ClientCredentials_ptr creds;
   ACE_NEW_THROW_EX (creds,
-                    TAO::SSLIOP::ClientCredentials (cert.in (),
-                                                    0,
-                                                    this->ssl_),
+                    TAO::SSLIOP::ClientCredentials (cert.in (), 0),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index 5502393a62b..6ba6569f23b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOPC.h"
-#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
+#include "orbsvcs/orbsvcs/SSLIOPC.h"
+#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
 #include "tao/ORB_Core.h"
 
 #include <openssl/ssl.h>
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
index 1f95833d035..2f461de27f1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
@@ -2,81 +2,12 @@
 
 #include "SSLIOP_EVP_PKEY.h"
 
-#include <openssl/x509.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/dh.h>
-
 
 ACE_RCSID (SSLIOP,
            SSLIOP_EVP_PKEY,
            "$Id$")
 
 
-::EVP_PKEY *
-TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
-{
-  ::EVP_PKEY * pkey = const_cast< ::EVP_PKEY *> (&key);
-
-  // We're using the EVP_PKEY_var even though it depends on this
-  // trait function.  This works since we're not actually using
-  // any of the EVP_PKEY_var methods that call this copy()
-  // trait.  This allows us to maintain exception safety.
-  TAO::SSLIOP::EVP_PKEY_var p = ::EVP_PKEY_new ();
-
-  switch (::EVP_PKEY_type (pkey->type))
-    {
-    case EVP_PKEY_RSA:
-      {
-        RSA * rsa = ::EVP_PKEY_get1_RSA (pkey);
-        if (rsa != 0)
-          {
-            // Not exception safe!
-            ::EVP_PKEY_set1_RSA (p.in (), RSAPrivateKey_dup (rsa));
-            ::RSA_free (rsa);
-          }
-      }
-      break;
-
-    case EVP_PKEY_DSA:
-      {
-        DSA * dsa = ::EVP_PKEY_get1_DSA (pkey);
-        if (dsa != 0)
-          {
-            // Not exception safe!
-            ::EVP_PKEY_set1_DSA (p.in (), DSAparams_dup (dsa));
-            ::DSA_free (dsa);
-          }
-      }
-      break;
-
-    case EVP_PKEY_DH:
-      {
-        DH * dh = ::EVP_PKEY_get1_DH (pkey);
-        if (dh != 0)
-          {
-            // Not exception safe!
-            ::EVP_PKEY_set1_DH (p.in (), DHparams_dup (dh));
-            ::DH_free (dh);
-          }
-      }
-      break;
-
-    default:
-      // We should never get here!
-      return 0;
-    }
-
-  return p._retn ();
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::SSLIOP::OpenSSL_st_var< ::EVP_PKEY >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO::SSLIOP::OpenSSL_st_var< ::EVP_PKEY >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#if !defined (__ACE_INLINE__)
+#include "SSLIOP_EVP_PKEY.inl"
+#endif  /* !__ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
index 903828b73d5..a316efd37c7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  @author Ossama Othman <ossama@dre,vanderbilt.edu>
+ *  @author Ossama Othman <ossama@uci.edu>
  */
 //=============================================================================
 
@@ -21,56 +21,83 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_OpenSSL_st_T.h"
+#include "tao/varbase.h"
 
-#include <openssl/evp.h>
 #include <openssl/crypto.h>
-
+#include <openssl/evp.h>
 
 namespace TAO
 {
   namespace SSLIOP
   {
-    // OpenSSL @c EVP_PKEY structure traits specialization.
-    template <>
-    struct OpenSSL_traits< ::EVP_PKEY >
+    /**
+     * @name CORBA-style Reference Count Manipulation Methods
+     */
+    /// Increase the reference count on the given EVP_PKEY structure.
+    ::EVP_PKEY *_duplicate (::EVP_PKEY *key);
+
+    /// Decrease the reference count on the given EVP_PKEY structure.
+    void release (::EVP_PKEY *key);
+
+    /**
+     * @class EVP_PKEY_var
+     *
+     * @brief "_var" class for the OpenSSL @param EVP_PKEY structure.
+     *
+     * This class is simply used to make operations on instances of
+     * the OpenSSL @param EVP_PKEY structures exception safe.  It is
+     * only used internally by the SSLIOP pluggable protocol.
+     */
+    class EVP_PKEY_var : private TAO_Base_var
     {
-      /// OpenSSL lock ID for use in OpenSSL CRYPTO_add() reference
-      /// count manipulation function.
-      enum { LOCK_ID = CRYPTO_LOCK_EVP_PKEY };
+    public:
 
-      /// Increase the reference count on the given OpenSSL structure.
       /**
-       * @note This used to be in a function template but MSVC++ 6
-       *       can't handle function templates correctly so reproduce
-       *       the code in each specialization.  *sigh*
+       * @name Constructors
        */
-      static ::EVP_PKEY * _duplicate (::EVP_PKEY * st)
-      {
-        if (st != 0)
-          CRYPTO_add (&(st->references),
-                      1,
-                      LOCK_ID);
-
-        return st;
-      }
-
-      /// Perform deep copy of the given OpenSSL structure.
-      static ::EVP_PKEY * copy (::EVP_PKEY const & key);
-
-      /// Decrease the reference count on the given OpenSSL
-      /// structure.
-      static void release (::EVP_PKEY * st)
-      {
-        ::EVP_PKEY_free (st);
-      }
-    };
+      //@{
+      EVP_PKEY_var (void);
+      EVP_PKEY_var (::EVP_PKEY *x);
+      EVP_PKEY_var (const EVP_PKEY_var &);
+      //@}
+
+      /// Destructor
+      ~EVP_PKEY_var (void);
+
+      EVP_PKEY_var &operator= (::EVP_PKEY *);
+      EVP_PKEY_var &operator= (const EVP_PKEY_var &);
+      const ::EVP_PKEY *operator-> (void) const;
+      ::EVP_PKEY *operator-> (void);
+
+      operator const ::EVP_PKEY &() const;
+      operator ::EVP_PKEY &();
 
-    typedef OpenSSL_st_var< ::EVP_PKEY > EVP_PKEY_var;
+      ::EVP_PKEY *in (void) const;
+      ::EVP_PKEY *&inout (void);
+      ::EVP_PKEY *&out (void);
+      ::EVP_PKEY *_retn (void);
+      ::EVP_PKEY *ptr (void) const;
+
+    private:
+
+      // Unimplemented - prevents widening assignment.
+      EVP_PKEY_var (const TAO_Base_var &rhs);
+      EVP_PKEY_var &operator= (const TAO_Base_var &rhs);
+
+    private:
+
+      /// The OpenSSL @c EVP_PKEY structure that represents a private
+      /// key.
+      ::EVP_PKEY *evp_;
+
+    };
 
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+#if defined (__ACE_INLINE__)
+#include "SSLIOP_EVP_PKEY.inl"
+#endif  /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.inl
new file mode 100644
index 00000000000..e20b30e774d
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.inl
@@ -0,0 +1,129 @@
+// -*- C++ -*-
+//
+// $Id$
+
+ACE_INLINE ::EVP_PKEY *
+TAO::SSLIOP::_duplicate (::EVP_PKEY *key)
+{
+  // OpenSSL provides no function to increase the reference count on
+  // the EVP_PKEY structure, so we do it manually.
+  if (key != 0)
+    CRYPTO_add (&(key->references), 1, CRYPTO_LOCK_EVP_PKEY);
+
+  return key;
+}
+
+ACE_INLINE void
+TAO::SSLIOP::release (::EVP_PKEY *key)
+{
+  // OpenSSL's EVP_PKEY_free() function already handles reference
+  // counting properly.
+  ::EVP_PKEY_free (key);
+}
+
+
+// -------------------------------------------------------------------
+
+ACE_INLINE
+TAO::SSLIOP::EVP_PKEY_var::EVP_PKEY_var (void)
+  : evp_ (0)
+{
+}
+
+ACE_INLINE
+TAO::SSLIOP::EVP_PKEY_var::EVP_PKEY_var (::EVP_PKEY *x)
+  : evp_ (x)
+{
+}
+
+ACE_INLINE
+TAO::SSLIOP::EVP_PKEY_var::EVP_PKEY_var (const TAO::SSLIOP::EVP_PKEY_var &p)
+  : TAO_Base_var (),
+    evp_ (TAO::SSLIOP::_duplicate (p.ptr ()))
+{
+}
+
+ACE_INLINE
+TAO::SSLIOP::EVP_PKEY_var::~EVP_PKEY_var (void)
+{
+  TAO::SSLIOP::release (this->evp_);
+}
+
+ACE_INLINE TAO::SSLIOP::EVP_PKEY_var &
+TAO::SSLIOP::EVP_PKEY_var::operator= (::EVP_PKEY *p)
+{
+  TAO::SSLIOP::release (this->evp_);
+  this->evp_ = p;
+  return *this;
+}
+
+ACE_INLINE TAO::SSLIOP::EVP_PKEY_var &
+TAO::SSLIOP::EVP_PKEY_var::operator= (const TAO::SSLIOP::EVP_PKEY_var &p)
+{
+  if (this != &p)
+    {
+      TAO::SSLIOP::release (this->evp_);
+      this->evp_ = TAO::SSLIOP::_duplicate (p.ptr ());
+    }
+
+  return *this;
+}
+
+ACE_INLINE const ::EVP_PKEY *
+TAO::SSLIOP::EVP_PKEY_var::operator-> (void) const
+{
+  return this->evp_;
+}
+
+ACE_INLINE ::EVP_PKEY *
+TAO::SSLIOP::EVP_PKEY_var::operator-> (void)
+{
+  return this->evp_;
+}
+
+ACE_INLINE
+TAO::SSLIOP::EVP_PKEY_var::operator const ::EVP_PKEY &() const
+{
+  return *this->evp_;
+}
+
+ACE_INLINE
+TAO::SSLIOP::EVP_PKEY_var::operator ::EVP_PKEY &()
+{
+  return *this->evp_;
+}
+
+ACE_INLINE ::EVP_PKEY *
+TAO::SSLIOP::EVP_PKEY_var::in (void) const
+{
+  return this->evp_;
+}
+
+ACE_INLINE ::EVP_PKEY *&
+TAO::SSLIOP::EVP_PKEY_var::inout (void)
+{
+  return this->evp_;
+}
+
+ACE_INLINE ::EVP_PKEY *&
+TAO::SSLIOP::EVP_PKEY_var::out (void)
+{
+  EVP_PKEY_free (this->evp_);
+  this->evp_ = 0;
+  return this->evp_;
+}
+
+ACE_INLINE ::EVP_PKEY *
+TAO::SSLIOP::EVP_PKEY_var::_retn (void)
+{
+  // Yield ownership of the EVP_PKEY structure.
+  ::EVP_PKEY *x = this->evp_;
+  this->evp_ = 0;
+  return x;
+}
+
+ACE_INLINE ::EVP_PKEY *
+TAO::SSLIOP::EVP_PKEY_var::ptr (void) const
+{
+  return this->evp_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index 3493cd303a9..0816283f5c9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (SSLIOP,
 #endif /* __ACE_INLINE__ */
 
 TAO_SSLIOP_Endpoint::TAO_SSLIOP_Endpoint (const ::SSLIOP::SSL *ssl_component,
-                                          TAO_IIOP_Endpoint *iiop_endp)
+                                 TAO_IIOP_Endpoint *iiop_endp)
   : TAO_Endpoint (IOP::TAG_INTERNET_IOP),
     object_addr_ (),
     next_ (0),
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index fdd3490f063..d4060f8c02a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -24,10 +24,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_OwnCredentials.h"
+#include "SSLIOP_Credentials.h"
 
-#include "orbsvcs/SSLIOPC.h"
-#include "orbsvcs/SecurityC.h"
+#include "orbsvcs/orbsvcs/SSLIOPC.h"
+#include "orbsvcs/orbsvcs/SecurityC.h"
 
 #include "tao/IIOP_Endpoint.h"
 #include "ace/INET_Addr.h"
@@ -123,7 +123,7 @@ namespace TAO
       ::Security::EstablishTrust trust (void) const;
 
       /// Set the credentials for this endpoint.
-      void credentials (TAO::SSLIOP::OwnCredentials_ptr creds);
+      void credentials (TAO::SSLIOP::Credentials_ptr creds);
 
       /// Get the credentials for this endpoint.
       /**
@@ -133,7 +133,7 @@ namespace TAO
        *       that no additional locks occur when checking the
        *       transport cache.
        */
-      TAO::SSLIOP::OwnCredentials * credentials (void) const;
+      TAO::SSLIOP::Credentials * credentials (void) const;
       //@}
 
     private:
@@ -169,7 +169,7 @@ namespace TAO
       ::Security::EstablishTrust trust_;
 
       /// SSLIOP-specific credentials for this endpoint object.
-      TAO::SSLIOP::OwnCredentials_var credentials_;
+      TAO::SSLIOP::Credentials_var credentials_;
 
     };
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
index 4fa34d67f41..eb58d3dcc56 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
@@ -68,12 +68,12 @@ TAO_SSLIOP_Endpoint::trust (void) const
 }
 
 ACE_INLINE void
-TAO_SSLIOP_Endpoint::credentials (const TAO::SSLIOP::OwnCredentials_ptr creds)
+TAO_SSLIOP_Endpoint::credentials (const TAO::SSLIOP::Credentials_ptr creds)
 {
-  this->credentials_ = TAO::SSLIOP::OwnCredentials::_duplicate (creds);
+  this->credentials_ = TAO::SSLIOP::Credentials::_duplicate (creds);
 }
 
-ACE_INLINE TAO::SSLIOP::OwnCredentials *
+ACE_INLINE TAO::SSLIOP::Credentials *
 TAO_SSLIOP_Endpoint::credentials (void) const
 {
   return this->credentials_.in ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index fbb32f89f96..390ab77de3c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -4,7 +4,7 @@
 #include "SSLIOP_ORBInitializer.h"
 #include "ace/OS_NS_strings.h"
 
-#include "orbsvcs/Security/Security_ORBInitializer.h"  /// @todo should go away
+#include "orbsvcs/orbsvcs/Security/Security_ORBInitializer.h"  /// @todo should go away
 
 //#include "orbsvcs/CSIIOPC.h"
 
@@ -74,7 +74,7 @@ TAO::SSLIOP::Protocol_Factory::make_acceptor (void)
 
 int
 TAO::SSLIOP::Protocol_Factory::init (int argc,
-                                     char* argv[])
+                                   char* argv[])
 {
   char *certificate_path = 0;
   char *private_key_path = 0;
@@ -473,7 +473,6 @@ TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint (void) const
   return 0;
 }
 
-
 ACE_STATIC_SVC_DEFINE (TAO_SSLIOP_Protocol_Factory,
                        ACE_TEXT ("SSLIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
index 73a16174959..a80578eb718 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
@@ -25,8 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SecurityC.h"
-#include "orbsvcs/CSIIOPC.h"
+#include "orbsvcs/orbsvcs/SecurityC.h"
+#include "orbsvcs/orbsvcs/CSIIOPC.h"
 
 #include "tao/Protocol_Factory.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index 9e47848971a..45740ab8cd0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOPC.h"
+#include "orbsvcs/orbsvcs/SSLIOPC.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index efa08eeb608..d7fe7e70c57 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -11,11 +11,11 @@ ACE_RCSID (SSLIOP,
 //#include "SSLIOP_IORInterceptor.h"
 #include "SSLIOP_CredentialsAcquirerFactory.h"
 
-#include "orbsvcs/Security/SL3_SecurityCurrent.h"
-#include "orbsvcs/Security/SL3_CredentialsCurator.h"
+#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h"
+#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h"
 
-#include "orbsvcs/SSLIOPC.h"
-#include "orbsvcs/CSIIOPC.h"
+#include "orbsvcs/orbsvcs/SSLIOPC.h"
+#include "orbsvcs/orbsvcs/CSIIOPC.h"
 
 #include "tao/Exception.h"
 #include "tao/ORBInitInfo.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index 544208d40b7..01f626a049d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -22,8 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CSIIOPC.h"
-#include "orbsvcs/SecurityC.h"
+#include "orbsvcs/orbsvcs/CSIIOPC.h"
+#include "orbsvcs/orbsvcs/SecurityC.h"
 
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index 4205fcb5cee..8541a3771fb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (SSLIOP,
 
 
 TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp)
-  : SSLIOP_Credentials (cert, evp)
+  : TAO::SSLIOP::Credentials (cert, evp)
 {
 }
 
@@ -71,15 +71,3 @@ TAO::SSLIOP::OwnCredentials::release_credentials (
 {
   this->creds_state_ = SecurityLevel3::CS_PendingRelease;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Pseudo_Var_T<TAO::SSLIOP::OwnCredentials>;
-template class TAO_Pseudo_Out_T<TAO::SSLIOP::OwnCredentials, TAO::SSLIOP::OwnCredentials_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Var_T<TAO::SSLIOP::OwnCredentials>
-# pragma instantiate TAO_Pseudo_Out_T<TAO::SSLIOP::OwnCredentials, TAO::SSLIOP::OwnCredentials_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
index 2dfed018858..c973e328066 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -43,15 +43,15 @@ namespace TAO
     /**
      * @class OwnCredentials
      *
-     * @brief Credentials representing our identity, not our peer's
-     *        identity.
+     * @brief Credentials representing the our identity, not our
+     *        peer's identity.
      *
      * @c OwnCredentials are a representation of our identity, not our
      * peer's identity.
      */
     class TAO_SSLIOP_Export OwnCredentials
       : public virtual SecurityLevel3::OwnCredentials,
-        public virtual SSLIOP_Credentials
+        public virtual Credentials
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index dac7198565b..bce9948546c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (SSLIOP,
 
 TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert,
                                                    ::EVP_PKEY *evp)
-  : SSLIOP_Credentials (cert, evp)
+  : TAO::SSLIOP::Credentials (cert, evp)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index 98b4a75ec87..e4ae65b222f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
+ *  @author Ossama Othman <ossama@uci.edu>
  */
 //=============================================================================
 
@@ -38,7 +38,7 @@ namespace TAO
      */
     class TAO_SSLIOP_Export TargetCredentials
       : public virtual SecurityLevel3::TargetCredentials,
-        public virtual SSLIOP_Credentials
+        public virtual Credentials
     {
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp
index 036b2043a81..d16a4418066 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp
@@ -6,12 +6,6 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::SSLIOP::OpenSSL_st_var< ::X509 >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO::SSLIOP::OpenSSL_st_var< ::X509 >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#if !defined (__ACE_INLINE__)
+#include "SSLIOP_X509.inl"
+#endif  /* !__ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
index 6937053169b..e80e4383d4f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
@@ -21,60 +21,86 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_OpenSSL_st_T.h"
+#include "tao/varbase.h"
 
 #include <openssl/x509.h>
 #include <openssl/crypto.h>
 
-
 namespace TAO
 {
   namespace SSLIOP
   {
-    // OpenSSL @c X509 structure traits specialization.
-    template <>
-    struct OpenSSL_traits< ::X509 >
+    /**
+     * @name CORBA-style Reference Count Manipulation Methods
+     */
+    /// Increase the reference count on the given X509 structure.
+    ::X509 *_duplicate (::X509 *cert);
+
+    /// Decrease the reference count on the given X509 structure.
+    void release (::X509 *cert);
+
+    /**
+     * @class X509_var
+     *
+     * @brief "_var" class for the OpenSSL @param X509 structure.
+     *
+     * This class is simply used to make operations on instances of
+     * the OpenSSL @c X509 structures exception safe.  It is only used
+     * internally by the SSLIOP pluggable protocol.
+     */
+    class X509_var : private TAO_Base_var
     {
-      /// OpenSSL lock ID for use in OpenSSL CRYPTO_add() reference
-      /// count manipulation function.
-      enum { LOCK_ID = CRYPTO_LOCK_X509 };
+    public:
 
-      /// Increase the reference count on the given OpenSSL structure.
       /**
-       * @note This used to be in a function template but MSVC++ 6
-       *       can't handle function templates correctly so reproduce
-       *       the code in each specialization.  *sigh*
+       * @name Constructors
        */
-      static ::X509 * _duplicate (::X509 * st)
-      {
-        if (st != 0)
-          CRYPTO_add (&(st->references),
-                      1,
-                      LOCK_ID);
-
-        return st;
-      }
-
-      /// Perform deep copy of the given OpenSSL structure.
-      static ::X509 * copy (::X509 const & st)
-      {
-        return ::X509_dup (const_cast< ::X509 *> (&st));
-      }
-
-      /// Decrease the reference count on the given OpenSSL
-      /// structure.
-      static void release (::X509 * st)
-      {
-        ::X509_free (st);
-      }
-    };
+      //@{
+      X509_var (void);
+      X509_var (::X509 *x);
+      X509_var (const X509_var &);
+      X509_var (const ::X509 &x);
+      //@}
+
+      /// Destructor
+      ~X509_var (void);
+
+      X509_var &operator= (::X509 *);
+      X509_var &operator= (const X509_var &);
+      X509_var &operator= (const ::X509 &);
+      const ::X509 *operator-> (void) const;
+      ::X509 *operator-> (void);
+
+      operator const ::X509 &() const;
+      operator ::X509 &();
+
+      ::X509 *in (void) const;
+      ::X509 *&inout (void);
+      ::X509 *&out (void);
+      ::X509 *_retn (void);
+      ::X509 *ptr (void) const;
 
-    typedef OpenSSL_st_var< ::X509 > X509_var;
+    private:
 
+      // Unimplemented - prevents widening assignment.
+      X509_var (const TAO_Base_var &rhs);
+      X509_var &operator= (const TAO_Base_var &rhs);
+
+    private:
+
+      /// The OpenSSL X509 structure that represents a X.509 certificate.
+      ::X509 *x509_;
+
+    };
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
 
+#if defined (__ACE_INLINE__)
+#include "SSLIOP_X509.inl"
+#endif  /* __ACE_INLINE__ */
+
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_SSLIOP_X509_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.inl
new file mode 100644
index 00000000000..f45342d12a0
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.inl
@@ -0,0 +1,148 @@
+// -*- C++ -*-
+//
+// $Id$
+
+ACE_INLINE ::X509 *
+TAO::SSLIOP::_duplicate (::X509 *cert)
+{
+  // OpenSSL provides no function to increase the reference count on
+  // the X509 structure, so we do it manually.  (X509_dup() performs a
+  // deep copy, not a shallow copy.)
+  if (cert != 0)
+    CRYPTO_add (&(cert->references), 1, CRYPTO_LOCK_X509);
+
+  return cert;
+}
+
+ACE_INLINE void
+TAO::SSLIOP::release (::X509 *cert)
+{
+  // OpenSSL's X509_free() function already handles reference counting
+  // properly.
+  ::X509_free (cert);
+}
+
+
+// -------------------------------------------------------------------
+
+ACE_INLINE
+TAO::SSLIOP::X509_var::X509_var (void)
+  : x509_ (0)
+{
+}
+
+ACE_INLINE
+TAO::SSLIOP::X509_var::X509_var (::X509 *x)
+  : x509_ (x)
+{
+}
+
+ACE_INLINE
+TAO::SSLIOP::X509_var::X509_var (const TAO::SSLIOP::X509_var &p)
+  : TAO_Base_var (),
+    x509_ (TAO::SSLIOP::_duplicate (p.ptr ()))
+{
+}
+
+ACE_INLINE
+TAO::SSLIOP::X509_var::X509_var (const ::X509 &p)
+{
+  this->x509_ = X509_dup (const_cast< ::X509 * > (&p));
+}
+
+ACE_INLINE
+TAO::SSLIOP::X509_var::~X509_var (void)
+{
+  TAO::SSLIOP::release (this->x509_);
+}
+
+ACE_INLINE TAO::SSLIOP::X509_var &
+TAO::SSLIOP::X509_var::operator= (::X509 *p)
+{
+  TAO::SSLIOP::release (this->x509_);
+  this->x509_ = p;
+  return *this;
+}
+
+ACE_INLINE ::TAO::SSLIOP::X509_var &
+TAO::SSLIOP::X509_var::operator= (const ::TAO::SSLIOP::X509_var &p)
+{
+  if (this != &p)
+    {
+      TAO::SSLIOP::release (this->x509_);
+      this->x509_ = TAO::SSLIOP::_duplicate (p.ptr ());
+    }
+
+  return *this;
+}
+
+ACE_INLINE TAO::SSLIOP::X509_var &
+TAO::SSLIOP::X509_var::operator= (const ::X509 &p)
+{
+  if (this->x509_ != &p)
+    {
+      TAO::SSLIOP::release (this->x509_);
+      this->x509_ = X509_dup (const_cast< ::X509 * > (&p));
+    }
+
+  return *this;
+}
+
+ACE_INLINE const ::X509 *
+TAO::SSLIOP::X509_var::operator-> (void) const
+{
+  return this->x509_;
+}
+
+ACE_INLINE ::X509 *
+TAO::SSLIOP::X509_var::operator-> (void)
+{
+  return this->x509_;
+}
+
+ACE_INLINE
+TAO::SSLIOP::X509_var::operator const ::X509 &() const
+{
+  return *this->x509_;
+}
+
+ACE_INLINE
+TAO::SSLIOP::X509_var::operator ::X509 &()
+{
+  return *this->x509_;
+}
+
+ACE_INLINE ::X509 *
+TAO::SSLIOP::X509_var::in (void) const
+{
+  return this->x509_;
+}
+
+ACE_INLINE ::X509 *&
+TAO::SSLIOP::X509_var::inout (void)
+{
+  return this->x509_;
+}
+
+ACE_INLINE ::X509 *&
+TAO::SSLIOP::X509_var::out (void)
+{
+  X509_free (this->x509_);
+  this->x509_ = 0;
+  return this->x509_;
+}
+
+ACE_INLINE ::X509 *
+TAO::SSLIOP::X509_var::_retn (void)
+{
+  // Yield ownership of the X509 structure.
+  ::X509 *x = this->x509_;
+  this->x509_ = 0;
+  return x;
+}
+
+ACE_INLINE ::X509 *
+TAO::SSLIOP::X509_var::ptr (void) const
+{
+  return this->x509_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h
index e19b6659bf6..a4a7fc21cb0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h
@@ -45,7 +45,7 @@
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
-#include "orbsvcs/SSLIOPC.h"
+#include "orbsvcs/orbsvcs/SSLIOPC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl
index 969aaad85f6..64feb29fa16 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl
@@ -35,7 +35,7 @@
 #ifndef _SSL_ENDPOINTS_IDL_
 #define _SSL_ENDPOINTS_IDL_
 
-#include "orbsvcs/SSLIOP.idl"
+#include "orbsvcs/orbsvcs/SSLIOP.idl"
 
 // Stores information for a collection of SSLIOP endpoints.
 typedef sequence <SSLIOP::SSL> TAO_SSLEndpointSequence;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index a1bd57f1ae8..57be42611e4 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -4,8 +4,8 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 
 #include "Config_Scheduler.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index abf9af35069..42500375d5b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -11,15 +11,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #include "sched_export.h"
 
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
-#include "orbsvcs/Sched/Strategy_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h"
 #else
-#include "orbsvcs/Sched/Scheduler_Generic.h"
+#include "orbsvcs/orbsvcs/Sched/Scheduler_Generic.h"
 #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */
 
 class TAO_RTSched_Export ACE_Config_Scheduler
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
new file mode 100644
index 00000000000..97213c6f2ab
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
@@ -0,0 +1,47 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Scheduling Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Sched.la
+
+libTAO_Sched_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Sched_la_SOURCES = \
+        Config_Scheduler.cpp \
+        DynSched.cpp \
+        Reconfig_Scheduler.cpp \
+        Reconfig_Sched_Utils.cpp \
+        SchedEntry.cpp \
+        Scheduler.cpp \
+        Scheduler_Generic.cpp \
+        Strategy_Scheduler.cpp
+
+noinst_HEADERS = \
+        Config_Scheduler.h \
+        DynSched.h \
+        Reconfig_Scheduler.h \
+        Reconfig_Sched_Utils.h \
+        SchedEntry.h \
+        Scheduler.h \
+        Scheduler_Generic.h \
+        Strategy_Scheduler.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index f5e75f3118e..9f2597df83f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -22,7 +22,7 @@
 #include "Reconfig_Sched_Utils.h"
 
 
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index 225fa09960e..b407bfaf1db 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -24,8 +24,8 @@
 
 #include "ace/config-all.h"
 
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
 #include "sched_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
index 4e46f2f8a63..98b1e11baa8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
@@ -23,8 +23,8 @@
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/RB_Tree.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
 #include "Reconfig_Sched_Utils.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index a6a16be05f2..debe5809f00 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -19,7 +19,7 @@
 #define TAO_RECONFIG_SCHEDULER_T_C
 
 #include "Reconfig_Scheduler_T.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "ace/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index 87cf62c1668..0e0a6e2074f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -22,8 +22,8 @@
 #include /**/ "ace/pre.h"
 
 #include "sched_export.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "ace/Containers.h"
 
 //////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 9619eceb420..26d5d0cfba0 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -17,7 +17,7 @@
 // ============================================================================
 
 #include "ace/Sched_Params.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "Scheduler.h"
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index abb37fc6cee..5403d9013c6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -33,8 +33,8 @@
 #include "ace/SString.h"
 #include "ace/Unbounded_Set.h"
 
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "sched_export.h"
 
 class TAO_RTSched_Export ACE_Scheduler
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 9b169d85ff7..fef9bfd0158 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -4,13 +4,13 @@
 #include "ace/Singleton.h"
 #include "ace/Null_Mutex.h"
 
-#include "orbsvcs/Runtime_Scheduler.h"
-#include "orbsvcs/Sched/Reconfig_Scheduler.h"
-#include "orbsvcs/Sched/Reconfig_Sched_Utils.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Factory.i"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(orbsvcs,
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index aa43e530553..2cd56b8f60b 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -24,9 +24,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Sched/sched_export.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Sched/sched_export.h"
 
 class TAO_Reconfig_Scheduler_Entry;
 struct TAO_RT_Info_Tuple;
@@ -268,7 +268,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Factory.i"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
index c21018bf426..5ae71bb106e 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
@@ -2,10 +2,10 @@
 
 #include "ace/OS.h"
 
-#include "orbsvcs/Scheduler_Utilities.h"
+#include "orbsvcs/orbsvcs/Scheduler_Utilities.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Utilities.i"
+#include "orbsvcs/orbsvcs/Scheduler_Utilities.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (orbsvcs, 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
index beda9ed5551..745247b2ed1 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
@@ -18,13 +18,13 @@
 #define ACE_SCHEDULER_UTILITIES_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Sched/sched_export.h"
+#include "orbsvcs/orbsvcs/Sched/sched_export.h"
 
 class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info
 {
@@ -61,7 +61,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Utilities.i"
+#include "orbsvcs/orbsvcs/Scheduler_Utilities.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc
index 257d9b1da26..c329d000bee 100644
--- a/TAO/orbsvcs/orbsvcs/Security.mpc
+++ b/TAO/orbsvcs/orbsvcs/Security.mpc
@@ -1,9 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project(Security) : orbsvcslib, corba_messaging, core, portableserver, interceptors, valuetype {
+project(Security) : orbsvcslib, corba_messaging, core, portableserver {
+  requires    += interceptors
   sharedname   = TAO_Security
-  idlflags    += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h
+  idlflags    += -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h
   dynamicflags = TAO_SECURITY_BUILD_DLL
   tagchecks   += Security
 
@@ -32,7 +33,4 @@ project(Security) : orbsvcslib, corba_messaging, core, portableserver, intercept
       Security
     }
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
index c600d1c71c9..8ae4f3bef13 100644
--- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "CSI_Utils.h"
-#include "orbsvcs/CSIC.h"
+#include "orbsvcs/orbsvcs/CSIC.h"
 
 #include "tao/CDR.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index eeb4bc7ddc9..7818fa3504f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index a349ef444a1..6cf09884257 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index 3be591bcd38..946ec411ae2 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -15,13 +15,13 @@
 #define TAO_SL3_CONTEXT_ESTABLISHMENT_POLICY_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
index 6e593d6345d..9c77db90c02 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
@@ -16,15 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Security/SL3_CredentialsCurator.h"
+#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h"
 
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 
 namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 211d93e534f..8fbca77cd78 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -284,9 +284,6 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_Pseudo_Var_T<TAO::SL3::CredentialsCurator>;
-template class TAO_Pseudo_Out_T<TAO::SL3::CredentialsCurator, TAO::SL3::CredentialsCurator_var>;
-
 template class ACE_Map_Entry<const char *, TAO::SL3::CredentialsAcquirerFactory *>;
 template class ACE_Map_Iterator_Base<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>;
 template class ACE_Map_Iterator<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>;
@@ -301,9 +298,6 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, SecurityLevel3::Ow
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_Pseudo_Var_T<TAO::SL3::CredentialsCurator>
-#pragma instantiate TAO_Pseudo_Out_T<TAO::SL3::CredentialsCurator, TAO::SL3::CredentialsCurator_var>
-
 #pragma instantiate ACE_Map_Entry<const char *, TAO::SL3::CredentialsAcquirerFactory *>
 #pragma instantiate ACE_Map_Iterator_Base<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Iterator<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
index 712588d7548..b6b95a2c21a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -15,13 +15,13 @@
 #define TAO_SL3_CREDENTIALS_CURATOR_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index b2f7d901b26..d35f2d51b0c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -16,13 +16,13 @@
 #define TAO_SL3_OBJECT_CREDENTIALS_POLICY_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index 2cc6f6650f1..9c915f90d73 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,7 +24,7 @@
 
 #include "SL3_SecurityCurrent_Impl.h"
 
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index 5b0b97162ad..fcaaa0f629c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -22,7 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "security_export.h"
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 namespace TAO
 {
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
index 61b615e9cbb..a7efd8cb1a1 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -15,13 +15,13 @@
 #define TAO_SL3_SECURITY_MANAGER_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index 673a5a2c952..c1be7b22e78 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
 #include "tao/ORB_Core.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index a297564e3fd..7ffe96e6d1b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -22,7 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "security_export.h"
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
 
 namespace TAO
 {
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index 673c4debebc..df9b15396a6 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (Security,
 #include "SL3_CredentialsCurator.h"
 #include "SL3_SecurityManager.h"
 
-#include "orbsvcs/SecurityC.h"
+#include "orbsvcs/orbsvcs/SecurityC.h"
 
 #include "tao/ORBInitInfo.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 87f0d172965..be257f8089c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -12,8 +12,8 @@ ACE_RCSID (Security,
 #include "SL3_ContextEstablishmentPolicy.h"
 #include "SL3_ObjectCredentialsPolicy.h"
 
-#include "orbsvcs/SecurityLevel2C.h"
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
index 4f165fde1ed..38534a3432e 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
@@ -6,7 +6,7 @@
 #ifndef _SECURITY_LEVEL_1_IDL_
 #define _SECURITY_LEVEL_1_IDL_
 
-#include <orbsvcs/Security.idl>
+#include <orbsvcs/orbsvcs/Security.idl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
index 4826c449ed4..ca3cfaa0d08 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
@@ -6,7 +6,7 @@
 #ifndef _SECURITY_LEVEL_2_IDL_
 #define _SECURITY_LEVEL_2_IDL_
 
-#include <orbsvcs/SecurityLevel1.idl>
+#include <orbsvcs/orbsvcs/SecurityLevel1.idl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
index 58a1162f82e..f348c1cc19a 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
@@ -19,8 +19,8 @@
 #ifndef _SecurityLevel3_
 #define _SecurityLevel3_
 
-#include "tao/Policy.pidl"
-#include "tao/TimeBase.pidl"
+#include <tao/Policy.pidl>
+#include <tao/TimeBase.pidl>
 
 #pragma prefix "adiron.com"
 
diff --git a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl
index c7beeefd060..29cc213313d 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl
@@ -5,7 +5,7 @@
 #ifndef _SECURITY_REPLACEABLE_IDL_
 #define _SECURITY_REPLACEABLE_IDL_
 
-#include "orbsvcs/SecurityLevel2.idl"
+#include "orbsvcs/orbsvcs/SecurityLevel2.idl"
 #include "tao/IOP.pidl"
 
 #pragma prefix "omg.org"
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
index 29887c21e45..cec18dfb8d4 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
@@ -3,7 +3,7 @@
 
 project(Svc_Utils) : orbsvcslib, core, portableserver {
   sharedname   = TAO_Svc_Utils
-  idlflags    += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h
+  idlflags    += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h
   dynamicflags = TAO_SVC_UTILS_BUILD_DLL
 
   IDL_Files {
@@ -16,11 +16,7 @@ project(Svc_Utils) : orbsvcslib, core, portableserver {
     TimeBaseS.cpp
     RtecBaseC.cpp
     RtecBaseS.cpp
-    Shutdown_Utilities.cpp
     Time_Utilities.cpp
     IOR_Multicast.cpp
   }
-
-  Template_Files {
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Time/Makefile.am b/TAO/orbsvcs/orbsvcs/Time/Makefile.am
new file mode 100644
index 00000000000..7b1f4668c1a
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Time/Makefile.am
@@ -0,0 +1,42 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Time Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Time.la
+
+libTAO_Time_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Time_la_SOURCES = \
+        TAO_TIO.cpp \
+        TAO_Time_Service_Clerk.cpp \
+        TAO_Time_Service_Server.cpp \
+        TAO_UTO.cpp \
+        Timer_Helper.cpp
+
+noinst_HEADERS = \
+        TAO_TIO.h \
+        TAO_Time_Service_Clerk.h \
+        TAO_Time_Service_Server.h \
+        TAO_UTO.h \
+        Timer_Helper.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index eef1f946440..3e2146b3b4f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -19,7 +19,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
 #include "TAO_UTO.h"
 #include "time_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index 41357544e52..4a5da1e566d 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -19,8 +19,9 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Reactor.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
 #include "Timer_Helper.h"
 #include "time_export.h"
 
@@ -92,6 +93,10 @@ public:
   /// Return the globally synchronized time.
   virtual CORBA::ULongLong get_time (void);
 
+  /// This method is called by the driver program to set the Naming
+  /// Server instance.
+  void name_server (TAO_Naming_Server &server);
+
   /// Returns the time displacement factor.
   CORBA::Short time_displacement_factor (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index f83b3cb5701..f7436e726a6 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 @@
 #define TAO_TIME_SERVICE_SERVER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
 #include "time_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index b705d2244d8..9614194039a 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -18,7 +18,7 @@
 #define TAO_UTO_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
 #include "time_export.h"
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
index 5e89f43785d..b38dd4eae8b 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
@@ -27,7 +27,7 @@
 #include "ace/Containers.h"
 #include "time_export.h"
 
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index 0018ea15cf2..8525b8d0d87 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/orbsvcs/Time_Utilities.i"
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
index 86759d4ae66..dd2f5f01793 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
@@ -18,8 +18,8 @@
 #define ORBSVCS_TIME_UTILITIES_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/TimeBaseC.h"
-#include "orbsvcs/svc_utils_export.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/svc_utils_export.h"
 #include "ace/OS_NS_time.h"
 
 class TAO_Svc_Utils_Export ORBSVCS_Time
@@ -69,7 +69,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Time_Utilities.i"
+#include "orbsvcs/orbsvcs/Time_Utilities.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
index 280f9fa6121..7d3a4c5a10b 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
@@ -1,10 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "ace/Time_Value.h"
-
-
 ACE_INLINE TimeBase::TimeT
 ORBSVCS_Time::zero ()
 {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index b3e7e3ec208..0a5d53706ef 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -19,8 +19,8 @@
 #include "Constraint_Visitors.h"
 #include "Interpreter.h"
 
-#include "orbsvcs/CosTradingS.h"
-#include "orbsvcs/CosTradingReposS.h"
+#include "orbsvcs/orbsvcs/CosTradingS.h"
+#include "orbsvcs/orbsvcs/CosTradingReposS.h"
 
 class TAO_Constraint_Evaluator;
 class TAO_Constraint_Validator;
@@ -41,7 +41,7 @@ class TAO_Constraint_Validator;
  * EvaluationVisitor, which will evaluate the tree and decide
  * whether the offer meets the constraints.
  */
-class TAO_Trading_Serv_Export TAO_Constraint_Interpreter : public TAO_Interpreter
+class TAO_Trading_Export TAO_Constraint_Interpreter : public TAO_Interpreter
 {
 public:
   // = Initialization and termination methods.
@@ -88,7 +88,7 @@ public:
  * the offers, it will extract the offers in order using the
  * remove_offer method.
  */
-class TAO_Trading_Serv_Export TAO_Preference_Interpreter : public TAO_Interpreter
+class TAO_Trading_Export TAO_Preference_Interpreter : public TAO_Interpreter
 {
 public:
   // = Initialization and termination methods.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index dbc51ad0294..02fbfcb48c2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -19,7 +19,7 @@
 
 #include "tao/Basic_Types.h"
 
-#include "orbsvcs/Trader/trading_serv_export.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -54,7 +54,7 @@ namespace CORBA
  * subclass dispatches the method on an TAO_Constraint_Visitor
  * correlating to its type.
  */
-class TAO_Trading_Serv_Export TAO_Constraint
+class TAO_Trading_Export TAO_Constraint
 {
 public:
 
@@ -76,7 +76,7 @@ public:
  *
  * @brief A node that represents an operation with no operands.
  */
-class TAO_Trading_Serv_Export TAO_Noop_Constraint : public TAO_Constraint
+class TAO_Trading_Export TAO_Noop_Constraint : public TAO_Constraint
 {
 public:
 
@@ -99,7 +99,7 @@ private:
  * @brief TAO_Binary_Constraint represents an operation with left
  * and right operands.
  */
-class TAO_Trading_Serv_Export TAO_Binary_Constraint : public TAO_Constraint
+class TAO_Trading_Export TAO_Binary_Constraint : public TAO_Constraint
 {
 public:
 
@@ -158,7 +158,7 @@ private:
  * @brief TAO_Unary_Constraint represents an operation with only
  * one operand.
  */
-class TAO_Trading_Serv_Export TAO_Unary_Constraint : public TAO_Constraint
+class TAO_Trading_Export TAO_Unary_Constraint : public TAO_Constraint
 {
 public:
 
@@ -192,7 +192,7 @@ private:
  * @brief TAO_Property_Constraint represents a property whose
  * value is determined by the offer being evaluated.
  */
-class TAO_Trading_Serv_Export TAO_Property_Constraint : public TAO_Constraint
+class TAO_Trading_Export TAO_Property_Constraint : public TAO_Constraint
 {
 public:
 
@@ -223,7 +223,7 @@ private:
  * @brief TAO_Literal_Constraint represents a literal occuring in
  * the constraint expression tree.
  */
-class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
+class TAO_Trading_Export TAO_Literal_Constraint : public TAO_Constraint
 {
  public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index fd204d64153..0484d4330b5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -15,8 +15,8 @@
 #define TAO_CONSTRAINT_VISITOR_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Interpreter_Utils.h"
-#include "orbsvcs/Trader/trading_serv_export.h"
+#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
 #include "ace/Containers.h"
 
 class TAO_DynSequence_i;
@@ -45,7 +45,7 @@ class TAO_Noop_Constraint;
  * method to deal with each possible type of node in an
  * expression tree; one for each operator in the grammar.
  */
-class TAO_Trading_Serv_Export TAO_Constraint_Visitor
+class TAO_Trading_Export TAO_Constraint_Visitor
 {
 public:
 
@@ -85,7 +85,7 @@ public:
   virtual int visit_property (TAO_Property_Constraint* literal) = 0;
 };
 
-#include "orbsvcs/Trader/Constraint_Nodes.h"
+#include "orbsvcs/orbsvcs/Trader/Constraint_Nodes.h"
 
 /**
  * @class TAO_Constraint_Validator
@@ -107,7 +107,7 @@ public:
  * at which point we can back out of the traversal and indicate
  * failure.
  */
-class TAO_Trading_Serv_Export TAO_Constraint_Validator : public TAO_Constraint_Visitor
+class TAO_Trading_Export TAO_Constraint_Validator : public TAO_Constraint_Visitor
 {
 public:
   /// Constructor.
@@ -217,7 +217,7 @@ private:
  * evaluation time errors are a divide by a property whose value
  * is zero and undefined properties.
  */
-class TAO_Trading_Serv_Export TAO_Constraint_Evaluator : public TAO_Constraint_Visitor
+class TAO_Trading_Export TAO_Constraint_Evaluator : public TAO_Constraint_Visitor
 {
 public:
 
@@ -306,7 +306,7 @@ public:
 
 private:
 
-  class TAO_Trading_Serv_Export Operand_Queue :
+  class TAO_Trading_Export Operand_Queue :
     public ACE_Unbounded_Queue <TAO_Literal_Constraint>
   // = TITLE
   // A queue adapter with methods to setting and getting operands
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
index 4575bc96e89..b667227be47 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
@@ -17,7 +17,7 @@
 
 #include "Constraint_Nodes.h"
 #include "Constraint_Visitors.h"
-#include "orbsvcs/Trader/trading_serv_export.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
 
 class TAO_Constraint_Evaluator;
 class TAO_Constraint_Validator;
@@ -29,7 +29,7 @@ class TAO_Constraint_Validator;
  * build tree method invokes the yacc parser to parse a constraint
  * or preference string.
  */
-class TAO_Trading_Serv_Export TAO_Interpreter
+class TAO_Trading_Export TAO_Interpreter
 {
 protected:
   // = Initialization and termination methods.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index fccf6b4491b..7a8f4dcefc6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -20,13 +20,12 @@
 
 #include "tao/Typecode.h"
 #include "tao/CORBA_String.h"
-#include "tao/SystemException.h"
 
-#include "orbsvcs/Trader/trading_serv_export.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
 
 // =  Classes to deal with the ACE_Hash_Map_Manager.
 
-class TAO_Trading_Serv_Export TAO_String_Hash_Key : public CORBA::String_var
+class TAO_Trading_Export TAO_String_Hash_Key : public CORBA::String_var
 {
   // = TITLE
   //     Key for the Hash Table. The EXT_ID of the
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
index f621f592ea9..d907b2c4850 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -3,8 +3,8 @@
 #ifndef TAO_INTERPRETER_UTILS_CPP
 #define TAO_INTERPRETER_UTILS_CPP
 
-#include "orbsvcs/Trader/Interpreter_Utils_T.h"
-#include "orbsvcs/Trader/Constraint_Visitors.h"
+#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h"
+#include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h"
 #include "tao/DynamicAny/DynSequence_i.h"
 
 template <class OPERAND_TYPE> CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
new file mode 100644
index 00000000000..486744579d7
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
@@ -0,0 +1,57 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Trading Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Trader.la
+
+libTAO_Trader_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Trader_la_SOURCES = \
+        Constraint_Interpreter.cpp \
+        Constraint_Nodes.cpp \
+        Constraint_Visitors.cpp \
+        Constraint_l.cpp \
+        Constraint_y.cpp \
+        Offer_Database.cpp \
+        Offer_Iterators.cpp \
+        Offer_Iterators_T.cpp \
+        Service_Type_Repository.cpp \
+        Trader.cpp \
+        Trader_Interfaces.cpp \
+        Trader_T.cpp \
+        Trader_Utils.cpp
+
+noinst_HEADERS = \
+        Constraint_Interpreter.h \
+        Constraint_Nodes.h \
+        Constraint_Tokens.h \
+        Constraint_Visitors.h \
+        Offer_Database.h \
+        Offer_Iterators.h \
+        Offer_Iterators_T.h \
+        Service_Type_Repository.h \
+        Trader.h \
+        Trader_Interfaces.h \
+        Trader_T.h \
+        Trader_Utils.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index b65b50bb49b..88a868e027d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -26,7 +26,7 @@
  * @brief This class implements CosTradingRepos::ServiceTypeRepository
  * IDL interface.
  */
-class TAO_Trading_Serv_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository
+class TAO_Trading_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository
 {
 public:
   /**
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 1dabb8587b5..f2d907306df 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -25,10 +25,10 @@
 
 #include "ace/Containers.h"
 
-#include "orbsvcs/CosTradingS.h"
-#include "orbsvcs/CosTradingReposS.h"
-#include "orbsvcs/CosTradingDynamicS.h"
-#include "orbsvcs/Trader/trading_serv_export.h"
+#include "orbsvcs/orbsvcs/CosTradingS.h"
+#include "orbsvcs/orbsvcs/CosTradingReposS.h"
+#include "orbsvcs/orbsvcs/CosTradingDynamicS.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -50,7 +50,7 @@ class TAO_Trader_Base;
  * @brief Uses command line arguments to construct a trader instance with
  * the correct interface support, locking, and policy settings.
  */
-class TAO_Trading_Serv_Export TAO_Trader_Factory
+class TAO_Trading_Export TAO_Trader_Factory
 {
 public:
 
@@ -141,7 +141,7 @@ public:
  * Contains a reference to the trader from which it is
  * used so it can use trader's lock.
  */
-class TAO_Trading_Serv_Export TAO_Support_Attributes_i
+class TAO_Trading_Export TAO_Support_Attributes_i
 {
 public:
   // = Initialization and termination methods.
@@ -193,7 +193,7 @@ private:
  * Contains a reference to the trader from which it is
  * used so it can use trader's lock.
  */
-class TAO_Trading_Serv_Export TAO_Link_Attributes_i
+class TAO_Trading_Export TAO_Link_Attributes_i
 {
 public:
   // = Initialization and termination methods.
@@ -224,7 +224,7 @@ private:
  * Contains a reference to the trader from which it is
  * used so it can use trader's lock.
  */
-class TAO_Trading_Serv_Export TAO_Import_Attributes_i
+class TAO_Trading_Export TAO_Import_Attributes_i
 {
 public:
   // = Initialization and termination methods.
@@ -322,7 +322,7 @@ private:
  * IDL methods in CosTrading::Trader_Components would need
  * add a _duplicate call for each get method).
  */
-class TAO_Trading_Serv_Export TAO_Trading_Components_i
+class TAO_Trading_Export TAO_Trading_Components_i
 {
 public:
 
@@ -396,7 +396,7 @@ private:
  * want all these classes to be templatized.  TAO_Trader_Base class solves
  * this problem.
  */
-class TAO_Trading_Serv_Export TAO_Trader_Base : public TAO_Lockable
+class TAO_Trading_Export TAO_Trader_Base : public TAO_Lockable
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
index e5740b3dc86..ff646edb63f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
@@ -17,9 +17,9 @@
 #include "Constraint_Visitors.h"
 #include "Trader.h"
 #include "Trader_Utils.h"
-#include "orbsvcs/CosTradingC.h"
+#include "orbsvcs/orbsvcs/CosTradingC.h"
 
-class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator
+class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator
 {
  public:
   /**
@@ -38,7 +38,7 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Const
 
 };
 
-class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator
+class TAO_Trading_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator
 {
  public:
   /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index d77b3153669..bd99c2682d8 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -39,7 +39,7 @@
  * CORBA sequences, but requires that the client know the layout of
  * properties ahead of time.
  */
-class TAO_Trading_Serv_Export TAO_Property_Evaluator
+class TAO_Trading_Export TAO_Property_Evaluator
 {
 public:
 
@@ -123,7 +123,7 @@ private:
  * names to integer indicies, upon which lookups are guaranteed to
  * be O(lg n).
  */
-class TAO_Trading_Serv_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator
+class TAO_Trading_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator
 {
 public:
 
@@ -182,7 +182,7 @@ private:
  * @brief Little helper class that you can extend to have your dynamic
  * property handler construct CosTradingDynamic::DynamicProp structs.
  */
-class TAO_Trading_Serv_Export TAO_Dynamic_Property
+class TAO_Trading_Export TAO_Dynamic_Property
   : public virtual POA_CosTradingDynamic::DynamicPropEval,
     public virtual PortableServer::RefCountServantBase
 {
@@ -496,7 +496,7 @@ private:
  * interface that helps them build a policy sequence without violating
  * syntax rules and having to mess with typecodes.
  */
-class TAO_Trading_Serv_Export TAO_Policy_Creator
+class TAO_Trading_Export TAO_Policy_Creator
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 140a025fbe7..4ccc57f7c0e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -486,7 +486,7 @@ TAO_Trading_Loader::parse_args (int &argc, ACE_TCHAR *argv [])
   return 0;
 }
 
-ACE_FACTORY_DEFINE (TAO_Trading_Serv, TAO_Trading_Loader)
+ACE_FACTORY_DEFINE (TAO_Trading, TAO_Trading_Loader)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index ce679eada06..fb86bce35f1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -24,11 +24,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IOR_Multicast.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h"
 
-class TAO_Trading_Serv_Export TAO_Trading_Loader : public TAO_Object_Loader
+class TAO_Trading_Export TAO_Trading_Loader : public TAO_Object_Loader
 {
 public:
 
@@ -106,6 +106,6 @@ public:
 
 };
 
-ACE_FACTORY_DECLARE (TAO_Trading_Serv, TAO_Trading_Loader)
+ACE_FACTORY_DECLARE (TAO_Trading, TAO_Trading_Loader)
 
 #endif /* TAO_TRADING_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb
index 30b0038758d..dad3c6900fd 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb
@@ -1,28 +1,30 @@
 // -*- MPC -*-
 // $Id$
 
-feature(ec_typed_events) {
-  macros   += TAO_HAS_TYPED_EVENT_CHANNEL
 
-  idlflags    += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
+feature(ec_typed_events): taoidldefaults {
+  macros   += TAO_HAS_TYPED_EVENT_CHANNEL
+  libs     += TAO_IFR_Client TAO_DynamicInterface
+  after    += IFR_Client DynamicInterface
+  idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h
 
   IDL_Files {
     CosTypedEventComm.idl
     CosTypedEventChannelAdmin.idl
   }
 
-  Source_Files {
-    CosTypedEventCommC.cpp
-    CosTypedEventChannelAdminC.cpp
-  }
-
-  Header_Files {
-    CosTypedEventCommC.h
-    CosTypedEventChannelAdminC.h
-  }
-
-  Inline_Files {
-    CosTypedEventCommC.inl
-    CosTypedEventChannelAdminC.inl
+  Source_Files(ORBSVCS_COMPONENTS) {
+    CosEvent {
+      CosTypedEventCommC.cpp
+      CosTypedEventChannelAdminC.cpp
+      CosTypedEventCommS.cpp
+      CosTypedEventChannelAdminS.cpp
+      CosEvent/CEC_TypedEvent.cpp
+      CosEvent/CEC_TypedEventChannel.cpp
+      CosEvent/CEC_TypedProxyPushConsumer.cpp
+      CosEvent/CEC_TypedConsumerAdmin.cpp
+      CosEvent/CEC_TypedSupplierAdmin.cpp
+      CosEvent/CEC_DynamicImplementation.cpp
+    }
   }
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index 68953a71771..e043721e26d 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -1,8 +1,8 @@
 #include "ORBInitializer.h"
 #include "ServerRequestInterceptor.h"
 
-#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 #include "tao/ORB_Constants.h"
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
index d089c75ee9e..773e034dace 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
index 3e2bd11f9b2..9eb4bbd955f 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
index 079da1f50f9..7c40937df34 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
@@ -1,8 +1,9 @@
 // $Id$
-project: orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project: orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     driver.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
index 8071ce1b8d5..37968d5d018 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
@@ -1,18 +1,20 @@
 // $Id$
-project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {    
+project(*server): orbsvcsexe, rtcorbaevent, strategies {    
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     server.cpp
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project(*client): orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
index 21b9f66db74..b30da066e4c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -1,8 +1,9 @@
 // $Id$
-project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project(*server): orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     server.cpp
@@ -10,10 +11,11 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project(*client): orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     TestC.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
index b0f8e782677..888b449e615 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -1,8 +1,9 @@
 // $Id$
-project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project(*server): orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     server.cpp
@@ -11,10 +12,11 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project(*client): orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
index 431a4fbd726..b19cf565d20 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
@@ -1,18 +1,20 @@
 // $Id$
-project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     server.cpp
   }
 }
 
-project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index b07d2c9add2..c61cd9640f8 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -9,8 +9,8 @@
 #include "ORB_Task.h"
 #include "ORB_Task_Activator.h"
 
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
index b337568bab2..abef2e1dff7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
@@ -1,18 +1,20 @@
 // $Id$
-project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project(*server): orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     server.cpp
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+project(*client): orbsvcsexe, rtcorbaevent, strategies {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
+  avoids   += minimum_corba
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 5fc7489897e..63ff884f656 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -8,7 +8,7 @@
 
 #include "Consumer.h"
 #include "Implicit_Deactivator.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (TAO_PERF_RTEC, 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index 9a982381130..fb105da7511 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
@@ -9,8 +9,8 @@
 #define TAO_PERF_RTEC_CONSUMER_H
 
 #include "rtec_perf_export.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #include "ace/Sample_History.h"
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index b35d809551c..86f846853d5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -11,7 +11,7 @@
 #include "Shutdown.h"
 #include "Auto_Disconnect.h"
 
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #include "ace/High_Res_Timer.h"
 #include "ace/Sample_History.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
index 0c622a996a8..1c160b0370d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
@@ -10,7 +10,7 @@
 #define TAO_PERF_RTEC_EC_DESTROYER_H
 
 #include "rtec_perf_export.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 2c3d1f8084e..cb7693306f9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -8,7 +8,7 @@
 
 #include "Loopback_Consumer.h"
 #include "Implicit_Deactivator.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 ACE_RCSID (PERF_RTEC, 
            Loopback_Consumer, 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index b3e05ea1c10..ba25bc40a16 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
@@ -10,8 +10,8 @@
 
 #include "Loopback_Supplier.h"
 #include "tao/Utils/Servant_Var.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 084c2bd1341..75bfd1cb88f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
@@ -10,8 +10,8 @@
 #define TAO_RTEC_LOOPBACK_SUPPLIER_H
 
 #include "rtec_perf_export.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 74741e0f8be..906dacdfdcd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -15,8 +15,8 @@
 #include "Auto_Disconnect.h"
 #include "Loopback.h"
 
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
 
 ACE_RCSID (TAO_RTEC_Perf, 
            Peer_Base, 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index 3733441998b..aaed29be88d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
@@ -11,7 +11,7 @@
 #define TAO_RTEC_PERF_PEER_BASE_H
 
 #include "Federated_TestS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
index 408b52b3557..f5516c30508 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
@@ -9,9 +9,9 @@
 #include "RTEC_Initializer.h"
 #include "RTCORBA_Setup.h"
 
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_RTCORBA_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h"
 
 #include "ace/Dynamic_Service.h"
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
index 2f7c48e06c2..35ee463a899 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
@@ -1,5 +1,6 @@
 // $Id$
-project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba, minimum_corba {
+project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba {
+  avoids += minimum_corba
   sharedname     = TAO_RTEC_Perf
   idlflags      += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h
   dynamicflags  += TAO_RTEC_PERF_BUILD_DLL
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index 4e4260a89f9..096d2f09cbd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
@@ -8,7 +8,7 @@
 
 #include "Send_Task.h"
 
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "ace/Barrier.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index 6a04b5f7049..cc3878a8be1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
@@ -10,8 +10,8 @@
 #define TAO_PERF_RTEC_SUPPLIER_H
 
 #include "rtec_perf_export.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index 8045519e6bc..3c67f88ee21 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 #include "tao/PortableServer/PortableServer.h"
 
 class Endpoint_Addresses
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index de4512bf7da..ec98f79d6bd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -2,7 +2,7 @@
 
 #include "distributer.h"
 #include "ace/Get_Opt.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 typedef ACE_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 319f6287193..a2218860dff 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -19,9 +19,9 @@
 // ============================================================================
 
 #include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input
new file mode 100644
index 00000000000..b062e42bbaa
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input
@@ -0,0 +1,4000 @@
+Wed Apr 11 20:36:36 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* examples/Synch/proc_sema.cpp (main): Fixd an assigning string
+	  literal to char* warning.
+
+Wed Apr 11 18:04:33 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.bin.GNU: Change the Visual Age C++
+          incremental build command to use vacbld_r, the thread-enabled
+          variant of vacbld.
+
+Wed Apr 11 11:00:50 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ACE-INSTALL.html: Added a section illustrating how to build
+	  ACE+TAO for RTEMS.  Thanks to Joel Sherrill <joel@OARcorp.com>
+ 	  for this build procedure.
+
+Wed Apr 11 11:38:37 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/IOStream.h: Reverted change from
+          Tue Apr 10 18:35:22 2001  Steve Huston  <shuston@riverace.com>
+          and replaced it with a section that sets ACE_LACKS_ACE_IOSTREAM
+          if ACE_HAS_STANDARD_CPP_LIBRARY is set and ACE_USES_OLD_IOSTREAMS
+          is not. This restriction is noted and tracked in Bugzilla # 857.
+
+        * ace/IOStream.cpp:
+        * tests/IOStream_Test.cpp: Reverted change from
+          Tue Apr 10 18:35:22 2001  Steve Huston  <shuston@riverace.com>
+
+Wed Apr 11 09:44:32 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/Misc/test_trace.cpp:
+
+          Fixed a strange compiler error with Tornado II.
+          My_Task::recursive was inline which caused an internal compiler
+          error.
+
+Wed Apr 11 08:04:21 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * include/makeinclude/platform_linux.GNU: By default, we build
+          ACE+TAO with exceptions enabled on Linux.  Thanks to Craig
+          Rodrigues <crodrigu@bbn.com> for motivating this change.
+
+        * ace/SString.i (operator+): Fixed an "inlined before use" warning.
+          Thanks to Bala for reporting this.
+
+Tue Apr 10 16:58:54 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS):
+
+          Changed the default values on UNIX from 0666 and 0777 to 0644
+          and 0755, i.e. removed global write permissions.  This addresses
+          some security issues.  Now, only the owner has write permissions
+          by default.
+
+Tue Apr 10 18:35:22 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU: Added a new
+          build option, stdcpplib, which defaults to 1. If set to 1,
+          Sun Workshop 5 and Forte 6 compilers will use the standard
+          C++ library, including standard iostreams. Set to 0 to
+          use the old, classic iostreams.
+
+        * include/makeinclude/platform_hpux_aCC.GNU: Added support for
+          the stdcpplib build option. It defaults to 1 if using aC++
+          x.27, or 0 if not. Thanks very much to Istvan Buki <ibuki@fedex.com>
+          for these changes.
+
+        * ace/config-aix-4.x.h: For Visual Age C++ 5, turn on
+          ACE_HAS_STANDARD_CPP_LIBRARY and
+          ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB.
+
+        * ace/config-sunos5.5.h: For Sun Workshop 5 and Forte 6 compilers,
+          take the ACE_USES_OLD_IOSTREAMS setting from the platform_macros.GNU
+          file; don't set it here.
+
+        * ace/config-hpux-11.00.h:
+        * ace/config-hpux-10.x-hpc++.h: If the stdcpplib=1 option was used,
+          then turn on ACE_HAS_STANDARD_CPP_LIB and
+          ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. Else turn on
+          ACE_USES_OLD_IOSTREAMS.
+
+        * ace/IOStream.{h cpp}: Only try to build this stuff if
+          ACE_LACKS_ACE_IOSTREAM is not defined and ACE_USES_OLD_IOSTREAMS
+          _is_ defined. The check on ACE_USES_OLD_IOSTREAMS can be removed
+          when ACE_IOStream gets ported to standard iostreams.
+
+        * tests/IOStream_Test.cpp: Only try this if ACE_USES_OLD_IOSTREAMS
+          is defined. Remove this if/when ACE_IOStream is ported to new
+          iostreams.
+
+Tue Apr 10 17:51:25 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+          Added TAO/tests/OctetSeq/run_test1{2}.pl to auto testing.
+
+Tue Apr 10 16:33:42 2001  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * ace/CDR_Stream.i:
+        * ace/CDR_Stream.cpp:
+          Added sanity checks for sizes of strings and arrays.
+
+Tue Apr 10 15:14:52 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_vxworks5.x_g++.GNU:
+
+          Added missing else/endif from previous support addition.
+
+Tue Apr 10 11:48:51 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * include/makeinclude/platform_vxworks5.x_g++.GNU: Added support
+          for the M68k line of CPUs.  Thanks to Albert Pariante
+           <albert@sw.bev.etn.com> for reporting this.
+
+Tue Apr 10 02:14:55 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * bin/PerlACE/Run_Test.pm (check_n_cleanup_files): Added a new
+          PerlACE function that checks for unwanted files and spits out a
+          warning before removing the file.  It makes sure that we not
+          only clean up resource leaks but also notice their existence.
+
+        * tests/run_test.pl (delete_temp_files): Used the new
+          <check_n_cleanup_files> to remove the temp files for
+          MEM_Stream_Test, if there are any.
+
+Tue Apr  10 1:44:02 2001  Yamuna Krishnamurthy  <yamuna@ace.cs.wustl.edu>
+
+        * examples/QOS/Change_Sender_TSpec/receiver.cpp:
+        * examples/QOS/Change_Sender_TSpec/receiver.dsp:
+        * examples/QOS/Change_Sender_TSpec/sender.cpp:
+        * examples/QOS/Change_Sender_TSpec/sender.dsp:
+        * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h:
+        * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp:
+        * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h:
+        * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp:
+        * examples/QOS/Change_Sender_TSpec/QoS_Util.h:
+        * examples/QOS/Change_Sender_TSpec/QoS_Util.cpp:
+        * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h:
+        * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp:
+        * examples/QOS/Change_Sender_TSpec/FlowSpec_Dbase.h:
+        * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h:
+        * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp:
+        * examples/QOS/Change_Sender_TSpec/README:
+        * examples/QOS/Change_Sender_TSpec/Makefile:
+
+          Added a test to dynamically change the Sender flow spec in
+          order to continuously change the PATH messages.
+
+        * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/receiver.dsp:
+        * examples/QOS/Change_Receiver_FlowSpec/sender.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/sender.dsp:
+        * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h:
+        * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h:
+        * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h:
+        * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h:
+        * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/FlowSpec_Dbase.h:
+        * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h:
+        * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/README:
+        * examples/QOS/Change_Receiver_FlowSpec/Makefile:
+
+          Added a test to dynamically change the Receiver flow spec in
+          order to continuously change the RESV messages.
+
+        * examples/QOS/Simple/receiver.cpp:
+        * examples/QOS/Simple/receiver.dsp:
+        * examples/QOS/Simple/sender.cpp:
+        * examples/QOS/Simple/sender.dsp:
+        * examples/QOS/Simple/Sender_QoS_Event_Handler.h:
+        * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp:
+        * examples/QOS/Simple/Receiver_QoS_Event_Handler.h:
+        * examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp:
+        * examples/QOS/Simple/QoS_Util.h:
+        * examples/QOS/Simple/QoS_Util.cpp:
+        * examples/QOS/Simple/QoS_Signal_Handler.h:
+        * examples/QOS/Simple/QoS_Signal_Handler.cpp:
+        * examples/QOS/Simple/FlowSpec_Dbase.h:
+        * examples/QOS/Simple/Fill_ACE_QoS.h:
+        * examples/QOS/Simple/Fill_ACE_QoS.cpp:
+        * examples/QOS/Simple/README:
+        * examples/QOS/Simple/Makefile:
+
+          Moved the original QOS example to Simple.
+
+        * examples/QOS/Makefile:
+        * examples/QOS/QOS.dsw:
+
+          Updated the Makefile to compile the constituent tests.
+
+Mon Apr  9 18:48:02 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * include/makeinclude/Makefile.rtems: Zapped
+
+          export RTEMS_MAKEFILE_PATH=/opt/rtems/sparc-rtems/erc32/
+
+          so that the environment variable is obtained from the users
+          environment.  Thanks to Joel Sherrill <joel@OARcorp.com> for
+          this fix.
+
+        * ace/Log_Msg.h: Only define the ACE_ASSERT macro if it's not
+          already defined.  This make it easy for developers to override
+          this macro in their config.h file.  Thanks to Nathalie D'Amours
+          <nathalie@stentor.com> for motivating this change.
+
+Mon Apr  9 15:36:04 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/High_Res_Timer.cpp:
+          Use the 'cpu MHz' line from /proc/cpuinfo in favor of the
+          'bogomips' line, because the latter gives the wrong number on
+          multi-CPU boxes.
+
+Mon Apr  9 14:37:30 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp:
+
+          Removed extraneous template instantiations.
+
+Mon Apr 09 09:19:37 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/SString.cpp:
+          Fixed Fuzz error
+
+Mon Apr  9 08:28:47 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/SString.{h,i,cpp}: Added improved support for ACE_WString:
+          . The magic number 32 has been changed to ACE_DEFAULT_GROWSIZE.
+          . ACE_WString only allocates memory when it is needed.
+          . The grow strategy can be modified by setting the ACE_GROW_LINEAR define.
+            the string does not double the memory then, but increases the memory by
+            ACE_DEFAULT_GROWSIZE.
+          Thanks to Eric Zuur <Eric.Zuur@meco.nl> for contributing these
+          enhancements.
+
+        * ace/High_Res_Timer.cpp (get_cpuinfo): Added support for the Pentium
+          III and IV.  Thanks to Stephane Pion
+          <PION_Stephane@stna.dgac.fr> for contributing this fix.
+
+Mon Apr  9 07:50:08 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/Makefile:
+          Fixed a typo in the Makefile and added "CPP-inclient.h" include to
+          CPP-memclient.cpp.
+
+Mon Apr  9 07:42:29 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Basic_Types.cpp:
+          Changed format flags from ios::fmtflags to unsigned long.
+          This typedef is not supported by all platforms.  Thanks Carlos
+          <coryan@uci.edu> for suggesting this change.
+
+Mon Apr 09 08:08:11 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * ace/Timer_Queue_T.h
+          Declared private copy constructor and assignment operator
+          for class ACE_Event_Handler_Handle_Timeout_Upcall
+
+Sun Apr 08 18:55:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/DLL_Test.cpp:
+          Use ACE::ldname() instead of keeping a local function to
+          decorate the name.
+          Use the "d" suffix only on MSVC debug builds.
+
+        * tests/Makefile.bor:
+        * tests/DLL_Test.bor:
+          New Borland Makefile for the shared library in DLL_Test.  Thanks
+          to Christopher Kohlhoff  <chris@kohlhoff.com> for providing the
+          patches.
+
+        * tests/run_test.pl:
+          Add ExeSubDir to the path, required in Borland builds to find
+          the shared libraries created locally.
+
+Sun Apr  8 13:12:54 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/SString.cpp: Reordered various constructor initializers so
+          G++ doesn't complain.  Thanks to Bala for reporting this.
+
+        * ace/SString.{h,i,cpp}: Added various optimizations to ACE_WString
+          so it will perform certain operations as efficiently as
+          ACE_CString.  Thanks to Eric Zuur <Eric.Zuur@meco.nl> for
+          contributing these enhancements.
+
+Sun Apr 08 12:10:30 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp:
+        * examples/IPC_SAP/SOCK_SAP/Makefile: Updated obsolete
+          shared-memory transport functions.
+
+Sun Apr  8 09:49:26 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * bin: Added a new shell script called "make-components" that enables
+          each ACE component to be built in a simple manner using the
+          following change from Arturo.
+
+        * ace/Makefile: Generalized the libACE.a and libACE.$(SOEXT) targets
+          to simplify subsettings.  Thanks to Arturo Montes
+          <mitosys@colomsat.net.co> for reporting this.
+
+Sat Apr  7 16:00:48 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * tests: Added a new rtems_init.c file.  Thanks to Joel Sherrill
+          <joel@OARcorp.com> for contributing this port.
+
+        * include/makeinclude: Added the new platform_rtems.x_g++.GNU file.
+        * ace: Added the new config-rtems.h file.
+
+        * ace/OS.cpp: Added support for RTEMS, which is an open-source
+          real-time operating system that can be downloaded from
+          ftp://ftp.oarcorp.com/pub/rtems.  Thanks to Joel Sherrill
+          <joel@OARcorp.com> for contributing this port.
+
+        * ace/OS.cpp: The return type for ACE_OS::readv_emulation()
+          should have been ssize_t, not int, to be consistent with its
+          definition in the header file.  Thanks to Joel Sherrill
+          <joel@OARcorp.com> for reporting this.
+
+Sat Apr  7 21:16:49 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Add the new Crash_On_Write and MT_Timeout tests to the nightly
+          builds.
+
+Fri Apr  6 21:02:05 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/Synch/proc_sema.cpp:
+          Add missing #include for "ace/Log_Msg.h", on platforms that
+          define ACE_TEMPLATES_REQUIRE_SOURCE this include is magically
+          obtained, but this is not the case for SunCC 4.2, and
+          True64/CXX.
+
+Fri Apr 06 16:22:24 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/SString.h (ACE_Tokenizer): Updated documentation and added
+          some examples.  Thanks to Jody Hagins <jody@atdesk.com> for
+          providing the original example.
+
+Fri Apr  6 17:11:34 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst: Added the Single_Read test to the
+          nightly build list.
+
+Fri Apr  6 14:45:52 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Basic_Types.h:
+        * ace/Basic_Types.cpp:
+          Changed the as_string() method to avoid using floor() which
+          required math.h and ACE_CString which caused unnecessary coupling.
+
+Fri Apr  6 08:34:15 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/make_pretty.pl:
+          Do no give out warnings for the 'nocompatwarnings' option in
+          HP-UX.
+
+Fri Apr  6 08:23:02 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Basic_Types.cpp:
+        * ace/Basic_Types.h:
+        * tests/Process_Strategy_Test.cpp:
+        * examples/Connection/misc/Connection_Handler.cpp:
+          Remove build warnings for platforms that don't support unsigned
+          long long types and have unsigned char's.
+
+Fri Apr  6 02:02:01 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/OS.h:
+        * ace/OS.i: The implementation for process semaphore on platforms
+          lacking named POSIX semaphores was broken.  On these platforms,
+          semaphores are allocated in MMAP file so they should never be
+          deleted.  Added a flag <new_sema_> to remember if a semaphore
+          can be deleted (USYNC_THREAD) or not (USYNC_PROCESS).
+
+        * ace/config-sunos5.6.h: According to the man pages, SunOS started
+          supporting POSIX semaphores from 5.6.  Defined ACE_HAS_POSIX_SEM
+          and ACE_LACKS_NAMED_POSIX_SEM.
+
+Thu Apr  5 11:23:05 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * html/index.html:
+          Add link to the new QoS library documentation.
+
+Thu Apr 05 03:26:13 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * examples/Makefile:
+        * examples/Synch/Makefile:
+        * examples/Synch/README:
+        * examples/Synch/Synch.dsw:
+        * examples/Synch/proc_sema.cpp:
+        * examples/Synch/proc_sema.dsp: Added a new example to play with
+          process semaphores.
+
+Thu Apr 05 02:48:51 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_IO.cpp (write): My earlier change was causing the test
+          to crash.
+
+        * ace/MEM_Stream.h:
+        * ace/MEM_Stream.i:
+        * ace/MEM_Stream.cpp: Added a new method to inform the stream to
+          clean up its resources when closing down.
+
+        * tests/MEM_Stream_Test.cpp (handle_close): Handle_close should
+          only inform it's peer to destroy the mmap file instead of
+          removing the file itself.
+
+Wed Apr  4 16:21:13 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added the ImplRepo tests.
+
+Wed Apr  4 12:13:52 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_IO.h: Declared ACE_INLINE_FOR_GNUC for
+          ACE_MT_MEM_IO::Simple_Queue's constructor to eliminate a bogus
+          warning reported by vxworks' gcc compiler.
+
+Wed Apr 04 07:47:48 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * etc/ace_qos.doxygen:
+        * bin/generate_doxygen.pl:
+          Generate doxygen documentation for ACE QoS API
+
+Tue Apr 03 19:55:26 2001  Steve Huston  <shuston@riverace.com>
+
+        * bin/auto_compile: Added a -make_type option - the argument to
+          the option is the suffix of Makefile to use. Example:
+          -make_type vac  would use Makefile.vac instead of Makefile
+          when building.
+
+        * bin/make_pretty.pl: Corrected tests for AIX errors/warnings.
+
+        * ace/ace.icp: (new) Visual Age C++ 5 project file for libACE.
+
+        * ace/ace.icc: (new) Visual Age C++ 5 configuration file for
+          libACE. Replaces ace-dll.icc. It will eventually have the
+          stuff added to make debug/optimize as well as subsets.
+
+        * ace/ace_vacpp_options.icc: Visual Age C++ file for setting ACE
+          build options.
+
+        * ace/Makefile.vac: Makefile to build libACE using the Visual
+          Age C++ 5 incremental compiler. It only has "all" and "realclean"
+          targets, and uses vacbld_r to do the build.
+
+        * tests/tests.icp: Visual Age C++ 5 Project file for making all the
+          tests.
+
+        * tests/Makefile.vac: Makefile to drive vacbld_r for Visual Age C++.
+
+        * tests/Config_Test.icc:
+        * tests/Dirent_Test.icc:
+        * tests/Logging_Strategy_Test.icc:
+        * tests/MEM_Stream_Test.icc:
+        * tests/Message_Queue_Test_Ex.icc:
+        * tests/OS_Test.icc:
+             New files for building tests with Visual Age C++.
+
+        * tests/libDLL_Test.icc: Changed to use up-to-date source file.
+
+Tue Apr 03 13:45:02 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_IO.cpp: Fixed mismatched ACE_TRACE messages.  Thanks to
+          the all mighty fuzzmasterd for reporting this.
+
+Tue Apr  3 11:40:42 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * examples/IPC_SAP/SSL_SAP/dummy.pem:
+        * examples/IPC_SAP/SSL_SAP/key.pem:
+          The previous certificates expired. So, generated them
+          again.
+
+Tue Apr 03 09:30:10 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_IO.cpp (write): Fixed a compilation error for Borland
+          compiler.  Thanks to Johnny Willensen for reporting this.
+
+Mon Apr 02 23:41:34 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_SAP.cpp:
+        * ace/MEM_SAP.h:
+        * ace/MEM_SAP.i:
+          Generalized the ACE_MEM_SAP class to allocate memory in the new
+          memory wrapper class ACE_MEM_SAP_Node.
+
+        * ace/MEM_IO.cpp:
+        * ace/MEM_IO.h:
+        * ace/MEM_IO.i:
+          Separated the different signaling mechanisms into a different
+          class in ACE_MEM_IO so it can determine the "right" signaling
+          strategy allowed.  Currently, we implement the Reactive strategy
+          (ACE_Reactive_MEM_IO) which uses sockets for signaling and
+          multithreaded strategy (ACE_MT_MEM_IO) which uses semaphores for
+          signaling.
+
+        * ace/MEM_Stream.cpp:
+          Sending an empty buffer over to wake up the "other" end when we
+          are closing down.
+
+        * ace/MEM_Acceptor.cpp:
+        * ace/MEM_Acceptor.h:
+        * ace/MEM_Acceptor.i:
+        * ace/MEM_Connector.cpp:
+        * ace/MEM_Connector.h:
+        * ace/MEM_Connector.i: Added facility to specify the "preferred"
+          signaling strategy so the acceptor and connector can negociate
+          and agree on the best signaling mechanism to use.
+
+        * ace/MEM_Stream_Test.h:
+        * ace/MEM_Stream_Test.cpp:
+          Added the test for the new MT signaling MEM_Stream transfer.
+          This part of the test seems to be failing on system that depends
+          on SysV semaphores (because we need more semaphore than the
+          system can provide.)
+
+Mon Apr  2 15:17:13 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/config-chorus.h:
+
+          Chorus 4.x supports unsigned long long's.
+
+Mon Apr  2 14:23:31 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * ace/Makefile:
+            only build QoS directory under UNIX if rapi is installed
+        * ace/QoS/README:
+            add installation instructions and GQOS/RAPI information
+
+Mon Apr  2 09:57:31 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/PerlACE/MSProject.pm:
+
+          Made a change to the tao_idl depencency checking.
+          It was only checking for tao_idl and $(InputName) where
+          some places we use $(InputPath) instead.
+
+        * ace/config-win32-msvc-5.h:
+        * ace/config-win32-msvc-6.h:
+
+          Disabled the Inheritance by Dominance informational
+          warning that MSVC gives.  We have cases of this all over
+          the place, and normally we just disable the warning on
+          a file by file basis, but now we just do a blanket disable.
+
+Mon Apr  2 08:45:24 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+          Renamed the Debian_Full_WU build, its most important feature is
+          not that it is at WashU nor that it enables most components.  It
+          is the fact that interceptors are disabled on its configuration.
+
+Sun Apr  1 17:20:22 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/INET_Addr.h:
+
+          Added /**/ around for the inclusion of inetLib.h, since some
+          MS compilers pick this up in dependency generation.
+
+        * bin/PerlACE/MSProject.pm:
+
+          Used \Q\E around the library names when matching, otherwise
+          the backslashes were interpreted as escaping, and weird
+          unicode errors popped up.
+
+        * bin/pippen.pl:
+
+          Pippen was being case sensitive, so tao.lib was different
+          than TAO.lib.  Changes to store only lowercase.
+
+Sat Mar 31 10:16:01 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ACE-INSTALL.html:
+          Removed broken link, the web page does not exist anymore. Thanks
+          to John R. Ashmun <john.ashmun@esca.com> for pointing this out.
+          This fixes [BUGID:833]
+
+Fri Mar 30 14:08:18 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * performance-tests/TTCP/C/new-ttcp.cpp:
+        * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp:
+          Zapped the gettimeofday() method since it didn't seem to be
+          used.  Also, #include "ace/Log_Msg.h".  Thanks to Thomas Groth
+          <groth.th@nord-com.net> for reporting this.
+
+        * ace/OS.h: Changed all the ACE_DEFAULT_* default ports of the
+          various services to start with 200xx rather than 100xx to avoid
+          conflicts on AIX, which apparently hijacks port 10002 for
+          various things.  Thanks to David Sperry
+          <sperryd@res.raytheon.com> for reporting this.
+
+Sat Mar 31 02:06:09 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * ace/config-win32-borland.h:
+        * include/makeinclude/ace_flags.bor:
+          Fixed up use of inline functions in DEBUG build.
+
+        * include/makeinclude/ace_flags.bor:
+          Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory
+          libraries.
+
+Fri Mar 30 11:17:39 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/fuzz.pl:
+          Add a couple of TODO entries
+
+        * html/index.html:
+          Add the Audio/Video Streaming service to the index file.
+
+Fri Mar 30 11:12:53 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/*/Makefile:
+        * apps/*/Makefile:
+        * docs/*/Makefile:
+        * examples/*/Makefile:
+        * netsvcs/*/Makefile:
+        * performance-tests/*/Makefile:
+        * tests/*/Makefile:
+        * websvcs/*/Makefile:
+        * ASNMP/*/Makefile:
+          Regenerate dependencies.
+
+Fri Mar 30 08:15:26 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/QoS/QoS_Session.h:
+          Add #include for ACE_QoS_Export
+
+Fri Mar 30 07:31:54 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/QoS/QoS_Session.h:
+          Fixed export macro
+
+Thu Mar 29 20:14:00 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * ace/SOCK.h:
+           Remove include of QoS_Session.h, since it is not used here.
+
+Thu Mar 29 19:48:00 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * ace/QoS_Session.h:
+        * ace/QoS/QoS_Manager.h:
+        * ace/QoS/QoS_Session_Impl.h:
+        * ace/QoS/QoS_Session_Factory.h:
+        * examples/QOS/QoS_Signal_Handler.h:
+        * examples/QOS/Receiver_QoS_Event_Handler.h:
+        * examples/QOS/client.cpp:
+        * examples/QOS/QoS_Util.h:
+        * examples/QOS/Sender_QoS_Event_Handler.h:
+        * examples/QOS/server.cpp:
+        * examples/QOS/Makefile:
+
+        Move QoS_Session.h to the ace/QoS directory.
+
+Thu Mar 29 19:12:38 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.lib.GNU: AIX-specific changes to
+          build shared libraries by making a shared shr.o file and putting
+          that into an archive. Seems weird, but that's the way AIX does
+          things. This makes ACE consistent with other AIX software.
+
+        * include/makeinclude/platform_aix4_cset++.GNU: Made some changes
+          to attempt to work with the new scheme for shared lib creation on
+          AIX. Did not test it, and don't plan to. The CSet++ compiler is not
+          supported by IBM any longer, and Riverace is not supporting ACE
+          with it. If someone out there sends patches for this, I'll put
+          them in, but this file is going away after ACE 5.2 is released.
+          All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++
+          in batch mode) should be with the platform_aix_ibm.GNU file.
+
+Thu Mar 29 16:16:07 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/Token.cpp (renew): A conditional expression used an && rather
+          and ||, which was causing problems with ACE_Token.  Thanks to
+          Carsten Madsen <com@navicon.dk> for reporting this.
+
+        * ace/Message_Queue_T.cpp: If any of the various ACE_Message_Queue_Ex
+          enqueue*() methods fail then make sure to release the message
+          blocks!  Thanks to Boris Kolpackov <bosk@ipmce.ru> for reporting
+          this.
+
+Wed Mar 28 21:39:26 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/NT_Service.h:
+
+          Changed the ACE_NT_SERVICE macros to use ACE_TEXT_* API
+          calls for those that can take in unicode strings.
+
+        * examples/NT_Service/main.cpp:
+
+          Fixed use of ACE_NT_SERVICE to work with ACE_USES_WCHAR.
+
+        * examples/OS/Process/process.cpp:
+        * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp:
+
+          Changed some Win32 API calls to use ACE_TEXT_* equivalents.
+
+        * ace/ace_wchar.h:
+
+          Added all the ACE_TEXT_* API macros needed above.
+
+          Thanks to Nick Pratt <npratt@microstrategy.com> for
+          reporting the first of these errors.
+
+Wed Mar 28 22:07:03 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * tests/tests.dsw: Fixed project dependencies between DLL_Test and
+          DLL_Test_Impl.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be>
+          for reporting this.
+
+Wed Mar 28 20:33:28 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/ACE.cpp: Further improved the implementation of
+          handle_ready() by simply calling poll() with the timeout
+          pointer.  Thanks to Przemyslaw Marciniak <pmarciniak@lucent.com>
+          for reporting this.
+
+Wed Mar 28 17:45:22 2001  Steve Huston  <shuston@riverace.com>
+
+        * bin/make_pretty.pl: Adjust the error detector for IBM C/C++ 3.6.6.
+
+        * ace/Containers_T.cpp: Add #include "ace/Log_Msg.h" so IBM C/C++
+          can see ACE_DEBUG when compiling template instantiations.
+
+Wed Mar 28 16:40:24 2001  Luther Baker  <luther@cs.wustl.edu>
+
+        * ace/config-all.h
+
+          Removed ACE_WIN32 support for ACE_HAS_POSIX_SEM just because
+          ACE_HAS_PACE. This can be defined for ACE_WIN32 after we
+          write more WIN32 emulation.
+
+        * ace/OS.h
+        * ace/OS.i
+        * ace/OS.cpp
+
+          PACE updates.
+
+Wed Mar 28 11:37:09 2001  Fuzz Master D <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          There are several instances where fuzz gives false
+          positives, and the code is impossible to fix without
+          creating compiler warnings.  Example:
+
+          void function (CORBA::Environment &ACE_TRY_ENV)
+          {
+          #if FOO
+              some_other_function (ACE_TRY_ENV);
+              ACE_CHECK;
+          #else
+              ACE_UNUSED_ARG (ACE_TRY_ENV);
+          #endif
+          }
+
+          So normally ACE_UNUSED_ARG errors can be fixed by keeping
+          the CORBA::ENvironment unnamed and removing the ACE_UNUSED_ARG,
+          but in this case it isn't possible.  So fuzz now accepts
+          an ignore command for single line use.  The above can be fixed
+          by changing to:
+
+          void function (CORBA::Environment &ACE_TRY_ENV)
+          {
+          #if FOO
+              some_other_function (ACE_TRY_ENV);
+              ACE_CHECK;
+          #else
+              ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+          #endif
+          }
+
+Tue Mar 28 13:03:07 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/make_pretty.pl:
+          Modification to recognize HP's future errors as warnings.
+
+Wed Mar 28 11:34:54 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
+
+        * ace/CDR_Base.inl:
+          Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY ==
+          1, since it was causing some TAO unit tests to break (in
+          particular, the Portable_Interceptors/Service_Context_Manipulation
+          test).  After running Cubit and a few other tests, Purify didn't
+          notice any more uninitialized memory accesses.  Fixes bug #828.
+
+Wed Mar 28 11:55:39 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_aix_ibm.GNU: New file, replaces
+          platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces
+          use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6.
+          So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6
+          and Visual Age C++ 5) use this file. If you want to try to keep
+          using CSet++ 3.4 or earlier, you can keep using
+          platform_aix4_cset++.GNU, but it's not tested any longer and
+          will disappear at the next ACE version. If you want to use
+          Visual Age C++ 4, you should reconsider, and upgrade to version 5.
+
+        * include/makeinclude/platform_aix_vacpp.GNU: Deleted.
+
+        * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h"
+          to be after #include "ace/SOCK_Connector.h" to fix compile error
+          on AIX, Visual Age C++ 5.
+
+        * ace/config-aix-4.x.h: Clarified comments that this file is for
+          Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what
+          is now generated from platform_aix_ibm.GNU.
+
+        * bin/auto_compile:
+        * bin/make_pretty.pl: Add detection of compile/link warnings and
+          errors for AIX using the IBM compilers' code. Ignores the multiply
+          defined symbol warnings from ld if it's an ACE symbol.
+
+        * docs/ACE-development-process.html: Changed to link to Bugzilla so
+          it works from anywhere.
+
+Wed Mar 28 10:13:16 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Makefile.bor: Don't try to build the SSL directory if
+          SSL_ROOT is not set.
+
+Wed Mar 28 08:39:26 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * etc/tao_av.doxygen:
+          New configuration file for the AV streaming service.  Many
+          thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that
+          directory.
+
+        * bin/generate_doxygen.pl:
+          Add the new configuration file.
+
+Tue Mar 27 19:54:11 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Disable POA/On_Demand_Loading and POA/Loader for Linux/KCC
+          builds, because that compiler has problems with destructors
+          after dynamic loading.
+          Also add the new Hello test to the nightly regression tests.
+
+Tue Mar 27 19:43:39 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_linux.GNU:
+          Add support for Insure++
+
+        * include/makeinclude/rules.local.GNU:
+          Add new macro to let developers change the default destination
+          for the dependencies.
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Let the user override the default VDIR directory, and define the
+          default values for the IDL generated code extensions.
+
+          Thanks to Jody Hagins <jody@atdesk.com> for all these
+          improvements.
+
+Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Unbounded_Queue.h:
+          Add required #include for Chorus builds.
+
+Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/ACE.cpp (handle_ready): Don't try to dereference through
+          a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+          <pmarciniak@lucent.com> for reporting this.
+
+Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Select_Reactor_Base.h:
+          Add missing #include for builds that define
+          ACE_HAS_REACTOR_NOTIFICATION_QUEUE.
+
+Tue Mar 27 05:35:38 2001  Christopher Kohlhoff <chris@kohlhoff.com>
+
+        * include/makeinclude/make_flags.bor:
+        Prevent PASCAL build by default with BCB5 since it is not required.
+        Since both VCL and non-VCL applications share a common run-time
+        library you can simply link your VCL code with a non-PASCAL build
+        of the ACE+TAO libraries. This behaviour can be overridden by
+        defining the FORCE_PASCAL flag.
+
+        * include/makeinclude/build_core_exe.bor:
+        * include/makeinclude/build_core_library.bor:
+        * include/makeinclude/build_dll.bor:
+        * include/makeinclude/build_exe.bor:
+        * include/makeinclude/build_lib.bor:
+        * include/makeinclude/clean.bor:
+        Build all executables into a directory below the source directory.
+        Core executables are then copied to the common bin directory. This
+        is to allow the test scripts to assume all executables can be
+        found relative to the source directory.
+
+        * include/makeinclude/recurse.bor:
+        Removed definition of OBJFILES since Borland make doesn't seem to
+        support recursive macro expansion.
+
+        * ace/config-win32-borland.h:
+        * include/makeinclude/ace_flags.bor:
+        Always explicitly define __ACE_INLINE__, with it defaulting to 1.
+        This change will allow the same compiler flags to be used in user
+        applications regardless of whether a debug or non-debug build of
+        ACE is being used.
+
+Tue Mar 27 09:48:33 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * include/makeinclude/ace_flags.bor
+        Corrected the smartproxies_cflags
+
+        * examples/IPC_SAP
+        Added new BCB makefiles for these examples
+
+        * ace/Timer_Hash_T.cpp
+        * ace/Timer_Hash_T.h
+        * ace/Timer_Heap_T.cpp
+        * ace/Timer_Heap_T.h
+        * ace/Timer_List_T.cpp
+        * ace/Timer_List_T.h
+        * ace/Timer_Wheel_T.cpp
+        * ace/Timer_Wheel_T.h
+        Made the isdone method on the iterator classes constant
+
+        * ace/Timer_Queue_T.h
+        * ace/Timer_Queue_T.i
+        Several get methods are now const
+        Argument of set_timer_value and set_interval is now passed by const reference
+
+        * ace/Unbounded_Set.h
+        * ace/Unbounded_Set.cpp
+        * tests/Collection_Test.cpp
+        Added the ACE_Unbounded_Set_Const_Iterator which can be used
+        to iterate over an const set
+
+Mon Mar 26 21:02:24 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Log_Msg_NT_Event_Log.cpp:
+
+          Fixed a compilation problem with RegSetValueEx when
+          ACE_USES_WCHAR and UNICODE were defined.  Thanks to Nick
+          Pratt <npratt@microstrategy.com> for reporting this.
+
+        * ace/ace_dll.dsp:
+
+          Unchecked the "separate types" option for debug linking.
+          Thanks to Nick Pratt for this suggestion also.
+
+Mon Mar 26 13:00:37 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Node.h:
+        * ace/Node.cpp:
+        * ace/Array_Base.h:
+        * ace/Array_Base.inl:
+        * ace/Array_Base.cpp:
+        * ace/Unbounded_Queue.h:
+        * ace/Unbounded_Queue.inl:
+        * ace/Unbounded_Queue.cpp:
+        * ace/Unbounded_Set.h:
+        * ace/Unbounded_Set.inl:
+        * ace/Unbounded_Set.cpp:
+        * ace/Containers_T.h:
+        * ace/Containers_T.i:
+        * ace/Containers_T.cpp:
+          Move several containers to their own file.  This reduces the
+          amount of code that needs to be parsed, improving compilation
+          time (not to mention the fact that the code becomes more
+          readable.)
+          For backwards compatibility the Containers file still includes
+          the new smaller files.
+
+        * ace/Makefile:
+        * ace/Makefile.am:
+        * ace/Makefile.bor:
+          Add new files to the install rules.
+          Since they are templates they do not need to be compiled on MSVC
+          so no changes to the project files are required.
+
+        * ace/ARGV.h:
+        * ace/ARGV.cpp:
+        * ace/Future.h:
+        * ace/Handle_Gobbler.h:
+        * ace/Local_Name_Space.h:
+        * ace/Malloc_Base.h:
+        * ace/Memory_Pool.h:
+        * ace/Name_Space.h:
+        * ace/Priority_Reactor.h:
+        * ace/Remote_Name_Space.h:
+        * ace/Service_Config.h:
+        * ace/Signal.cpp:
+        * ace/Signal.h:
+        * ace/Stats.h:
+        * ace/Thread_Manager.h:
+        * ace/Timeprobe_T.h:
+        * ace/Timer_Heap_T.h:
+        * ace/Timer_Queue_Adapters.h:
+        * ace/TkReactor.cpp:
+          To reduce compilation and recompilation times we only include
+          the header file that includes the container used in each case,
+          instead of the full containers class.
+
+Fri Mar 23 12:40:34 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp: Make sure
+          to delete the Consumer_Dispatch_Set * that we get back from
+          unbind().  Thanks to the ever vigilant Mike Winter
+          <mwinter@sonic.net> for reporting this.
+
+Thu Mar 22 10:18:24 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/SString.h: Make the various data members protected
+          rather than private so subclasses can access them.  Thanks to
+          Martin Krumpolec <krumpo@pobox.sk> for this suggestion.
+
+        * tests/README: Clarified some things about the tests.
+          Thanks to Eric Desamore <Eric.Desamore@idtv.bull.net> for
+          motivating this.
+
+Mon Mar 26 11:03:22 2001  Balachandran  <bala@cs.wustl.edu>
+
+        * ACE version 5.1.14 released.
+
+Sat Mar 24 07:02:35 2001  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * ace/INET_Addr.i (get_host_addr): Added a const_cast to the
+        VxWorks-only arm that casts away const on the this ptr so that
+        inet_ntoa_b can access and fill in the buffer data member that's
+        used to hold the result from inet_ntoa_b.  Thanks to Erik Johannes
+        <ejohannes@oresis.com> for point this out.
+
+Fri Mar 23 18:01:05 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst: Some of the tests cannot be run in
+          Single threaded configurations. Prevented such tests from
+          running in the nightly builds.
+
+Fri Mar 23 16:25:18 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/New_Fail_Test.cpp: Reverted the change from "Fri Mar 23
+          06:34:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>". The
+          change fails to comipile when exceptions are on.
+
+Fri Mar 23 08:47:29 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * apps/Gateway/Gateway/Options.cpp:
+          Explicitly #include Log_Msg.h, on platforms that do not define
+          ACE_TEMPLATES_REQUIRE_SOURCE the header file is not implicitly
+          included.  This should fix compilation problems on Tru64/CXX and
+          SunCC/4.2
+
+Fri Mar 23 06:34:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++,
+          No_AMI_Messaging  builds. Surprising that it showed up only in
+          this build.
+
+Thu Mar 22 21:33:37 2001  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most
+        others, and our use was causing memory leaks.  VxWorks prefers
+        that you use its own inet_ntoa_b, which takes the buffer to fill
+        as an argument.  Thus, for VxWorks, added a data member char buf
+        of the appropriate length so that get_host_addr can use
+        inet_ntoa_b to fill that in.
+
+        * ace/INET_Addr.i (get_host_addr): For VxWorks only, changed this
+        to use the preferred inet_ntoa_b.  This eliminate memory leaks
+        under VxWorks.  Thanks to Erik Johannes <ejohannes@oresis.com> for
+        the suggested fix.
+
+Wed Mar 21 19:20:02 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error
+          in g++.
+
+Wed Mar 21 17:28:26 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue.h:
+        * ace/Message_Queue_T.h: Moved definition of typedef for
+          ACE_DEFAULT_MESSAGE_QUEUE_TYPE from Message_Queue.h to
+          Message_Queue_T.h, just after defining ACE_Message_Queue<>.
+          Fixes the case where Message_Queue_T.h is included first,
+          it includes Message_Queue.h before ACE_Message_Queue<> is
+          defined, and that breaks the compile. IBM C/C++ hit this.
+
+Wed Mar 21 16:42:19 2001  Steve Huston  <shuston@riverace.com>
+
+        * bin/auto_compile: Added an option: -notao to ignore the TAO aspects
+          of the non-configurable things, like looking at the TAO/ChangeLog.
+          Also, now looks for auto_run_tests.lst in the $BUILD/bin directory,
+          not the $MODULE/bin directory - this allows some builds to specify
+          their own lists.
+
+Wed Mar 21 16:00:56 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+          The followings are contributions from Scott Snyder
+          <snyder@fnal.gov> to make ACE happy on Digital UNIX with KCC
+          3.4d.
+
+        * include/makeinclude/platform_tru64_kcc.GNU:
+        * include/makeinclude/platform_osf1_4.0_kcc.GNU: Added KCCOPTS and
+          support for tru64 unix.
+
+        * ace/OS.h: On this platform, we ran into problems with sigwait
+          being a macro.  The fix that had been added for this was keyed
+          on __DECCXX_VER, so it isn't picked up on this platform.
+
+        * ace/Sock_Connect.cpp: Enum_Interface_Test failed on this
+          platform.  The code in Socket_Connect.cpp that implements this
+          is conditional on `__unix' being defined.  However, with this
+          compiler, we get `unix' and `__unix__' defined, but not
+          `__unix'.  Fixed by testing for `__unix__' too.
+
+        * ace/ACE.cpp:  Cache_Conn_Test was failing.  It looks like the
+          code in ACE::out_of_handles doesn't have a case to handle osf1.
+
+Wed Mar 21 12:08:35 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+          The followings are contributions from Scott Snyder
+          <snyder@fnal.gov> to make ACE happy on IRIX 6.x with KCC 3.4d.
+
+        * include/makeinclude/platform_irix6.x_kcc.GNU:
+          Disable the following warings and separate common options into
+          $(KCCOPTS).
+
+          280: declaration of a member with the same name as its class Get
+          this from <netinet/in.h>.
+
+          608: this pragma must immediately precede a declaration or
+          statement Get this from <ucontext.h>.
+
+        * ace/OS.h: Changed to only request RTLD_GROUP and RTLD_NODELETE
+          if they are actually available.
+
+        * ace/config-irix6.x-kcc.h: Undefined
+          ACE_LACKS_PLACEMENT_OPERATOR_DELETE since KCC actually supports it.
+
+          Config_Test was failing because with the default setup, ace
+          tries to locate the shared memory pool at 0x04000000.  But it
+          turns out that this is the same address at which irix likes to
+          load the KCC shared library, libKCC.so.  So the memory pool ends
+          up blowing away all the library code.  Fixed by shifting the
+          default base address to 0x05000000 for this configuration.
+
+          OS_Test was failing because on irix, kcc 4.0d miscompiles
+          memchr_emulation if +K3 optimization is used.  I worked around
+          this by just using the library version of memchr instead:
+
+        * ace/ACE.cpp:  Cached_Conn_Test was failing because the code in
+          ACE::out_of_handles doesn't have a case to handle irix.
+
+        * tests/DLL_Test.cpp: It died trying to run object dtors. Fixed by
+          turning off the close-on-destruction flag for this test.
+
+Wed Mar 21 13:33:58 2001  Ossama Othman  <ossama@uci.edu>
+
+        * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp:
+
+          Patched this file so that the example actually works.  It now
+          correctly interacts with the SSL client in this example.  Thanks
+          to Defang Zhou <dzhou@inktomi.com> for contributing the
+          patch/changes necessary to make it work.
+
+Wed Mar 21 07:23:15 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/SOCK_Connector_Test.cpp (find_another_host): Make the
+          test a bit more resilent against errors with gethostbyname().
+          Thanks to Lu Yunhai <luyunhai@huawei.com> for this fix.
+
+Tue Mar 20 17:31:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/run_test.lst:
+          The Logging_Strategy_Test dynamically loads the Logger service
+          (from netsvcs), therefore it does not work on static builds.
+
+Tue Mar 20 18:17:24 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/OS.i: Fixed the USYNC_PROCESS arm of CreateMutex() in
+          ACE_OS::mutex_init() so that it calls
+          ACE_OS::set_errno_to_last_error().  Thanks to Ram Ben-Yakir
+          <Ram@bandwiz.com> for reporting this.
+
+Tue Mar 20 01:33:24 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+        * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect):
+        * ace/SSL/SSL_SOCK_Stream.i (send, close):
+
+          Wrap the underlying OpenSSL calls in a do-while(SSL_pending())
+          loop.  I decided to wrap the SSL_write() calls just in case.
+          This should fix the last of the non-blocking IO issues in ACE's
+          SSL wrappers.  [Bug 393]
+
+Tue Mar 20 00:40:43 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Stream.i (recv):
+
+          Fixed non-blocking IO support for this method.  It was necessary
+          to ensure that a full SSL record was read before returning
+          control to the caller.  Note that the send() method doesn't need
+          modification since OpenSSL always writes a full record before
+          returning.  [Bug 393]
+
+Mon Mar 19 19:53:34 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/ace_flags.bor:
+          Define macros for the RT Event Service test library
+
+Mon Mar 19 16:57:43 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/TP_Reactor.cpp (handle_events): Return value from
+          handle_events() after the Reactor has been deactivated should be
+          -1.  We just need to remember that as illustrated in
+          ACE_Reactor::run_reactor_event_loop(), this is not an error:
+
+          if (result == -1 && this->implementation_->deactivated ())
+            return 0;
+
+        * tests/Thread_Pool_Reactor_Test.cpp (svr_worker): Changed this
+          function to call ACE_Reactor::run_reactor_event_loop() instead
+          of ACE_Reactor::handle_events().  In the previous revision, we
+          were not handling return values from
+          ACE_Reactor::handle_events() correctly when
+          ACE_Reactor::deactivated() had been called.
+
+Mon Mar 19 09:14:12 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+          Added an output option to the link command.  Linking would fail
+          in cases where the output was specified in another directory.
+
+Sun Mar 18 22:12:16 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Stream.i (close):
+
+          Commented out debugging output that was inadvertently committed
+          to the repository.
+
+          Don't bother invalidating the handle.  Doing so can potentially
+          cause some side-effects in the underlying OpenSSL
+          implementation since setting the handle in the SSL_SOCK_Stream
+          also causes the OpenSSL SSL_set_fd() function to be called.
+
+          Fixed a socket leak caused by the fact that the handle was
+          invalidated before the underlying ACE_SOCK_Stream was closed.
+
+Sun Mar 18 09:46:47 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/New_Fail_Test.cpp: Fixed warnings in g++.
+
+Sun Mar 18 08:31:34 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * apps/Gateway/Gateway,
+        * apps/Gateway/Peer: Added a number of fixes to the Gateway and Peer
+          applications.  Thanks to Lu Yunhai <luyunhai@huawei.com> for
+          contributing these.
+
+Sun Mar 18 08:31:34 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of
+          casts so that the arguments passed to printf() will match the
+          format specifier types.
+
+Sat Mar 17 18:02:28 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-aix-4.x.h: Fixed settings for exceptions and
+          placement delete to be ok for Visual Age C++ 5.
+
+        * include/makeinclude/platform_aix_vacpp.GNU: Basically new,
+          works with the Visual Age C++ 5 batch mode build on AIX.
+
+        * include/makeinclude/rules.lib.GNU: Added aix_build piece to
+          the section for linking a shared library. It uses the linker
+          to generate a shr.o (shared) file, then inserts that into
+          the library that's being built. This new section is only
+          used with platform_aix_vacpp.GNU at this point.
+
+Fri Mar 16 15:07:23 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_Context.h (set_mode):
+
+          Changed the default mode from SSLv3 to SSLv23, i.e. support
+          SSLv2 and SSLv3 by default.  This fixes interoperability
+          with applications that use Sun's JSSE, which only supports
+          SSLv2.  Thanks to Max Khon <fjoe@newst.net> for providing the
+          patch.
+
+Thu Mar 15 17:47:28 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Log_Msg_Test.cpp: Changed a ERROR message as a DEBUG
+          message. If it is an error message the scripts that run the
+          build gets confused.
+
+Thu Mar 15 17:42:54 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp: Changed the "-s" option in the
+          test to write the output in to the output generated in the "log"
+          directory. This is just a hack to make the scoreboard clean.
+
+Thu Mar 15 15:55:37 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue_T.h: Add #include "ace/Message_Queue.h" so
+          IBM Visual Age C++ sees ACE_Message_Queue_Base when instantiating
+          templates.
+
+        * ace/ace-dll.icc: Fixed after being munged in a previous commit.
+          Also, corrected libACE.a generation and cleanup, and incorporated
+          fixes from Steve Ige <steve.ige@reuters.com> and Jerry
+          Odenwelder <jerryo@atl.fundtech.com>.
+
+        * THANKS: Added Steve Ige to the Hall of Fame.
+
+Thu Mar 15 11:26:35 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Acceptor.i (ACE_SSL_SOCK_Acceptor):
+
+          Make sure the handle is set for the ACE_SSL_SOCK_Acceptor, after
+          initializing the underlying ACE_SOCK_Acceptor.  This ensures
+          that OpenSSL has the proper handle.  Thanks to Greg McCain
+          <greg.mccain@veritas.com> for suggesting this fix.
+
+        * THANKS:
+          Added Greg to the hall of the fame.
+
+Thu Mar 15 05:46:59 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/FILE_Addr.cpp (ACE_FILE_Addr): Make sure to divide the size of
+          the filename_ by the sizeof (ACE_TCHAR) to handle unicode
+          correctly.  Thanks to the ever vigilant Ivan Murphy for catching
+          this!
+
+Wed Mar 14 01:47:10 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * apps/Gateway/Gateway/Makefile:
+        * apps/Gateway/Peer/Makefile:
+        * apps/JAWS/server/Makefile:
+        * apps/gperf/tests/Makefile:
+        * examples/ASX/CCM_App/Makefile:
+        * examples/Service_Configurator/IPC-tests/server/Makefile:
+        * examples/Service_Configurator/Misc/Makefile:
+        * examples/Timer_Queue/Makefile:
+        * netsvcs/clients/Naming/Client/Makefile:
+        * netsvcs/clients/Naming/Dump_Restore/Makefile:  Removed
+          unnecessary 'LIBS += $(ACELIB)'.  They were causing link problem
+          for the latest KCC. compiner.
+
+Tue Mar 13 20:56:10 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/WFMO_Reactor.cpp (remove_to_be_added_handler_i):
+        * ace/WFMO_Reactor.cpp (remove_suspended_handler_i):
+        * ace/WFMO_Reactor.cpp (remove_handler_i):
+
+          If a user tried to (a) remove a "to be suspended handle" from
+          either the current info set or the to be added set, the handle
+          was correctly removed but the "to be suspended handle" count was
+          not reduced; (b) remove a "to be resumed handle" from the
+          suspended set, the handle was correctly removed but the "to be
+          resumed handle" count was not reduced.  Since the "to be resumed
+          handle" and the "to be suspended handle" were not adjusted
+          properly, the reactor kept waking up thinking that changes were
+          required. Thanks to Lu Yunhai <luyunhai@huawei.com> for
+          reporting this problem.
+
+        * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp: Added
+          an extensive example for regression testing the above use cases.
+
+Tue Mar 13 15:23:04 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/Service_Manager.cpp (list_services): Fixed Unicode bugs.
+
+Tue Mar 13 15:13:48 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp: Fixed Unicode related bugs.
+
+Tue Mar 13 10:04:06 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * performance-tests/TCP/run_test.pl:
+          Fixed the path to the $ACE_ROOT/bin directory, now the script
+          runs again.
+
+Tue Mar 13 06:04:03 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Service_Manager.cpp (list_services): Add an indication of whether
+          a service is active or paused.  Thanks to Mike Curtis for this
+          improvement.
+
+        * ace/Reactor.h: Clarified that the remove_handler (handle, mask)
+          method also removes the event handle.  Thanks to Pierre Fayolle
+          <fayolle@enseirb.fr> for reporting this.
+
+        * tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat
+          with ACE_stat.  Thanks to Johnny Willemsen for reporting this.
+
+Tue Mar 13 00:35:35 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/Select_Reactor_T.i (deactivated): Reverted this change
+          regarding Select_Reactor_T::deactivated():
+
+          Thu Feb 22 12:28:15 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+          Though my change improved correctness of access and change to
+          the <deactivated_> variable, it had a negative consequence: the
+          event loop calls Select_Reactor_T::deactivated() before calling
+          Select_Reactor_T::handle_events() to make sure that the reactor
+          is not closed yet.  Unfortunately, if
+          Select_Reactor_T::deactivated() has a guard, it will send a null
+          event waking up the current leader and thus lead to unnecessary
+          thrashing.  For now, I have removed the guard from the
+          Select_Reactor_T::deactivated() methods.  We should revisit this
+          issue some time again.  This fixes bug 816.
+
+Mon Mar 12 16:30:32 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp (main): Fixed the rest of the
+          warnings in VxWorks builds.
+
+Mon Mar 12 16:21:42 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp (main): Fixed a couple of
+          warnings in VxWorks build. Couple of more warnings are left.
+
+Mon Mar 12 14:16:03 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed a compile
+          error on Win32 Unicode platforms.
+
+Mon Mar 12 12:12:36 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ACE-INSTALL.html: Also mentioned Windows 2000 explicitly in the
+          document.  Thanks to Rahul Shukla <rshukla@ggn.aithent.com> for
+          raising the question.
+
+Mon Mar 12 00:49:24 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * tests/tests.dsw:
+        * tests/Logging_Strategy_Test.dsp: Added a new dsp file.
+
+Sun Mar 11 21:00:16 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Print out the config.h and platform_macros.GNU files, this is
+          useful when debugging builds.
+
+Sun Mar 11 18:41:08 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/CDR_Stream.h: Updated a comment to clarify that the buffer()
+          method just returns a pointer to the first block in the chain.
+          Thanks to Johnny Willemsen for pointing this out.
+
+Sun Mar 11 17:46:45 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/Local_Name_Space_T.cpp: Fixed a compiler error on Win32
+          Unicode platforms.
+
+Sun Mar 11 17:28:40 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/QoS/QoS_Session_Impl.cpp (rsvp_callback): <errflags> was unused.
+
+Sun Mar 11 08:31:05 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * tests/Makefile.bor (NAMES): Added Logging_Strategy_Test.
+
+Sun Mar 11 07:32:18 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp (order): Fixed a warning in g++
+          builds.
+
+Sat Mar 10 23:15:10 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Fixed name of Crashed_Callback test
+
+Sat Mar 10 19:28:30 PST 2001 Mayur Deshpande <mayur@ics.uci.edu>
+
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
+          Fixes to enable debugging on QNX without ACE crashing.
+          Thanks to Andy Olson for the suggestions.
+
+Sat Mar 10 19:05:38 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32.h:
+
+          Include config-win32-common.h even on Windows CE.
+
+        * ace/config-win32-msvc-6.h:
+
+          If ACE_ENDTHREADEX is already defined, don't define it.
+
+        * ace/OS_Dirent.h:
+
+          Changed the use of ACE_WINCE to ACE_HAS_WINCE.
+
+        * ace/Service_Manager.cpp:
+
+          Fixed a couple of ACE_TCHAR/ACE_LIB_TEXT problems.
+
+        * ace/ace_wchar.h:
+
+          On Windows CE, #include wtypes.h.
+
+        * ace/ace_dll.vcp:
+        * ace/ace_os_dll.vcp:
+
+          Redid the output files and directories.  Now intermediate
+          files go into Release/PLATFORM and Debug/PLATFORM (where
+          PLATFORM = MIPS/ARM/X86EM/SH3/SH4).  The *.lib files go
+          into ../Lib/PLATFORM and the *.dll into ../bin/PLATFORM.
+          Also, the DLL's were renamed from ace_dll.dll and
+          ace_os_dll.dll to ace[d].dll and ace_os[d].dll.
+
+        * bin/pippen.pl:
+
+          Changed the environment variables from DEFAULT_COMPILER and
+          DEFAULT_CONFIGS to PIPPEN_COMPILER and PIPPEN_CONFIGS. Also
+          used \Q\E for the configs because some of the Windows CE
+          configs confused the script because they use parentheses.
+
+Sat Mar 10 16:59:51 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ACE-INSTALL.html:
+          Remove references to the now obsolete config-linux-lxpthreads.h
+          and platform_linux_lxpthread.GNU
+
+Sat Mar 10 16:38:22 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/run_test.lst:
+          Running the Recursive_Mutex_Test on single-threaded builds makes
+          very little sense.
+
+Sat Mar 10 16:35:19 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Add new tests: Muxing, Crashed_Callback, Client_Leaks and
+          Server_Leaks to the nightly runs.
+
+Sat Mar 10 17:55:53 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * include/makeinclude: Zapped the platform_linux_pthread.GNU,
+          platform_linux_lxpthread.GNU, and platform_linux_lxpthreads.GNU
+          files since they are confusing and shouldn't not be used in
+          favor of platform_linux.GNU.
+
+        * ace: Zapped the config-linux.pthread.h and config-linux-lxpthreads.h
+          file since they are confusing and shouldn't not be used in favor
+          of config-linux.h.  Thanks to Craig Rodrigues for this
+          suggestion.
+
+Sat Mar 10 12:39:16 2001  Craig Rodrigues  <crodrigu@bbn.com>
+
+        * ace/Reactor.h:
+        * ace/WFMO_Reactor.h:
+        * ace/Select_Reactor_T.h:
+        * ace/Reactor_Impl.h:
+          Cleaned up comment for schedule_timer()
+
+Sat Mar 10 07:05:16 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * tests: Added Logging_Strategy_Test.cpp.  Thanks to Orlando
+          Ribeiro <oribeiro@inescporto.pt> for contributing this.
+
+        * tests/Makefile (BIN): Added Logging_Strategy_Test.
+
+        * tests/run_test.lst: Added Log_Msg_Test and
+          the new Logging_Strategy_Test.
+
+        * tests/Log_Msg_Test.cpp: Added ACE_TEXT macros to all the ACE_DEBUG and
+          ACE_ERROR calls.
+
+        * ace/Service_Manager.{h,cpp}: Refactored the request processing
+          code so that it's in a single place.  Also, added support to
+          enable remote reconfiguration.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for contributing this.
+
+        * ace/Logging_Strategy.cpp (parse_args): Fixed a mistaken
+          re-initialization of the thread_priority_mask_ and the
+          process_priority_mask_.  Thanks to Martin Krumpolec
+          <krumpo@pobox.sk> for reporting this.
+
+        * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed this code so that
+          it doesn't fail if run on a directory that doesn't support locks
+          (like some NFS mounts).  Thanks to scott snyder
+          <snyder@fnal.gov> for reporting this.
+
+        * tests/SOCK_Connector_Test.cpp: Split up a loop so that the test
+          doesn't hang on RedHat Linux 7.0.  Thanks to Michael Searles
+          <msearles@base16.com> for this fix.
+
+Fri Mar  9 22:39:28 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Svc_Conf.h:
+        * ace/Service_Config.h:
+        * ace/Service_Config.cpp:
+          Add new method to the Service Configurator to add static
+          services into the repository, this factors out common code used
+          in the ORB and ACE.  In general it fixes the hacks done this
+          past Feb 20th
+
+Fri Mar  9 16:47:15 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * bin/nightlybuilds/builds.lst (LIST):
+          Added HPUX to the scoreboard.
+
+Fri Mar  9 14:34:34 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * PACE/Makefile:
+        * apps/drwho/Makefile:
+        * bin/PerlACE/Process_Unix.pm:
+        * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+          Modifications to make things build and run correctly with
+          Chorus 4.0.1.
+
+Thu Mar  8 08:38:01 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          The Single_Threaded_POA test cannot run with minimum CORBA or
+          (isn't this ironic) on single threaded configurations.
+
+Wed Mar 07 20:25:51 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+          Add QNX to the configurations in the scoreboard.
+
+Wed Mar  7 12:41:05 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Select_Reactor_T.h,
+        * ace/Reactor_Impl.h,
+        * ace/WFMO_Reactor.h,
+        * ace/Reactor.h: Updated the comments to be more accurate.  Thanks
+          to Craig Rodrigues for reporting this.
+
+Wed Mar  7 08:57:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Asynch_IO.h:
+          Changed use of ACE_UNIMPLEMENTED_FUNC to just defining the
+          assignment operators outright.  The point here is to just
+          provide any implementation, since the default one is flagged as
+          causing infinite recursion.
+
+          Thanks to David Levine for pointing out this incorrect usage of
+          the macro.
+
+        * ace/config-win32-msvc-5.h:
+        * ace/config-win32-msvc-6.h:
+
+          @file comments were mismatched.
+
+        * ace/config-win32.h:
+
+          Changed config-win32-wince.h to config-WinCE.h.
+
+        * ace/ace_wchar.h:
+        * ace/Log_Msg_NT_Event_Log.cpp:
+
+          Changed several system calls to ACE_TEXT_* (and needed to
+          add some to ace_wchar.h) since they need the ACE_TEXT
+          treatment.
+
+Wed Mar  7 08:20:01 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/ARGV.cpp:
+
+          Removed a warning about possible use of uninitialized variable.
+
+        * bin/ace_ld:
+
+          Added new functionality to filter out the harmless symbol size
+          change warnings for VxWorks 5.4.
+
+        * examples/Shared_Malloc/test_multiple_mallocs.cpp:
+        * examples/Shared_Malloc/test_persistence.cpp:
+        * examples/Shared_Malloc/test_position_independent_malloc.cpp:
+
+          Renamed the typedef MALLOC to TEST_MALLOC.  A MALLOC macro is
+          defined by a VxWorks system header.
+
+Wed Mar  7 06:11:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Asynch_IO.h: Removed the unnecessary/improper ';' at the
+          end of the line.  Thanks to Johnny Willemsen and Chris Kohlhoff
+          for reporting/fixing this.
+
+        * ace/*_Connector.h: Clarified in the comments that the
+          ACE_Time_Value *timeout represents the *maximum* amount of time
+          to wait.  If the server is not running, however, connect() can
+          return much sooner.  Thanks to Dipti Jain <dijain@hss.hns.com>
+          for motivating this.
+
+Tue Mar  6 14:14:06 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        Here are some fixes for MSVC 7 beta.  Note that no project files
+        are checked in.  Right now they will have to be generated from
+        the MSVC 5/6 files (The devenv.exe will do this automatically).
+        When MSVC 7 becomes released, we'll probably have to deal with
+        including their files (even if only for nightly builds).
+
+        * ace/OS.h:
+        * ace/config-win32-msvc.h:
+
+          Moved the inclusion of the crtdbg.h file to where it is being
+          used.  This is mainly to alleviate some excessive inclusions.
+
+        * ace/config-WinCE.h:
+        * ace/config-win32.h:
+        * ace/config-win32-msvc-5.h: (added)
+        * ace/config-win32-msvc-6.h: (added)
+        * ace/config-win32-msvc-7.h: (added)
+        * ace/config-win32-borland.h:
+        * ace/config-win32-common.h:
+        * ace/config-win32-ghs.h:
+        * ace/config-win32-msvc.h:
+        * ace/config-win32-visualage.h:
+
+          Added a new config-win32-msvc-7.h with some new settings.  While
+          doing this I also rearranged the files a bit.  Everything now
+          goes through config-win32.h (and an error will occur if you
+          include the others directly).
+
+        * ace/config-hpux-10.x-hpc++.h:
+        * ace/config-hpux-11.00.h:
+        * ace/config-win32-msvc-5.h:
+        * ace/config-win32-msvc-6.h:
+        * ace/README:
+
+          Removed ACE_HAS_ONE_DEFINITION_RULE.  Could not find this
+          actually used anywhere so I'm assuming it can be safely
+          removed.
+
+        * ace/Asynch_IO.h:
+
+          Added some dummy assignment operators.  It seems that the default
+          ones produce infinite recursion (at least with MSVC 6 SP5 and
+          MSVC 7 beta)
+
+        * ace/Future.h:
+
+          Future_Holder needs to be ACE_Export-ed.
+
+Tue Mar  6 16:58:17 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/ACE.cpp (format_hexdump): The format_hexdump () was missing
+          a space if the remaining message that needs dumping was less
+          than 16 bytes. Thansk to Johnny Willemsen"
+          <johnny.willemsen@meco.nl> for giving this fix.
+
+Tue Mar  6 11:25:53 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/PerlACE/Process_Unix.pm:
+          Ignore SIGABRT too, because it is used by abort() and we call
+          that function to test the ORB under fault conditions.
+
+Tue Mar  6 12:25:34 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * configure.in:
+
+          The configure script was broken on major releases (i.e. those with
+          no beta numbers).  A test for an empty string should have double
+          quotes around the variable.
+
+Tue Mar  6 10:16:31 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32-common.h:
+          Removed old comment about ACE_HAS_WINSOCK2 being related to
+          ACE_HAS_WINNT4.  Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for pointing this out.
+
+Tue Mar  6 10:13:03 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Membership_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+        * tests/RMCast/RMCast_Reordering_Test.cpp:
+        * tests/RMCast/RMCast_Retransmission_Test.cpp:
+          Use ACE_OS::time(0) to initialize the pseudo-random numbers
+          seed.  It is good enough for our purposes, and it works on
+          platforms without 64-bit integer support.
+
+Mon Mar  5 13:56:33 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Synch_T.{h,i}: Further simplified the new ACE_Guard constructor.
+          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing
+          this.
+
+Mon Mar  5 19:20:45 2001  Fuzz Master D <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+          As Ossama pointed out, the ACE_CHECK test was seeing
+          problems in the tao_idl files since it has uses of ACE_TRY_ENV
+          inside quotes.  Made sure not to detect problems in this case.
+
+Mon Mar  5 18:58:32 2001  Fuzz Master D <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+          Fixed some false positives in the resolve_initial_reference
+          test and also added an ACE_CHECK test by Carlos's request.
+
+Mon Mar  5 18:54:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/PerlACE/Process_Unix.pm:
+          Updated the signal detection to not pay attention to TERM and
+          KILL.  Will print out better output when signals cause a process
+          to exit during most calls like Kill () or TerminateWaitKill ().
+
+Mon Mar  5 13:56:33 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Synch_T.{h,i}: Added a new ACE_Guard constructor that
+          allows the caller to select whether the guard owns/acquires the
+          lock or not.  Thanks to Chris Kohlhoff <chris@kohlhoff.com> for
+          contributing this.
+
+        * ace/Synch_T.{h,i}: Added a disown() method that relinquishes
+          ownership of the lock so that it is not released implicitly in
+          the destructor.  Thanks to Chris Kohlhoff <chris@kohlhoff.com>
+          for contributing this.
+
+        * ace/Event_Handler.h: Updated the comment on handle_close() so that
+          it more accurately reflects what is going on.  Thanks to Defang
+          Zhou <dzhou@inktomi.com> for suggesting this.
+
+        * apps/Gateway/Gateway/Concrete_Connection_Handlers.{h,cpp}: Added
+          handle_close() operations to solve problems with certain
+          concurrency models.  Thanks to Defang Zhou <dzhou@inktomi.com>
+          for reporting this.
+
+Mon Mar  5 11:29:36 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * docs/ACE-categories.html:
+          Fixed links to the doxygen files.
+
+        * ace/Pipe.cpp:
+          Fixed what looks like a typo, we want to *disable* the stream
+          pipes under QNX, not to enable them just on that platform.
+
+Mon Mar  5 08:20:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+          Undo Doug's changes.  They broke the test.
+
+Mon Mar  5 07:52:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Log_Record.cpp (priority): Clarified the behavior of the
+          priority() set/get methods.  Thanks to Christian Schuhegger
+          <Christian.Schuhegger@cern.ch> for reporting this.
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp,
+        * tests/RMCast/RMCast_Reassembly_Test.cpp,
+        * tests/Dynamic_Priority_Test.cpp,
+        * tests/Thread_Pool_Test.cpp: Make sure to write into the
+          wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
+          <Gonzalo.Diethelm@sonda.com> for reporting this.
+
+Mon Mar  5 08:00:23 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/nightlybuilds/builds.lst:
+
+          Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds.
+
+Mon Mar 05 00:10:15 2001  Ossama Othman  <ossama@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Updated to detect missing ACE_TRY_ENV parameters in
+          ORB::resolve_initial_references() calls when emulated exceptions
+          are used.  Thanks to Darrell for providing this update.
+
+Mon Mar  5 07:57:07 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tests/Makefile.bor:
+
+          Added missing Refcounted_Auto_Ptr_Test to the build
+
+Sun Mar  4 19:31:16 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added the run_test_mt.pl for Leader_Follers.
+
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/Process_Win32.pm:
+
+          Added a destructor to detect if a process wasn't explicitly
+          killed before the object went out of scope. Will print out
+          an error and kill it.
+
+        * bin/PerlACE/Run_Test.pm:
+
+          Turned on autoflush for all scripts.
+
+        * docs/run_test.txt:
+
+          Updated run_test.pl instructions to fit all the changes I
+          just made.
+
+        * examples/Export/run_test.pl:
+        * performance-tests/RPC/run_test.pl:
+        * performance-tests/TCP/run_test.pl:
+        * performance-tests/UDP/run_test.pl:
+
+          Updated to use PerlACE::Run_Test;
+
+        * tests/Atomic_Op_Test.dsp:
+        * tests/Auto_IncDec_Test.dsp:
+        * tests/Barrier_Test.dsp:
+        * tests/Basic_Types_Test.dsp:
+        * tests/Buffer_Stream_Test.dsp:
+        * tests/CDR_Array_Test.dsp:
+        * tests/CDR_File_Test.dsp:
+        * tests/CDR_Test.dsp:
+        * tests/Cache_Map_Manager_Test.dsp:
+        * tests/Cached_Accept_Conn_Test.dsp:
+        * tests/Cached_Conn_Test.dsp:
+        * tests/Capabilities_Test.dsp:
+        * tests/Collection_Test.dsp:
+        * tests/Config_Test.dsp:
+        * tests/Conn_Test.dsp:
+        * tests/DLL_Test.dsp:
+        * tests/DLList_Test.dsp:
+        * tests/Dirent_Test.dsp:
+        * tests/Dynamic_Priority_Test.dsp:
+        * tests/Enum_Interfaces_Test.dsp:
+        * tests/Env_Value_Test.dsp:
+        * tests/Future_Set_Test.dsp:
+        * tests/Future_Test.dsp:
+        * tests/Handle_Set_Test.dsp:
+        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
+        * tests/Hash_Map_Manager_Test.dsp:
+        * tests/High_Res_Timer_Test.dsp:
+        * tests/IOStream_Test.dsp:
+        * tests/Lazy_Map_Manager_Test.dsp:
+        * tests/Log_Msg_Test.dsp:
+        * tests/MEM_Stream_Test.dsp:
+        * tests/MM_Shared_Memory_Test.dsp:
+        * tests/MT_Reactor_Timer_Test.dsp:
+        * tests/MT_SOCK_Test.dsp:
+        * tests/Malloc_Test.dsp:
+        * tests/Map_Manager_Test.dsp:
+        * tests/Map_Test.dsp:
+        * tests/Mem_Map_Test.dsp:
+        * tests/Message_Block_Test.dsp:
+        * tests/Message_Queue_Notifications_Test.dsp:
+        * tests/Message_Queue_Test.dsp:
+        * tests/Message_Queue_Test_Ex.dsp:
+        * tests/Naming_Test.dsp:
+        * tests/New_Fail_Test.dsp:
+        * tests/Notify_Performance_Test.dsp:
+        * tests/OS_Test.dsp:
+        * tests/Object_Manager_Test.dsp:
+        * tests/OrdMultiSet_Test.dsp:
+        * tests/Pipe_Test.dsp:
+        * tests/Priority_Buffer_Test.dsp:
+        * tests/Priority_Reactor_Test.dsp:
+        * tests/Priority_Task_Test.dsp:
+        * tests/Process_Manager_Test.dsp:
+        * tests/Process_Mutex_Test.dsp:
+        * tests/Process_Strategy_Test.dsp:
+        * tests/RB_Tree_Test.dsp:
+        * tests/Reactor_Exceptions_Test.dsp:
+        * tests/Reactor_Notify_Test.dsp:
+        * tests/Reactor_Performance_Test.dsp:
+        * tests/Reactor_Timer_Test.dsp:
+        * tests/Reactors_Test.dsp:
+        * tests/Reader_Writer_Test.dsp:
+        * tests/Recursive_Mutex_Test.dsp:
+        * tests/Refcounted_Auto_Ptr_Test.dsp:
+        * tests/Reverse_Lock_Test.dsp:
+        * tests/SOCK_Connector_Test.dsp:
+        * tests/SOCK_Send_Recv_Test.dsp:
+        * tests/SOCK_Test.dsp:
+        * tests/SPIPE_Test.dsp:
+        * tests/SString_Test.dsp:
+        * tests/SV_Shared_Memory_Test.dsp:
+        * tests/Semaphore_Test.dsp:
+        * tests/Service_Config_Test.dsp:
+        * tests/Sigset_Ops_Test.dsp:
+        * tests/Simple_Message_Block_Test.dsp:
+        * tests/Svc_Handler_Test.dsp:
+        * tests/TSS_Test.dsp:
+        * tests/Task_Test.dsp:
+        * tests/Thread_Manager_Test.dsp:
+        * tests/Thread_Mutex_Test.dsp:
+        * tests/Thread_Pool_Reactor_Test.dsp:
+        * tests/Thread_Pool_Test.dsp:
+        * tests/Time_Service_Test.dsp:
+        * tests/Time_Value_Test.dsp:
+        * tests/Timeprobe_Test.dsp:
+        * tests/Timer_Queue_Test.dsp:
+        * tests/Tokens_Test.dsp:
+        * tests/UPIPE_SAP_Test.dsp:
+        * tests/Upgradable_RW_Test.dsp:
+        * tests/version_tests/Atomic_Op_Test.dsp: (removed)
+        * tests/version_tests/Auto_IncDec_Test.dsp: (removed)
+        * tests/version_tests/Barrier_Test.dsp: (removed)
+        * tests/version_tests/Basic_Types_Test.dsp: (removed)
+        * tests/version_tests/Buffer_Stream_Test.dsp: (removed)
+        * tests/version_tests/CDR_Array_Test.dsp: (removed)
+        * tests/version_tests/CDR_File_Test.dsp: (removed)
+        * tests/version_tests/CDR_Test.dsp: (removed)
+        * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed)
+        * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed)
+        * tests/version_tests/Cached_Conn_Test.dsp: (removed)
+        * tests/version_tests/Capabilities_Test.dsp: (removed)
+        * tests/version_tests/Collection_Test.dsp: (removed)
+        * tests/version_tests/Config_Test.dsp: (removed)
+        * tests/version_tests/Conn_Test.dsp: (removed)
+        * tests/version_tests/DLL_Test.dsp: (removed)
+        * tests/version_tests/DLList_Test.dsp: (removed)
+        * tests/version_tests/Dirent_Test.dsp: (removed)
+        * tests/version_tests/Dynamic_Priority_Test.dsp: (removed)
+        * tests/version_tests/Enum_Interfaces_Test.dsp: (removed)
+        * tests/version_tests/Env_Value_Test.dsp: (removed)
+        * tests/version_tests/Future_Set_Test.dsp: (removed)
+        * tests/version_tests/Future_Test.dsp: (removed)
+        * tests/version_tests/Handle_Set_Test.dsp: (removed)
+        * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed)
+        * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed)
+        * tests/version_tests/High_Res_Timer_Test.dsp: (removed)
+        * tests/version_tests/IOStream_Test.dsp: (removed)
+        * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed)
+        * tests/version_tests/Log_Msg_Test.dsp: (removed)
+        * tests/version_tests/MEM_Stream_Test.dsp: (removed)
+        * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed)
+        * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed)
+        * tests/version_tests/MT_SOCK_Test.dsp: (removed)
+        * tests/version_tests/Malloc_Test.dsp: (removed)
+        * tests/version_tests/Map_Manager_Test.dsp: (removed)
+        * tests/version_tests/Map_Test.dsp: (removed)
+        * tests/version_tests/Mem_Map_Test.dsp: (removed)
+        * tests/version_tests/Message_Block_Test.dsp: (removed)
+        * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed)
+        * tests/version_tests/Message_Queue_Test.dsp: (removed)
+        * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed)
+        * tests/version_tests/Naming_Test.dsp: (removed)
+        * tests/version_tests/New_Fail_Test.dsp: (removed)
+        * tests/version_tests/Notify_Performance_Test.dsp: (removed)
+        * tests/version_tests/OS_Test.dsp: (removed)
+        * tests/version_tests/Object_Manager_Test.dsp: (removed)
+        * tests/version_tests/OrdMultiSet_Test.dsp: (removed)
+        * tests/version_tests/Pipe_Test.dsp: (removed)
+        * tests/version_tests/Priority_Buffer_Test.dsp: (removed)
+        * tests/version_tests/Priority_Reactor_Test.dsp: (removed)
+        * tests/version_tests/Priority_Task_Test.dsp: (removed)
+        * tests/version_tests/Process_Manager_Test.dsp: (removed)
+        * tests/version_tests/Process_Mutex_Test.dsp: (removed)
+        * tests/version_tests/Process_Strategy_Test.dsp: (removed)
+        * tests/version_tests/RB_Tree_Test.dsp: (removed)
+        * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed)
+        * tests/version_tests/Reactor_Notify_Test.dsp: (removed)
+        * tests/version_tests/Reactor_Performance_Test.dsp: (removed)
+        * tests/version_tests/Reactor_Timer_Test.dsp: (removed)
+        * tests/version_tests/Reactors_Test.dsp: (removed)
+        * tests/version_tests/Reader_Writer_Test.dsp: (removed)
+        * tests/version_tests/Recursive_Mutex_Test.dsp: (removed)
+        * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed)
+        * tests/version_tests/Reverse_Lock_Test.dsp: (removed)
+        * tests/version_tests/SOCK_Connector_Test.dsp: (removed)
+        * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed)
+        * tests/version_tests/SOCK_Test.dsp: (removed)
+        * tests/version_tests/SPIPE_Test.dsp: (removed)
+        * tests/version_tests/SString_Test.dsp: (removed)
+        * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed)
+        * tests/version_tests/Semaphore_Test.dsp: (removed)
+        * tests/version_tests/Service_Config_Test.dsp: (removed)
+        * tests/version_tests/Sigset_Ops_Test.dsp: (removed)
+        * tests/version_tests/Simple_Message_Block_Test.dsp: (removed)
+        * tests/version_tests/Svc_Handler_Test.dsp: (removed)
+        * tests/version_tests/TSS_Test.dsp: (removed)
+        * tests/version_tests/Task_Test.dsp: (removed)
+        * tests/version_tests/Thread_Manager_Test.dsp: (removed)
+        * tests/version_tests/Thread_Mutex_Test.dsp: (removed)
+        * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed)
+        * tests/version_tests/Thread_Pool_Test.dsp: (removed)
+        * tests/version_tests/Time_Service_Test.dsp: (removed)
+        * tests/version_tests/Time_Value_Test.dsp: (removed)
+        * tests/version_tests/Timeprobe_Test.dsp: (removed)
+        * tests/version_tests/Timer_Queue_Test.dsp: (removed)
+        * tests/version_tests/Tokens_Test.dsp: (removed)
+        * tests/version_tests/UPIPE_SAP_Test.dsp: (removed)
+        * tests/version_tests/Upgradable_RW_Test.dsp: (removed)
+        * tests/version_tests/run_all_tests.bat: (removed)
+        * tests/version_tests/version_tests.dsw: (removed)
+
+          Moved the version_tests back into the tests/*.dsp files.  The
+          reason they were originally moved is because it was easier to
+          select all the debug versions during a batch build.  But now we
+          have pippen.pl and msvc_auto_compile.pl, so this is no longer an
+          issue, while this strange setup would compilicate the nightly
+          builds.  Thus, it was standardized back.
+
+        * bin/create_vt_dsps.pl: (removed)
+
+          No need for this anymore.
+
+Sun Mar  4 19:27:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Log_Msg.cpp:
+        * ace/Log_Msg_NT_Event_Log.h:
+        * ace/OS.cpp:
+
+          Disabled Log_Msg_NT_Event_Log on Windows CE.
+
+Sun Mar 04 13:19:35 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * etc/tao.doxygen:
+          Add .txt files, so we can add web pages to the basic TAO
+          documentation.
+
+Sun Mar 04 10:58:08 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT
+          project files.
+
+Sun Mar  4 10:41:57 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Log_Msg.cpp,
+          ace/Log_Msg.h,
+          ace/Logging_Strategy.cpp,
+          ace/Makefile.bor,
+          ace/OS.cpp,
+          ace/OS.h,
+          ace/OS.i,
+          ace/ace.rc: Added support for the new NT event logging capability.
+          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
+
+        * ace/Log_Msg_NT_Event_Log.cpp
+          ace/Log_Msg_NT_Event_Log.h
+          ace/ace_message_table.bin:  Added these files to support the new
+          NT event logging capability.
+          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing
+          this.
+
+Sun Mar  4 04:46:44 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+
+          Added new Windows CE nightly build.
+
+Sun Mar 04 03:12:17 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly
+          typed in as ACE_STATIC_LIBS.
+
+        * ace/svc_export.h:
+        * ace/RMCast/RMCast_Export.h:
+        * ace/SSL/SSL_Export.h:
+        * websvcs/lib/websvcs_export.h: These files didn't check for
+          ACE_AS_STATIC_LIBS to determine if they should define their
+          export macros for static build.  Thanks to Chris Kohlhoff
+          <chris@kohlhoff.com> for reporting this.  [Bug 813]
+
+Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/QoS/QoS_Session_Impl.cpp:
+        * ace/QoS/QoS_Session_Impl.i:
+        * examples/QOS/Fill_ACE_QoS.cpp:
+        * examples/QOS/Fill_ACE_QoS.h:
+        * examples/QOS/Makefile:
+        * examples/QOS/QoS_Util.cpp:
+        * examples/QOS/Receiver_QoS_Event_Handler.cpp:
+        * examples/QOS/Sender_QoS_Event_Handler.cpp:
+          Fixed various compile warnings when compiling with rapi=1 on
+          Redhat Linux 6.2
+
+Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Changed the detection pattern a bit to pick up
+          stuff like:
+
+          void
+          operator < (...)
+
+          better.
+
+        * ace/Auto_Ptr.i:
+        * ace/Base_Thread_Adapter.cpp:
+        * ace/Based_Pointer_T.i:
+        * ace/Connector.cpp:
+        * ace/Containers_T.cpp:
+        * ace/DEV_Addr.i:
+        * ace/Dynamic.i:
+        * ace/FILE.cpp:
+        * ace/Flag_Manip.i:
+        * ace/Handle_Set.i:
+        * ace/Hash_Map_Manager_T.cpp:
+        * ace/Lib_Find.cpp:
+        * ace/Local_Name_Space_T.cpp:
+        * ace/Local_Tokens.cpp:
+        * ace/MEM_Addr.i:
+        * ace/Malloc.cpp:
+        * ace/Malloc_Allocator.cpp:
+        * ace/Malloc_T.cpp:
+        * ace/Memory_Pool.cpp:
+        * ace/Message_Block.cpp:
+        * ace/Message_Block.i:
+        * ace/Message_Block_T.cpp:
+        * ace/Message_Queue.i:
+        * ace/Message_Queue_T.cpp:
+        * ace/Message_Queue_T.i:
+        * ace/Naming_Context.cpp:
+        * ace/OS.cpp:
+        * ace/OS.i:
+        * ace/PI_Malloc.cpp:
+        * ace/POSIX_Asynch_IO.cpp:
+        * ace/Process_Manager.cpp:
+        * ace/QtReactor.cpp:
+        * ace/RB_Tree.i:
+        * ace/RW_Process_Mutex.cpp:
+        * ace/Reactor.cpp:
+        * ace/Remote_Name_Space.cpp:
+        * ace/Remote_Tokens.cpp:
+        * ace/SOCK_Dgram.i:
+        * ace/SString.cpp:
+        * ace/SUN_Proactor.cpp:
+        * ace/Select_Reactor_Base.cpp:
+        * ace/Select_Reactor_T.cpp:
+        * ace/Service_Object.i:
+        * ace/Service_Repository.cpp:
+        * ace/Signal.cpp:
+        * ace/Signal.i:
+        * ace/Svc_Handler.cpp:
+        * ace/Synch.cpp:
+        * ace/Synch_T.cpp:
+        * ace/Thread_Adapter.cpp:
+        * ace/Thread_Manager.cpp:
+        * ace/Timer_Heap_T.cpp:
+        * ace/TkReactor.cpp:
+        * ace/Token.cpp:
+        * ace/Token_Manager.cpp:
+        * ace/CLASSIX/CLASSIX_CO_Acceptor.i:
+        * ace/CLASSIX/CLASSIX_Select_Reactor.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+        * netsvcs/ACE-netsvcs.html:
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+        * netsvcs/lib/Token_Handler.cpp:
+
+          Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors)
+
+        * docs/ACE-categories.html:
+        * docs/ACE-porting.html:
+        * docs/ACE-subsets.html:
+        * docs/tutorials/new-tutorials.html:
+
+          Changed references to
+          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
+          relative paths instead (Fixes the last of the fuzz errors).
+
+Fri Mar 2 20:08  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
+          Added macros tha expand to multiple libraries
+          on QNX RTP to fix most of the link problems.
+
+Fri Mar  2 16:35:58 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32-borland.h:
+
+          Added /**/ to #include <vcl.h> so it isn't picked up by
+          MSVC-based dependency generators.
+
+Fri Mar 02 19:36:22 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and
+          errno is EAGAIN, change it to EWOULDBLOCK. Improve portability
+          for platforms where EAGAIN and EWOULDBLOCK are different values
+          and both used, like HP-UX.  Thanks to Michael Grove
+          <snowymike@aol.com> for reporting this problem.
+
+        * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX.
+          This makes it pick up the EAGAIN->EWOULDBLOCK change.
+
+        * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where
+          ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless
+          ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree
+          will get ENOTSUP anyway.
+
+Fri Mar 02 17:50:40 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
+
+        * ace/QtReactor.cpp:
+          Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting
+          and fixing the problem - crashing of TAO/tests/QtTests/ client
+          example after moving the slider.
+
+Fri Mar 02 15:35:40 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_Acceptor.cpp:
+        * ace/MEM_Acceptor.h:
+        * ace/MEM_Addr.cpp:
+        * ace/MEM_Addr.h:
+        * ace/MEM_Connector.cpp:
+        * ace/MEM_Connector.h:
+        * ace/MEM_IO.cpp:
+        * ace/MEM_IO.h:
+        * ace/MEM_SAP.cpp:
+        * ace/MEM_SAP.h:
+        * ace/MEM_Stream.cpp:
+        * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses
+          not to support position independent pointers.
+
+Fri Mar 02 13:17:36 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/IOStream/server/iostream_server.cpp (main): Removed the
+          call to register peer_acceptor with the reactor. The
+          acceptor::open call already registers for ACCEPT_MASK. Prevents
+          leaving a hanging READ_MASK registered after the acceptor is
+          destroyed when main() returns. This fixes Bugzilla # 801. Thanks
+          to Pim Philipse <pph@rogan-medical.com> for reporting this.
+
+        * THANKS: Added Pim Philipse to the Hall of Fame.
+
+Fri Mar 02 12:24:27 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions
+          (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set
+          ACE_NEW_THROWS_EXCEPTIONS either).
+
+        * ace/Thread_Manager.cpp (join_thr): Moved the code for
+          ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here to
+          ACE_OS::thr_join (which this function calls) so that
+          ACE_Thread::join also causes a pthread_detach. This is needed on
+          Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread
+          storage and avoid leaking memory. Thanks to Vladimir Kondratiev
+          <vladimir.kondratiev@intel.com> for reporting this and providing
+          excellent test cases to help resolve it quickly.
+
+        * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from
+          ACE_Thread_Manager::join_thr, above.
+
+        * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard
+          around purge_pending_notifications to prevent against an ENOTSUP
+          from purge_pending_notifications.
+
+Thu Mar  1 17:02:10 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/Process_Win32.pm:
+
+          Fixed up the Spawn code to use the Executable () instead of
+          {EXECUTABLE}, since that's how we get the adjusted name (with
+          .exe and stuff).  And also skipped the file existance with
+          IgnoreExeSubDir, since IgnoreExeSubDir is often used when you
+          need to find the program in the path.
+
+Thu Mar  1 15:48:10 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Fuzz was being a bit to eager with the class matching in the
+          TRACE test.  It was having problems with something like:
+
+          char *foo::bar ()
+
+          since it thought the class was "char *foo" instead of just
+          "foo".
+
+          But it is feeling muuuuuuch better now.
+
+Thu Mar  1 13:18:07 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Added two new tests:
+
+          - absolute ACE_wrappers test:
+
+            Check for ~schmidt/ACE_wrappers in html files.  These should
+            be relative links since these html files already exist in
+            their own ACE_wrappers tree.
+
+          - TRACE test:
+
+            Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually
+            refers to the function/method it is in.
+
+          And expanded the checks in the bad run_test test (level 6)
+
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/Process_Win32.pm:
+
+          - Added checks for file existence before running.
+          - Added IgnoreExeSubDir option.
+          - Added TerminateWaitKill method.
+
+        * bin/pippen.pl: (added)
+        * bin/PerlACE/MSProject.pm: (added)
+        * bin/PerlACE/MSProject/DSP.pm: (added)
+        * bin/PerlACE/MSProject/VCP.pm: (added)
+
+          There is nothing to see here...please be on your way.
+
+          It isn't like this is a super top secret project to
+          replace msvc_auto_compile.pl with something that works
+          better and also has a cool code-name that is shorter
+          than "msvc_auto_compile.pl".
+
+          But remember, you didn't hear that from me.
+
+Thu Mar  1 10:54:23 2001  Ossama Othman  <ossama@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added the TAO Codec to the list of tests to run.
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Fixed all incorrect uses of CFLAGS and CCFLAGS where
+          preprocessor macros were defined.  Preprocessor macros should be
+          defined in the CPPFLAGS variable.
+
+          Define ACE_USE_RCSID in non-debug builds (i.e. debug=0).
+
+Thu Mar 01 07:29:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Fixed typos in the Service_Context_Manipulation test.  It was
+          running in platforms where it shouldn't.
+
+Thu Mar 01 07:07:03 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * include/makeinclude/recurse.bor:
+          Added support for makefiles which contain multiple targets.
+
+        * examples/IPC_SAP/SOCK_SAP/Makefile.bor:
+        * examples/Log_Msg/Makefile.bor:
+        * examples/Map_Manager/Makefile.bor:
+        * examples/Mem_Map/file-reverse/Makefile.bor:
+        * examples/RMCast/Send_File/Makefile.bor:
+        * examples/Service_Configurator/IPC-tests/client/Makefile.bor:
+        * examples/Threads/Makefile.bor:
+        * netsvcs/clients/Logger/Makefile.bor:
+        * tests/Makefile.bor:
+        * tests/RMCast/Makefile.bor:
+          Updated to work with new multi-target makefile support.
+
+Wed Feb 28 22:58:50 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * html/index.html:
+          Reference */index.html directly, instead of assuming that the
+          web browser will use index.html as the default file, this also
+          works better when browsing locally.  Thanks to Alain Decamps
+          <Alain.Decamps@pidpa.be> for pointing this out.
+
+Wed Feb 28 16:41:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * docs/bugzilla-build-setup.html:
+
+          Updated the section about the scoreboard and added a
+          placeholder for Win32 nightly build information.
+
+Wed Feb 28 16:04:14 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and
+          Messaging support disabled for the nightly builds.
+
+Wed Feb 28 15:35:59 2001  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * docs/bugzilla-build-setup.html:
+          Added html file outlining steps for adding a bugzilla nightly
+          build.
+
+Wed Feb 28 00:25:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          The examples/POA/Adapter_Activator/run_test.pl test was being
+          run twice.  In fairness to all the other tests that only get to
+          run once, I removed the second instance.
+
+Tue Feb 27 17:31:48 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for
+          the threads=0 build - this enables the reentrant functions which
+          are present, threads or not. It does not turn on threads, which
+          are instead enabled by -D_POSIX_C_SOURCE=199506L.
+
+        * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+
+        * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to
+          the POSIX.1c-conformant version of rand_r. Allows clean compile
+          on HP-UX 11 without thread support.  Also lined up some
+          misaligned #if/else/endif lines to make it easier to find one's
+          way through.
+
+        * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the
+          ways to get the POSIX.1c-conformant version of readdir_r. Allows
+          clean compile on HP-UX 11 without thread support.
+
+Tue Feb 27 11:38:38 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * performance-tests/TCP/tcp_test.cpp (main): Zapped the
+          non-existent '-f' option.  Thanks to Mike Curtis for reporting
+          this.
+
+        * performance-tests/TCP/tcp_test.cpp (main): Check for improper
+          bufsz.  Thanks to Mike Curtis for reporting this.
+
+        * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t'
+          option, which specifies the number of threads.
+
+        * performance-tests/TCP/README: Fixed a typo.  Thanks to
+          Mike Curtis for reporting this.
+
+Tue Feb 27 10:51:18 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst: Added the AMI tests to the daily
+          builds.
+
+Tue Feb 27 10:23:20 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES
+          to ChangeLog*. This should help us to avoid missing ChangeLog
+          entries in the beta distribution, just about every time we split
+          and add a ChangeLog.
+
+Mon Feb 27 07:39:16 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_hpux_aCC.GNU:
+
+          Removed suppression of Future Error 129.
+          Removed the use of CFLAGS.
+
+        * ace/OS.h:
+        * ace/config-hpux-11.00.h:
+          Modification to remove system header macro definition conflicts.
+          This change does not suppress the conflicts, but does an undef
+          of the two conflicting macros before includeing tcp.h.  Thanks
+          to Sam Chong <sam@i2i-inc.com> for reporting this problem.
+
+Mon Feb 26 19:01:16 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Logging_Strategy.{h,cpp}: Added a new -k option to
+          set the logging key via the ACE_Logging_Strategy.  Thanks to
+          Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
+
+Mon Feb 26 18:18:38 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/SString.i
+          (ACE_CString::find (const char *s, int pos) const):
+          (ACE_CString::find (char c, int pos) const):
+          (ACE_SString::find (const char *s, int pos) const):
+          (ACE_SString::find (char c, int pos) const):
+          (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const):
+          If match is found, return index from start of string, not from
+          'pos'. Matches the C++ string standard, which was the model for
+          these classes.  Thanks to Glen Osterhout <gosterho@elronsw.com>
+          for this fix.
+
+        * ace/SString.h: Clarified comments on return value for above
+          functions.
+
+        * tests/SString_Test.cpp: Changed to look for the correct return
+          from the npos tests of the functions above.
+
+        * THANKS: Added Glen Osterhout to the Hall of Fame.
+
+Mon Feb 26 15:01:55 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/DLL_Test_Impl.dsp:
+        * tests/version_tests/DLL_Test_Impl.dsp: (removed)
+          Me thinks that the Release and Static configurations should
+          also compile, and me thinks that it is now fixed.
+
+Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
+          method assumes ownership of <next_arg>, rather than copying it.
+          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
+          Fixes [Bug 807].
+
+          The generated version_tests dsp didn't work (since DLL_Test_Impl
+          creates a library).  Manually created the configurations in the
+          tests/DLL_Test_Impl.dsp version instead.
+
+Mon Feb 26 15:54:33 2001  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b)
+
+        * docs/tutorials/013/message_queue.cpp:
+        * tests/Malloc_Test.cpp:
+
+        Fixed errors in #pragma instiate lines including removal of ';',
+        mispellings
+
+        * ace/config-all.h:
+
+        Added definition of Unixware UDK for definition of ACE_NOTREACHED()
+
+        * ace/config-unixware-7.1.0.udk.h:
+        * include/makeinclude/platform_unixware_udk.GNU:
+
+        New configuration files for building on Unixware 7 with UDK CC.
+
+Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
+          method assumes ownership of <next_arg>, rather than copying it.
+          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
+          Fixes [Bug 807].
+
+Mon Feb 26 12:27:46 2001  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ace/CDR_Stream.h:
+        * ace/CDR_Stream.i:
+          Added method to reset the byte order in class OuputCDR.  This
+          will be used by a gateway to set the byte order of a reply to a
+          reqest it has handled to one different than the gateway's own
+          byte order, if necessary. It should be called while the stream
+          is still empty, that is, before any part of the reply, including
+          the header, has been marshaled.
+
+Mon Feb 26 12:07:00 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before
+          setting the MAP_FIXED flag.  Thanks to <rhuber@amadeus.net> for
+          reporting this. [Bug 752]
+
+Mon Feb 26 09:29:36 2001  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+        * ace/RB_Tree.h:
+          Fully qualified enum name. This fixes problems on gcc-272 builds.
+
+Mon Feb 26 00:19:28 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        Time to do some spring cleaning...
+
+        * tests/version_tests/Config_Test.dsp: (added)
+        * tests/version_tests/DLL_Test_Impl.dsp: (added)
+        * tests/version_tests/Log_Msg_Test.dsp: (added)
+        * tests/version_tests/Message_Queue_Test_Ex.dsp: (added)
+        * tests/version_tests/version_tests.dsw:
+
+          Updated the version_tests dir with create_vt_dsps.pl.
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+        * netsvcs/lib/netsvcs.dsp:
+        * netsvcs/servers/servers.dsp:
+        * tests/ACE_Init_Test.dsp:
+        * tests/Atomic_Op_Test.dsp:
+        * tests/Auto_IncDec_Test.dsp:
+        * tests/Barrier_Test.dsp:
+        * tests/Basic_Types_Test.dsp:
+        * tests/Buffer_Stream_Test.dsp:
+        * tests/CDR_Array_Test.dsp:
+        * tests/CDR_File_Test.dsp:
+        * tests/CDR_Test.dsp:
+        * tests/Cache_Map_Manager_Test.dsp:
+        * tests/Cached_Accept_Conn_Test.dsp:
+        * tests/Cached_Conn_Test.dsp:
+        * tests/Capabilities_Test.dsp:
+        * tests/Collection_Test.dsp:
+        * tests/Config_Test.dsp:
+        * tests/Conn_Test.dsp:
+        * tests/DLL_Test.dsp:
+        * tests/DLList_Test.dsp:
+        * tests/Dirent_Test.dsp:
+        * tests/Dynamic_Priority_Test.dsp:
+        * tests/Enum_Interfaces_Test.dsp:
+        * tests/Env_Value_Test.dsp:
+        * tests/Future_Set_Test.dsp:
+        * tests/Future_Test.dsp:
+        * tests/Handle_Set_Test.dsp:
+        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
+        * tests/Hash_Map_Manager_Test.dsp:
+        * tests/High_Res_Timer_Test.dsp:
+        * tests/IOStream_Test.dsp:
+        * tests/Lazy_Map_Manager_Test.dsp:
+        * tests/Log_Msg_Test.dsp:
+        * tests/MEM_Stream_Test.dsp:
+        * tests/MM_Shared_Memory_Test.dsp:
+        * tests/MT_Reactor_Timer_Test.dsp:
+        * tests/MT_SOCK_Test.dsp:
+        * tests/Malloc_Test.dsp:
+        * tests/Map_Manager_Test.dsp:
+        * tests/Map_Test.dsp:
+        * tests/Mem_Map_Test.dsp:
+        * tests/Message_Block_Test.dsp:
+        * tests/Message_Queue_Notifications_Test.dsp:
+        * tests/Message_Queue_Test.dsp:
+        * tests/Message_Queue_Test_Ex.dsp:
+        * tests/Naming_Test.dsp:
+        * tests/New_Fail_Test.dsp:
+        * tests/Notify_Performance_Test.dsp:
+        * tests/OS_Test.dsp:
+        * tests/Object_Manager_Test.dsp:
+        * tests/OrdMultiSet_Test.dsp:
+        * tests/Pipe_Test.dsp:
+        * tests/Priority_Buffer_Test.dsp:
+        * tests/Priority_Reactor_Test.dsp:
+        * tests/Priority_Task_Test.dsp:
+        * tests/Process_Manager_Test.dsp:
+        * tests/Process_Mutex_Test.dsp:
+        * tests/Process_Strategy_Test.dsp:
+        * tests/RB_Tree_Test.dsp:
+        * tests/Reactor_Exceptions_Test.dsp:
+        * tests/Reactor_Notify_Test.dsp:
+        * tests/Reactor_Performance_Test.dsp:
+        * tests/Reactor_Timer_Test.dsp:
+        * tests/Reactors_Test.dsp:
+        * tests/Reader_Writer_Test.dsp:
+        * tests/Recursive_Mutex_Test.dsp:
+        * tests/Refcounted_Auto_Ptr_Test.dsp:
+        * tests/Reverse_Lock_Test.dsp:
+        * tests/SOCK_Connector_Test.dsp:
+        * tests/SOCK_Send_Recv_Test.dsp:
+        * tests/SOCK_Test.dsp:
+        * tests/SPIPE_Test.dsp:
+        * tests/SString_Test.dsp:
+        * tests/SV_Shared_Memory_Test.dsp:
+        * tests/Semaphore_Test.dsp:
+        * tests/Service_Config_Test.dsp:
+        * tests/Sigset_Ops_Test.dsp:
+        * tests/Simple_Message_Block_Test.dsp:
+        * tests/Svc_Handler_Test.dsp:
+        * tests/TSS_Test.dsp:
+        * tests/Task_Test.dsp:
+        * tests/Thread_Manager_Test.dsp:
+        * tests/Thread_Mutex_Test.dsp:
+        * tests/Thread_Pool_Reactor_Test.dsp:
+        * tests/Thread_Pool_Test.dsp:
+        * tests/Time_Service_Test.dsp:
+        * tests/Time_Value_Test.dsp:
+        * tests/Timeprobe_Test.dsp:
+        * tests/Timer_Queue_Test.dsp:
+        * tests/Tokens_Test.dsp:
+        * tests/UPIPE_SAP_Test.dsp:
+        * tests/Upgradable_RW_Test.dsp:
+
+          Removed the Alpha configurations.  I don't think we've actually
+          looked at these for over a year, and they are missing from a lot
+          of projects.  Thankfully, they are easy to recreate if they are
+          needed.
+
+        * ACE-INSTALL.html:
+
+          Changed the Windows NT Alpha section to mention that we no
+          longer have configurations out of the box for Win32/Alpha, they
+          must be recreated if needed.
+
+        * WindozeCE/ACEApp.cpp: (removed)
+        * WindozeCE/ACEApp.h: (removed)
+        * WindozeCE/README: (removed)
+        * WindozeCE/StdAfx.cpp: (removed)
+        * WindozeCE/StdAfx.h: (removed)
+        * WindozeCE/WindozeCE.aps: (removed)
+        * WindozeCE/WindozeCE.clw: (removed)
+        * WindozeCE/WindozeCE.cpp: (removed)
+        * WindozeCE/WindozeCE.dsp: (removed)
+        * WindozeCE/WindozeCE.h: (removed)
+        * WindozeCE/WindozeCE.rc: (removed)
+        * WindozeCE/WindozeCEDlg.cpp: (removed)
+        * WindozeCE/WindozeCEDlg.h: (removed)
+        * WindozeCE/resource.h: (removed)
+        * WindozeCE/res/WindozeCE.ico: (removed)
+        * WindozeCE/res/WindozeCE.rc2: (removed)
+
+          No longer used.
+
+        * Makefile:
+
+          Removed WindozeCE from CONTROLLED_FILES.
+
+        * tests/WinCE/Atomic_Op_Test.dsp: (removed)
+        * tests/WinCE/Barrier_Test.dsp: (removed)
+        * tests/WinCE/Basic_Types_Test.dsp: (removed)
+        * tests/WinCE/Buffer_Stream_Test.dsp: (removed)
+        * tests/WinCE/Conn_Test.dsp: (removed)
+        * tests/WinCE/DLL_Test.dsp: (removed)
+        * tests/WinCE/Enum_Interfaces_Test.dsp: (removed)
+        * tests/WinCE/Future_Test.dsp: (removed)
+        * tests/WinCE/Handle_Set_Test.dsp: (removed)
+        * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed)
+        * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed)
+        * tests/WinCE/MT_SOCK_Test.dsp: (removed)
+        * tests/WinCE/Map_Manager_Test.dsp: (removed)
+        * tests/WinCE/Mem_Map_Test.dsp: (removed)
+        * tests/WinCE/Message_Block_Test.dsp: (removed)
+        * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed)
+        * tests/WinCE/Message_Queue_Test.dsp: (removed)
+        * tests/WinCE/Notify_Performance_Test.dsp: (removed)
+        * tests/WinCE/OrdMultiSet_Test.dsp: (removed)
+        * tests/WinCE/Priority_Buffer_Test.dsp: (removed)
+        * tests/WinCE/Priority_Task_Test.dsp: (removed)
+        * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed)
+        * tests/WinCE/Reactor_Notify_Test.dsp: (removed)
+        * tests/WinCE/Reactor_Performance_Test.dsp: (removed)
+        * tests/WinCE/Reactor_Timer_Test.dsp: (removed)
+        * tests/WinCE/Reactors_Test.dsp: (removed)
+        * tests/WinCE/Reader_Writer_Test.dsp: (removed)
+        * tests/WinCE/Recursive_Mutex_Test.dsp: (removed)
+        * tests/WinCE/SOCK_Connector_Test.dsp: (removed)
+        * tests/WinCE/SOCK_Test.dsp: (removed)
+        * tests/WinCE/SString_Test.dsp: (removed)
+        * tests/WinCE/Semaphore_Test.dsp: (removed)
+        * tests/WinCE/Sigset_Ops_Test.dsp: (removed)
+        * tests/WinCE/Simple_Message_Block_Test.dsp: (removed)
+        * tests/WinCE/TSS_Test.dsp: (removed)
+        * tests/WinCE/Task_Test.dsp: (removed)
+        * tests/WinCE/Thread_Manager_Test.dsp: (removed)
+        * tests/WinCE/Thread_Mutex_Test.dsp: (removed)
+        * tests/WinCE/Thread_Pool_Test.dsp: (removed)
+        * tests/WinCE/Time_Value_Test.dsp: (removed)
+        * tests/WinCE/Timer_Queue_Test.dsp: (removed)
+        * tests/WinCE/ce_tests.dsw: (removed)
+
+          Removed these Windows CE Toolkit for Visual C++ files.
+
+Mon Feb 26 00:15:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/DLL_Test_Impl.dsp:
+
+          Made sure the Code Generation settings were correct.
+
+Sun Feb 25 19:40:11 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/ACEutils.pm (CheckForConfig):
+          This routine was not removing all the -Config options from the
+          command-line, causing problems in some of the tests.
+
+Sun Feb 25 16:33:26 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/DLL_Test.cpp:
+
+          Left the DLL end with a d in debug mode, but changed
+          the test to add the d when _DEBUG and ACE_WIN32 is
+          defined.  Test should now work again on Win2000_Debug.
+
+Sun Feb 25 11:28:06 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/run_test.pl:
+
+          When there are errors in the log, print out the entire
+          log.  This should make it much easier to understand
+          problems in the nightly build logs.
+
+Sun Feb 25 09:04:43 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/DLL_Test.cpp:
+          Accidentally left the 'd' suffix in the name of the DLL.
+
+Sat Feb 24 22:58:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/msvc_auto_compile.pl:
+        * TAO/TAOACE.dsw:
+        * TAO/TAOACE_Static.dsw:
+        * Static_Performance.dsw:
+
+          Removed references to gperf_lib.dsp
+
+        * TAO/version_tests.dsw: (removed)
+
+          This was still referring to orbsvcs.dsp, which shows that
+          it is way out of date (and not used).  Zapped.
+
+Sat Feb 24 20:59:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * apps/gperf/src/gperf.dsp:
+        * apps/gperf/src/gperf.dsw:
+        * apps/gperf/src/gperf_lib.dsp: (removed)
+
+          Merged gperf into one project.  This will bring the
+          structure in line with the Makefiles.
+
+Sat Feb 24 19:28:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.i:
+
+          Fixed my recent changes to ACE_OS::dlsym () to work on
+          Windows CE.
+
+Sat Feb 24 17:50:38 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/DLL_Test.cpp:
+
+          OBJ_PREFIX was being created by attaching a char string to
+          a ACE_TCHAR string.  Needed to add ACE_TEXT to the first
+          string for compilation on ACE_USES_WCHAR.
+
+        * tests/DLL_Test_Impl.dsp:
+
+          Changed the internal name to "DLL_Test DLL" to make sure
+          this gets compiled in the first pass by msvc_auto_compile.pl.
+
+        * tests/run_test.pl:
+
+          Added a check for LM_WARNINGs in log files.  Let's see if
+          there have been any hidden (DLL_Test actually was producing
+          a warning on Windows, but Carlos's fix already got rid of it,
+          Yay!).
+
+Sat Feb 24 15:44:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/tests.dsw:
+        * tests/DLL_Test_Impl.dsp:
+          Add new project file for the shared library used in the test.
+
+        * tests/DLL_Test.cpp:
+        * tests/DLL_Test_Impl.cpp:
+          Change the Win32 version to load a shared library instead of the
+          exe.
+
+Sat Feb 24 14:07:11 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/Thread_Pool_Reactor_Test.cpp:
+
+          Did a careful study of what this test was doing in regards to
+          sending wide-character strings, and made it consistent.  The
+          most troublesome aspect was the fact that the length is encoded
+          in the shutdown string ("\011shutdown") which meant that I had
+          to send the length in characters, not in bytes.  This should
+          really fix [Bug 537].
+
+Sat Feb 24 14:37:00 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * ace/config-g++-common.h
+          gcc 2.97 and higher require the use of the std namespace for
+          iostrams
+
+Sat Feb 24 10:27:04 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Disable the interceptor tests when the ORB is compiled without
+          interceptor support.
+
+        * tests/run_test.lst:
+          Disable the Reactor_Notify_Test on single threaded builds, it
+          uses threads.
+
+        * bin/nightlybuilds/scoreboard_update.pl:
+          Fixed usage message.
+
+Sat Feb 24 09:45:18 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/run_test.lst:
+          Disable the DLL_Test on KCC/Linux builds.  The test runs
+          normally, but crashes on shutdown(), it appears as if the
+          run-time system is invoking the destructors after the library is
+          unloaded.
+
+        * tests/Makefile:
+        * tests/Makefile.DLL_Test:
+        * tests/DLL_Test.h:
+        * tests/DLL_Test.cpp:
+        * tests/DLL_Test_Impl.h:
+        * tests/DLL_Test_Impl.cpp:
+          Cleanup code, and truly separate the shared library code to a
+          completely new separate file.
+
+Sat Feb 24 09:51:45 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Pass the -Config options to each script, this helps the
+          $ACE_ROOT/bin/run_test.pl script that needs to disable some
+          tests in certain configurations.
+
+Sat Feb 24 08:21:48 2001  David L. Levine <levine@cs.wustl.edu>
+
+        * include/makeinclude/platform_vxworks5.x_g++.GNU:
+          added -fno-implicit-templates on Tornado II for Intel 386
+          family targets.  Thanks to Albert Wijnja <Albert.Wijnja@meco.nl>
+          for reporting that static template data members weren't really on
+          VxWorks/386, and to Greg Holtmeyer <greg.holtmeyer@windriver.com>
+          for confirming that -fno-implicit-templates should work with
+          the Tornado II g++.  [Bug 658]
+
+Thu Feb 22 15:59:04 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the
+          function as "localtime".  This is now fixed.  Thanks to Mason
+          Deaver <mason.deaver@tripointglobal.com> for reporting this.
+
+Fri Feb 23 19:44:36 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ACE version 5.1.13 released.
+
+Thu Feb 22 12:28:15 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/TP_Reactor.cpp (handle_events): Here is the description of
+          how things were working and where the problem was: In the
+          TP_Reactor there is one leader thread waiting in select() and
+          the others waiting on the token.  During deactivation(), the
+          <deactivation_> flag is set on the reactor, signal_all_threads()
+          is called on the token, and an empty notification is send to the
+          current leader thread.  signal_all_threads() sets the
+          <signal_all_threads_> flag on the Token when there are waiters
+          on the Token (does nothing if there are no waiters).  This
+          scheme worked fine when there were leader and follower threads
+          waiting.  When a new leader is chosen, it returns the magic
+          number 2 from token.acquire_read() and hence exits gracefully
+          from the handle_events().  However, the problem was that when
+          some (or all) of the TP threads are busy running upcalls,
+          signal_all_threads() was a no-op and the magic number 2 was not
+          returned from token.acquire_read() and hence the exit from
+          handle_events() was flagged as an error.
+
+          The fix is as described below:
+
+          (1) ACE_Token::signal_all_threads() does not make sense.  The
+          token is a mutex, not a condition variable.  Therefore, it does
+          not make sense to have a signal_all_threads() methods.  Plus I
+          believe that the method does not do as advertised.  Therefore, I
+          removed this method from the token class.
+
+          (2) There is no need to signal all the threads in the
+          TP_Reactor.  Marking the Reactor as closed and signaling the
+          leader thread is enough.  The leader thread will wake up to
+          handle the empty event, the next leader will see that the
+          Reactor is closed and exit gracefully.  This will continue until
+          all the waiters are drained.
+
+          (3) With the above change, there is no need to check for an
+          magic returns from token.acquire_read().  When a thread gets the
+          token, it checks the deactivation flag before proceeding.  If
+          the Reactor is closed, it gracefully exits.  Otherwise, it
+          continues as leader.
+
+          (4) Since there is no need to call token.signal_all_threads(),
+          ACE_TP_Reactor::wakeup_all_threads() can be removed since it is
+          now the same as ACE_Select_Reactor_T::wakeup_all_threads().
+
+          Note that this change should help with making
+          Thread_Pool_Reactor_Test run without shutdown errors.
+
+        * ace/Select_Reactor_T.i (deactivate): The setting of the
+          <deactivated_> flag and waking up of all the threads should be
+          atomic.  I am being picky about this one but I think am I right.
+          Also added the guard to the accessor.
+
+Thu Feb 22 08:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.i:
+
+          Bleh.  Changed an && to || to make sure we get a symbolname
+          variable for non-Unicode Win32.
+
+          "He who lives without committing any folly is not so
+          wise as he thinks"  - La Rochefoucauld
+
+Thu Feb 22 08:43:30 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/rules.local.GNU:
+          Add SunWS_cache and ir.out to the list of files removed by
+          the realclean pseudo-target.  This directory is used by Sun/CC
+          5.0 (and Forte), if not removed the information there can become
+          stale, and break the builds.
+          This should fix the Sun/CC 5.0 nightly builds.
+
+Thu Feb 22 07:51:36 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001
+          Krishnakumar B  <kitty@ace.cs.wustl.edu> ".
+
+Thu Feb 22 03:31:06 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
+
+        * ace/OS.i (dlsym):
+          Hopefully fixed the Win32 builds. Removed a extra ! in the
+          #ifdef.
+
+Thu Feb 22 02:58:36 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
+
+        * VERSION:
+        * PROBLEM-REPORT-FORM:
+        * ace/Version.h:
+        Reverted the changes and restored the old versions of
+        these files as the beta build script was killed. Pain :-(
+
+Wed Feb 21 20:10:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.i:
+        * tests/DLL_Test.cpp:
+        * tests/Thread_Pool_Reactor_Test.cpp:
+
+          Fixed the remaining problems with the Win2000_Unicode tests.
+          [Bug 537]
+
+Tue Feb 20 21:19:39 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Svc_Conf.h:
+          Add ACE_Export macro for ace_create_service_type() it is used
+          outside the library now.
+
+Tue Feb 20 06:34:26 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly
+          set ACE_HAS_GNUG_PRE_2_8.  Thanks to Christian von Mueffling
+          <cvm@aiss.de> for reporting this.
+
+        * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in
+          the ACE_TRACE macro.  Thanks to Mike Curtis for reporting this.
+
+Mon Feb 19 16:38:08 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/Asynch_Acceptor.{h,cpp}:
+        Added method void handle (ACE_HANDLE) and made it call the base
+        class's handle(ACE_HANDLE) method to remove warning about
+        partial overloading. Fix suggested by Irfan.
+
+Sun Feb 18 21:55:16 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/OS.h:
+        Added an extern "C" void ace_mutex_lock_cleanup_adapter before
+        the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on
+        SunCC 5.x.
+
+Sun Feb 18 17:16:41 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * netsvcs/clients/Tokens/manual/manual.cpp (main),
+        * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the
+          ACE_HAS_TOKENS_LIBRARY stuff.  Thanks to Kitty for reporting
+          this.
+
+Sun Feb 18 16:28:45 2001  Chris Gill  <cdgill@cs.wustl.edu>
+
+        * ace/RB_Tree.h: Changed order of method declarations to (hopefully)
+          dodge an internal compiler error on VxWorks.
+
+Sun Feb 18 09:59:18 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * netsvcs/clients/Tokens:
+        * netsvcs/servers/main.cpp (main):
+        * netsvcs/servers/svc.conf:
+        * netsvcs/lib/Token_Handler: Only compile this stuff if the
+          ACE_HAS_TOKENS_LIBRARY macro is enabled.  Thanks to Carlos
+          for reporting this.
+
+        * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY
+          so we can skip initializing certain things if that macro is
+          undefined.
+
+        * ace/Token_Collection.*:
+        * ace/Token_Invariants.*:
+        * ace/Token_Manager.*:
+        * ace/Local_Tokens.*:
+        * ace/Remote_Tokens.*:
+        * ace/Token_Request_Reply.*:
+          Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled
+          since this functionality does not appear to be widely used and
+          yet it takes up space.
+
+        * tests/Tokens_Test.cpp (main): Only run this test if
+          ACE_HAS_TOKENS_LIBRARY is defined.
+
+Sat Feb 17 17:23:46 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/SOCK_Dgram_Mcast.cpp:
+
+          Integrated a fix from Keith Nicewarner <knicewar@erg.sri.com>
+          In effect, this reverts the multicast code changed on
+              Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
+          for all platforms except linux.
+
+Sat Feb 17 15:52:09 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/run_all_list.pm:
+        * tests/run_tests.pl:
+          Remove obsolete scripts.
+
+Sat Feb 17 13:26:17 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast
+          -1 to void * since that's the signature of the method.  Thanks
+          to Bala for reporting this.
+
+        * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused
+          result local variable and also changed the logic to bailout if
+          handle_events() returns -1.  This fixes a warning reported by
+          KCC.
+
+Fri Feb 16 17:39:16 2001  Mayur Deshpande  <mayur@ics.uci.edu>
+
+        * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER.
+          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
+
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to
+          CCFLAGS and 'exceptions=1' at end of file.
+          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
+
+Fri Feb 16 05:37:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Logging_Strategy.h: Updated the documentation to explain what
+          the various options mean.
+
+        * tests/Log_Msg_Test.cpp (test_log_msg_features): Added
+          ACE_Log_Msg::PROCESS to a couple of priority_mask() calls to
+          make the test work correctly.  Thanks to Kitty for reporting
+          this.
+
+Thu Feb 15 17:53:31 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * ace/Thread_Manager.i: Simplified casting in
+          ACE_Thread_Descriptor::get_next per suggestion from Carlos.
+
+Thu Feb 15 14:57:59 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next.
+
+Thu Feb 15 11:33:55 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0)
+          to make sure that this test terminates...
+
+        * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to
+          make certain compilers happy.
+
+        * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32.
+
+Thu Feb 15 08:49:44 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+          Rename WashU builds so all the Debian builds appear together.
+
+Thu Feb 15 07:15:39 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple
+          log files, rather than just two.  Thanks to Orlando Ribeiro
+          <oribeiro@inescporto.pt> for this fix.
+
+Thu Feb 15 03:36:46 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * bin/nightlybuilds/builds.lst (WEB):
+        Added a new build with TAO_MINIMUM linked statically.
+
+Wed Feb 14 05:28:59 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(),
+          task(), get_next(), and self().  Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for reporting this.
+
+Tue Feb 13 17:51:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS.
+          Thanks to Mike Curtis for reporting this.
+
+        * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run.
+          Thanks to Mike Curtis for reporting this.
+
+Wed Feb 14 12:08:10 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read.
+          If record was a multiple of BUFSIZ and the record was
+          terminated with an EOF instead of a "term" character,
+          rec_read would return 0 instead of the actual data read in.
+          The problem was that the partial buffer fill size was being
+          checked instead of the total number of bytes read in.  This
+          issue was noticed when trying to read in an IOR file in TAO
+          that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long.
+
+Tue Feb 13 14:44:28 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/ace_wchar.inl: Changed several variable from type <size_t>
+          to type <int> as on 64-bit whistler, size_t and int are not the
+          same size which confuses 64-bit compiler.  (Per Kitty's
+          request.)
+
+Tue Feb 13 10:23:31 2001  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of
+          handle () method and handle_ member to ACE_Handler). Moved the
+          handle_ member to the JAWS_Synch_IO class - it needs it, and
+          JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left
+          the handle () methods in JAWS_IO, but made them pure virtual,
+          implemented in JAWS_Synch_IO (implementation moved from JAWS_IO)
+          and in JAWS_Asynch_IO, where they forward up to ACE_Handler's
+          handle () methods.
+
+Mon Feb 12 18:18:05 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
+
+        * tests/Thread_Mutex_Test.cpp:
+          Modified test to use process mutexes for Win32 platforms
+          so that timed mutexes could be tested.
+
+Sun Feb 11 15:33:39 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/QoS/ACE_QoS_Export.h:
+
+          Added ACE_AS_STATIC_LIBS support.
+
+        * ace/QoS/ACE_QoS.dsp:
+        * ace/QoS/ACE_QoS_Lib.dsp:
+
+          Fixed to comply with ACE standards.
+
+Sun Feb 11 10:50:10 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_g++.GNU (exceptions):
+          Only set the -fno-exceptions option if we're *not* using GCC
+          2.7.2!  Thanks to Pradeep for explaining how to do this.
+
+Sun Feb 11 10:15:08 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * ace/Makefile.bor:
+        * ace/QoS/Makefile.bor:
+        * include/makeinclude/ace_flags.bor:
+          Added build support for QoS library with Borland compiler.
+
+Sat Feb 10 15:29:08 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Message_Block.h:
+          Improved documentation for the lenth(), size() and space()
+          methods.
+
+Sat Feb 10 07:19:37 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * include/makeinclude/outputdir.bor:
+          Removed the now out-of-date comment about pascal/non-pascal
+          build directories.
+
+        * ace/config-win32-borland.h:
+          Added support for new ACE_HAS_VCL define to enable inclusion
+          of VCL header files.
+
+Fri Feb  9 16:47:44 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/Makefile.am:
+          Removed references to the AQoSA files.
+
+Fri Feb  9 16:42:10 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * examples/QOS/client.dsp:
+        * examples/QOS/server.dsp:
+          Updated the corrected project files.
+          Thanks to Darrell for pointing this out.
+
+Thu Feb  8 19:25:03 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * performance-tests/RPC/run_test.pl:
+        * performance-tests/TCP/run_test.pl:
+        * performance-tests/UDP/run_test.pl:
+          Add driver strings
+
+Thu Feb 08 19:18:36 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Removed comment from Exposed Policies test. The test has been fixed.
+
+Thu Feb  8 14:11:36 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ws2tcpip.h:  [Removed]
+
+          I don't see any reason to have this file in ace; it is a system
+          header file.  And from [Bug 722], our version is out of date anyway.
+
+        * ace/OS.h:
+
+          Changed to include system version of ws2tcpip.h
+
+        * ace/Makefile.am:
+        * ace/ace-dll.icc:
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+
+          Removed references to ws2tcpip.h.
+
+        * ace/SOCK_Connect.cpp:
+
+          Changed get_ip_interfaces to remove a memory error.  Thanks to
+          Viatcheslav Batenine <slavikb@infra2000.com> for helping out with
+          this.
+
+        * ace/SOCK_Dgram_Mcast.cpp:
+
+          It looks like the change made on:
+
+          Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
+
+          doesn't work on Win32.  Reverted back to the old scheme for Win32
+          only.
+
+Thu Feb  8 00:34:57 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_g++.GNU: Added support for
+          -fno-exception when exceptions=0 is given to the Makefile.
+          Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting
+          this.
+
+Wed Feb  7 23:02:46 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a
+          new overridden cancel_aio() method.  Thanks to Alexander Libman
+          <Alibman@baltimore.com> for contributing this.
+
+Thu Feb  8 02:09:05 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * examples/QOS/Makefile:
+        * examples/QOS/client.dsp:
+        * examples/QOS/server.dsp:
+          Modified to use the ACE_QoS lib.
+        * Receiver_QoS_Event_Handler.cpp:
+        * Sender_QoS_Event_Handler.cpp:
+          Added missing Log_Msg.h for ACE_DEBUG.
+          Other files were modified to reflect changed directory location
+          of AQosA imclude files.
+
+Thu Feb  8 00:17:43 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/QoS_Decorator.cpp:
+        * ace/QoS_Session_Factory.cpp:
+        * ace/SOCK_Dgram_Mcast_QoS.cpp:
+        * ace/QoS_Decorator.h:
+        * ace/QoS_Session_Factory.h:
+        * ace/SOCK_Dgram_Mcast_QoS.h:
+        * ace/QoS_Manager.cpp:
+        * ace/QoS_Session_Impl.cpp:
+        * ace/SOCK_Dgram_Mcast_QoS.i:
+        * ace/QoS_Manager.h:
+        * ace/QoS_Session_Impl.h:
+        * ace/QoS_Session_Impl.i:
+          Moved the AQoSA classes to ace/QoS directory.
+
+        * ace/Makefile:
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+          Removed the QoS related files, added QoS directory to build.
+
+        * ace/Qos/Makefile
+        * ace/QoS/ACE_QoS.dsw:
+        * ace/QoS/ACE_QoS.dsp:
+        * ace/QoS/ACE_QoS_Lib.dsp:
+        * ace/QoS/ACE_QoS_Export.h:
+          Added Makefile and MSVC project files.
+          Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this
+          change and providing the patch.
+
+Wed Feb  7 11:34:56 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp:
+          Fix build problems for single threaded environments.
+
+Wed Feb  7 09:03:22 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed
+          incorrect if/else branching.  Thanks to Lu Yunhai
+          <luyunhai@huawei.com> for reporting this.
+
+Tue Feb  6 23:43:49 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of
+          %s to be %*s since the string may not be nul terminated!  Thanks
+          to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+
+Tue Feb  6 20:11:28 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+
+        Remove double inclusion of $(CFLAGS) for Sun CC 5.0.
+
+Tue Feb  6 19:30:26 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/Malloc_T.cpp (shared_malloc):
+        Added a #ifdef to remove the warnings from Digital Tru64 cxx. This
+        is a temporary workaround. TODO: Change ACE_SEH_* macros so that such
+        hacks are unnecessary.
+
+Tue Feb  6 19:23:16 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+        Complete reverting the changes made by Irfan on Sat Jan 27
+        01:06:09 2001. This file was missed in the last revert done by me.
+
+Tue Feb 06 19:03:35 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure
+          to add CFLAGS into CCFLAGS, even if no other options are added. Else
+          things get built without -mt.
+
+Tue Feb 06 18:37:41 2001  Steve Huston  <shuston@riverace.com>
+
+        * tests/Thread_Mutex_Test.cpp: Changed wording of the message for
+          "timed acquire" not supported so as not to trip the error catcher
+          in run_tests.pl.
+
+Tue Feb 06 17:55:28 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/post_completions.cpp: Allow this to
+          run with AIOCB_Proactor.
+
+        * ace/Asynch_IO.{h cpp}: Added ACE_Handler::handle (ACE_HANDLE)
+          function to set the handle; changed ACE_HANDLE ACE_Handler::handle
+          to return the actual value.
+
+        * ace/Asynch_Acceptor.cpp (handle_accept): Call ACE_Handler::handle
+          to set the handle value for the new handler before calling its
+          open() method.
+
+Tue Feb 06 17:16:43 2001  Steve Huston  <shuston@riverace.com>
+
+        * tests/MEM_Stream_Test.cpp:
+        * tests/MEM_Stream_Test.h: New file; moved definition of Echo_Handler
+          from MEM_Stream_Test.cpp to this file to make it visible to AIX
+          C++ 3.6.6 at template instantiation time.
+
+Mon Feb  5 16:19:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname").
+          Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+
+        * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN
+          macros to use the form 0x0123 rather than 0123X.  Thanks to
+          Craig Rodrigues <crodrigu@bbn.com> for helping find this
+          problem.
+
+Mon Feb  5 18:20:11 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/config-sunos5.5.h (ACE_USES_OLD_IOSTREAMS):
+
+          Reverted the change to config-sunos5.5.h and turned on
+          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION,
+          ACE_TEMPLLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the
+          SunCC 5.0 compiler.
+
+Mon Feb  5 16:19:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/RMCast/Send_File/Receiver.cpp (init): Replaced
+          a hard-coded file permission of 0644 with
+          ACE_DEFAULT_FILE_PERMS.  Thanks to Chris Kohlhoff
+          <chris@kohlhoff.com> for reporting this.
+
+Mon Feb  5 13:00:17 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * tests/Thread_Mutex_Test.cpp: (reported_notsup)
+          Removed a warning about defined but not used.
+
+Sat Feb  3 14:41:17 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.h:
+        * ace/config-win32-msvc.h:
+
+          Fixed problems with LLSEEK and ACE_stat on Windows CE.
+
+Sat Feb  3 14:12:36 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/Config_Test.cpp:
+        * tests/Config_Test.h:
+        * tests/Log_Msg_Test.cpp:
+
+          Fixed ACE_USES_WCHAR problems.
+
+Fri Feb 02 18:36:42 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-linux-common.h: Added #define ACE_POSIX_AIOCB_PROACTOR
+          unless the user #defines ACE_POSIX_SIG_PROACTOR before including
+          config-linux.h. (At least prior to 2.4 kernels) queueing signals
+          across threads does not work - it fails silently, which breaks
+          basic functionality of the async model - like asynchronously
+          accepting TCP connections - and pretty much prevents multi-threaded
+          work with timers and probably other async operations.
+
+        * examples/Reactor/Proactor/test_proactor.cpp: Disabled the ACE_DEBUG
+          calls that display message buffers - they're often too large and
+          overrun the ACE_Log_Msg buffers and crash the program.
+
+Fri Feb  2 08:38:37 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/WFMO_Reactor.cpp (handler): Set the existing_masks variable to 0
+          to avoid warnings from static analysis tools.  Thanks to Ivan
+          Murphy for reporting this.
+
+Thu Feb 01 22:00:17 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp
+
+          Fixed the bugs which were giving runtime error on
+          Win32 - removed "queue_type" from single_thread_performance_test
+          and performance_test functions. Now these funtions dont
+          have args.
+
+        * tests/tests.dsw
+
+          Just an update of the workspace.
+
+Thu Feb  1 21:00:57 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * bin/auto_compile_win32.pl:
+        * bin/run_all_list.pm:
+
+          Added TAO RT Mutex unit tests to auto build and test
+          lists.
+
+Thu Feb 01 18:52:27 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+        * RTJava:
+          Added Directory for RTJava related research. Check the
+          ChangeLog included in the newly directory for more info.
+
+Thu Feb 01 18:23:17 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
+
+        * tests/Log_Msg_Test.dsp:
+        * tests/Config_Test.dsp:
+
+          Added these files.
+        * tests/tests.dsw:
+
+          Added the above two projects to the workspace.
+
+Thu Feb  1 18:01:26 2001  Luther J Baker  <luther@cs.wustl.edu>
+
+        * ace/OS.i (mutex_init):
+
+          Removed call into PACE.
+
+Thu Feb 01 18:21:15 2001  Steve Huston  <shuston@riverace.com>
+
+        * tests/Thread_Mutex_Test.cpp: Only report "operation not supported"
+          once for a failed ACE_Thread_Mutex::acquire (ACE_Time_Value &).
+          Also, if it reports ENOTSUP while ACE_HAS_MUTEX_TIMEOUT is
+          defined, warns the user that it's probably the wrong setting.
+
+Thu Feb 01 17:36:28 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/test_proactor3.cpp: Fixed a non-constant
+          array dimension and some output formatting.
+
+Thu Feb 01 17:07:35 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/post_completions.cpp: Removed extraneous
+          'd' from the 'count' display.
+
+Thu Feb 01 15:33:26 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Reactor.h (purge_pending_notifications):
+        * ace/WFMO_Reactor.h (purge_pending_notifications):
+        * ace/Select_Reactor_Base.h (purge_pending_notifications):
+          Removed the default argument value - callers must now explicitly
+          specify a 0 ACE_Event_Handler* to remove all handler notifications.
+          Thanks to Edan Ayal <edana@bandwiz.com> for arguing this point.
+
+Thu Feb  1 09:57:41 2001  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ace/SString.i:
+
+          Changed behavior of ACE_WString::rep to be the same
+          as ACE_CString::rep, that is, to return an empty
+          (w)string rather than a null (w)string when the length
+          is 0. Thanks to Johnny Willemsen <johnny.willemsen@meco.nl>
+          for pointing out this discrepancy.
+
+Thu Feb  1 09:42:41 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+          Modification to allow building for Chorus 4.x on x86.  CPU will be
+          set to x86, but CLX_TYPE will be set to i486-elf-sysv4.
+
+Thu Feb 01 10:29:31 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed
+          the arg name to fix "unused argument" warning from g++.
+
+Wed Jan 31 22:01:00 2001  Rick Stille  <stille_r@ociweb.com>
+        * ace/OS.cpp(operator FILETIME): Corrected an error in the Jan 26 GHS
+          revision. The term "ACE_Time_Value::FILETIME_to_timval_skew" had been
+          omitted from the calculation.
+
+Wed Jan 31 18:43:26 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test):
+          Removed the warning about queue_type using ACE_UNUSED_ARG.
+
+Wed Jan 31 17:27:35 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Acceptor.cpp (ACE_Oneshot_Acceptor::handle_input): Unregister
+          the acceptor from the reactor before doing the shared_accept call
+          to guard against the use-case where the acceptor is destroyed during
+          the service handler activation sequence.
+
+Wed Jan 31 15:55:23 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * ace/Synch.i:
+          Added ACE_Null_Mutex::acquire (ACE_Time_Value &tv)
+          to fix link error.
+
+Wed Jan 31 15:12:00 2001  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ace/CDR_Stream.h:
+
+          Made method do_byte_swap() public. If ACE_ENABLE_SWAP_ON_WRITE
+          is defined, TAO_GIOP_Message_Base::format_message() and
+          TAO_GIOP_Message_Lite::format_message() both call this method.
+          Thanks to Paul Rubel <prubel@bbn.com> for reporting this bug.
+
+Wed Jan 31 12:19:51 2001  Steve Huston  <shuston@riverace.com>
+
+        * docs/tutorials/Chap_2/ex03.html, ex04.html: Fixed these example
+          programs to 1) send the Nul terminators with the strings,
+          2) allow enough space on the recv to get it all, 3) return a
+          value from main.
+
+        * docs/tutorials/Chap_2/Chap_2.zip: Updated the above examples.
+
+Wed Jan 31 06:43:27 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Message_Queue_T.cpp: Make sure that dequeue_head() returns
+          the number of items still on the queue.  Thanks to Johnny
+          Willemsen for reporting this.
+
+Tue Jan 30 21:39:15 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
+
+       * tests/Log_Msg_Test.cpp: In funtion test_ostream(), removed the
+          if condition to check if ACE_OS::unlink() succeeds. Also set
+          the ostream to NULL before calling ACE_ERROR_RETURN(). Thanks
+          to Mike Curtis <mccurry@my-deja.com> for pointing out problem
+          caused when ACE_OS::unlink() fails. Thanks to Doug in helping
+          fix the problem.
+
+Tue Jan 30 18:04:08 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test):
+          Zap the Win32 and VxWorks-specific code from this function.
+          Thanks to Sharath for reporting this.
+
+Tue Jan 30 11:34:26 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/test_aiosig_ace.cpp: Fixed a bunch
+          of mis-coded ACE_ERROR_RETURNs; added a explicit queued completion,
+          and disabled the display of buffers that may overrun ACE_Log_Msg's
+          internal buffers to prevent spurious crashes.
+
+Tue Jan 30 11:26:42 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/post_completions.cpp: Added a count
+          to be sure that all expected completions are delivered, and
+          print error message if not.
+
+Tue Jan 30 10:47:52 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Select_Reactor_Base.cpp
+          (ACE_Select_Reactor_Notify::purge_pending_notifications):
+        * ace/WFMO_Reactor.cpp
+          (ACE_WFMO_Reactor_Notify::purge_pending_notifications): Changed
+          to not purge notifications destined for the reactor only
+          (notification buffer with 0 handler value). Thanks to Edan
+          Ayal <edana@bandwiz.com> for this fix.
+
+Tue Jan 30 01:05:51 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test):
+          Add cases for VxWorks and NT.  Thanks to Sharath for reporting
+          this.
+
+        * ace/OS.h: #define _SC_AIO_MAX to 1 if it's not set by default.
+          Thanks to Jean-Francois Daune <Daune@IBA.be> for reporting this
+          fix for VxWorks.
+
+Mon Jan 20 18:36:41 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue_T.h (ACE_Message_Queue_Ex): Use _USE
+          rather than _DECL to define the ACE_Message_Queue - fixes
+          compile error.
+
+Mon Jan 29 17:29:31 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references
+          to Message_Queue_Ex's queue_ member to use . rather than ->
+          and removed the ACE_NEW to allocate it (follow-ups from Doug's
+          Sun Jan 28 08:32:07 2001 change). Fixed other compile
+          errors to allow tests/Message_Queue_Test_Ex.cpp to build.
+          FYI... whomever added this, it probably should have been named
+          Message_Queue_Ex_Test to conform.
+
+Mon Jan 29 15:30:27 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't
+          mask/block all signals, just the one(s) being used for this
+          sig proactor instance. Blocking everything can break other
+          things, such as debuggers and the ability to kill a program.
+          Also, don't setup a handler for the signals being blocked/waited
+          as this is a combination whose behavior is undefined.
+
+Sun Jan 28 08:39:17 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/Thread_Mutex_Test.cpp:
+          Fixed use of ACE_TEXT and string concatenation.
+
+Sun Jan 28 08:03:08 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/tests.dsw:
+        * tests/Message_Queue_Test_Ex.dsp:
+          Add NT project files for the new test
+
+Sun Jan 28 08:32:07 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * netsvcs/lib/Client_Logging_Handler.cpp: Fixed the order in which
+          the iostream messages are logged so that we don't bomb out when
+          the VERBOSE option is enabled.  Thanks to Craig Rodrigues
+          <crodrigu@bbn.com> for helping find this problem.
+
+        * ace/Message_Queue_T.h: Make sure the lock() forwarding method
+          forwards to queue_.lock().
+
+        * ace/Message_Queue_T.{h,i,cpp}: There's no reason to dynamically
+          allocate the implementation of ACE_Message_Queue_Ex -- instead
+          it can be simply an instance of ACE_Message_Queue.
+
+        * ace/Message_Queue_T.h: Make sure that the methods on
+          ACE_Message_Queue_Ex are properly virtual.  Thanks to Kitty for
+          pointing this out.
+
+Sat Jan 27 19:40:36 2001  Ossama Othman  <ossama@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added TAO's Portable Interceptor "Service_Context_Manipulation"
+          test to the list of tests to run.
+
+Sat Jan 27 19:34:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Config_Test.{h,cpp}: Fixed the use of "bool," which is
+          not supported on older compilers.  Thanks to Kitty for reporting
+          this.
+
+Sat Jan 27 15:22:03 2001  Ossama Othman  <ossama@uci.edu>
+
+        * tests/Thread_Mutex_Test.cpp (test):
+
+          Added code that tests mutex timeout functionality.
+
+Sat Jan 27 15:16:33 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/POSIX_Proactor.h: Replace ACE_Thread_Mutex with ACE_SYNCH_MUTEX
+          to avoid the need for conditional compilation.
+
+        * ace/SUN_Proactor.h: Don't use ACE_Condition<ACE_Thread_Mutex>
+          but instead use the ACE_SYNCH_CONDITION, which also avoids the
+          need to conditionally compile for threaded platforms.
+
+Sat Jan 27 13:29:51 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/config-linux.h:
+
+          Declare the pthread_mutex_timedlock() prototype as an
+          'extern "C"' function.  This fixes an "unresolved symbol" link
+          error.
+
+Sat Jan 27 10:39:28 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+          Apparently the blank in 'RedHat 7.0' breaks the scoreboard.
+
+Sat Jan 27 01:06:09 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU: SPRO 5.0
+          compiler should be able to support automatic template
+          instantiation.  Also, standard C++ library should be ok.  -g was
+          added to DCCFLAGS.
+
+        * ace/config-sunos5.5.h: Turned off
+          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION,
+          ACE_TEMPLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the
+          SPRO 5.0 compiler.
+
+          Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com>
+          for contributing the above patches.
+
+Sat Jan 27 00:37:26 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/OS.i:
+
+          - (mutex_lock): Windows code must use relative time since that
+          is what WaitForSingleObject() expects.  Also, fixed extra
+          "return" before ACE_NOTSUP_RETURN.
+
+          - (thread_mutex_lock): Made thread_mutex_lock() with timeout
+          close to the thread_mutex_lock() without timeouts.
+
+Fri Jan 26 21:53:45 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h:
+        * ace/OS.i (thread_mutex_lock):
+
+          Added an overloaded version of this method that accepts a
+          timeout argument.  It delegates to the standard
+          ACE_OS::mutex_lock() method on non-Windows platforms.
+          Otherwise, it returns with an ENOTSUP.
+
+          The addition of this method was necessary to fix a compile
+          problem related to the ACE_Thread_Mutex class.
+
+        * ace/Synch.i (acquire):
+
+          In ACE_Thread_Mutex::acquire() that accepts a timeout argument,
+          call the corresponding ACE_OS::thread_mutex_lock() method.  This
+          fixes compile-time error on MS Windows builds due to the fact
+          that ACE_mutex_t and ACE_thread_mutex_t are different types on
+          that platform.
+
+Fri Jan 26 17:31:26 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.i (mutex_lock):
+
+          Fixed unused argument warnings that occured when compiling for
+          the single threaded case.
+
+Fri Jan 26 16:58:03 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/config-linux.h:
+
+          glibc 2.1.x doesn't have the (very useful) __GLIBC_PREREQ
+          macro.  Use a preprocessor test that doesn't rely on it.
+
+Fri Jan 26 16:48:06 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/config-qnx-neutrino.h (ACE_HAS_MUTEX_TIMEOUTS):
+        * ace/config-qnx-rtp.h (ACE_HAS_MUTEX_TIMEOUTS):
+
+          QNX supports pthread_mutex_timedlock().  Yes!
+
+Fri Jan 26 17:50:38 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/config-win32-common.h:
+          ace/config-vxworks-5.x.h: Added ACE_HAS_MUTEX_TIMEOUTS macro.
+
+        * ace/OS.i: Added timed mutex operations for Win32, VxWorks, and
+          pSoS.
+
+Fri Jan 26 16:31:15 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h (mutex_lock):
+
+          Updated documentation for the version of this method that
+          accepts a timeout value.
+
+        * ace/OS.i (mutex_lock):
+
+          If the platform does not support timed mutexes, then return with
+          an ENOTSUP.
+
+        * ace/Process_Mutex.h:
+        * ace/Process_Mutex.inl (acquire):
+
+          Added version of this method that accepts a timeout value.
+
+Fri Jan 26 17:50:38 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp (report_stats):
+          Fixed some unintentional tabs.  Thanks to Mike Curtis for
+          reporting this!
+
+Fri Jan 26 15:34:01 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h:
+        * ace/OS.i (mutex_timedlock, mutex_lock):
+        * ace/Synch.i (acquire):
+
+          Renamed the ACE_OS::mutex_timedlock() to the overloaded
+          ACE_OS::mutex_lock().
+
+Fri Jan 26 14:13:32 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h:
+        * ace/OS.i (mutex_timedlock):
+
+          Wrapped the pthread_mutex_timedlock() function.  It times out if
+          a lock hasn't been acquired by the given absolute time.
+
+        * ace/Synch.h:
+        * ace/Synch.i (acquire):
+
+          Added versions of this method that accept an ACE_Time_Value.
+          They are used to prevent blocking definitely while waiting for a
+          given mutex to become available.
+
+        * ace/config-linux.h (ACE_HAS_MUTEX_TIMEOUTS):
+
+          glibc 2.2.x supports the pthread_mutex_timedlock() function.
+
+        * ace/config-linux-common.h:
+
+          Undefine ACE_LACKS_{LLSEEK,LSEEK64}_PROTOTYPE prior to include
+          the KCC configuration file.  Thanks to Jeff Greif
+          <jgreif@befree.com> for reporting this.
+
+        * ace/README:
+
+          Added ACE_HAS_MUTEX_TIMEOUTS to the list of ACE macros.
+
+Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Log_Msg.cpp (dump): Fixed some unintentional tabs.  Thanks
+          to Mike Curtis for reporting this!
+
+        * ace/SOCK_Dgram_Mcast.cpp (open): Modified the call to
+          ACE_SOCK_Dgram::shared_open() to just pass in this->mcast_
+          rather than making a local copy that just contained the port
+          number.  Thanks to Keith Nicewarner <knicewar@erg.sri.com> for
+          reporting this.
+
+        * tests/Makefile.bor (TESTS): Added Message_Queue_Test_Ex.cpp.
+
+Fri Jan 26 13:37:30 2001  Luther J Baker  <luther@cs.wustl.edu>
+
+        * ace/OS.h:
+
+          If using PACE, ACE_stat typedefs to pace_stat_s.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index 8d9638f4d2e..8c32988eae7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -19,9 +19,9 @@
 // ============================================================================
 
 #include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class Receiver_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
index 2495144eff1..06a5ee135b1 100755
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -16,15 +15,13 @@ $status = 0;
 
 $nsior = PerlACE::LocalFile ("ns.ior");
 $testfile = PerlACE::LocalFile ("output");
-
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
+$makefile = PerlACE::LocalFile ("input");
 
 unlink $nsior;
 
 $NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
-$SV  = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender -r 10 -f $input");
-$SV1  = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender -r 1 -f $input");
+$SV  = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender -r 10");
+$SV1  = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender -r 1");
 $RE1 = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -s distributer -r receiver1 -f output1");
 $RE2 = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -s distributer -r receiver2 -f output2");
 $DI  = new PerlACE::Process ("distributer", "-ORBInitRef NameService=file://$nsior -s sender -r distributer");
@@ -37,7 +34,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -107,7 +104,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -177,7 +174,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -234,7 +231,7 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $testfile, $input;
+unlink $testfile;
 
 exit $status;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index b4392ed9a4c..371cf9087fd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -19,9 +19,9 @@
 // ============================================================================
 
 #include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/input b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/input
new file mode 100644
index 00000000000..b6579cec283
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/input
@@ -0,0 +1,995 @@
+#----------------------------------------------------------------------------
+#	input,v 1.1 2001/03/27 11:41:00 irfan Exp
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SERVER_OBJS = server.o
+CLIENT_OBJS = ftp.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = ftp server
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = server ftp
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.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/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index 539f43b8b43..fdf5eca12f6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -18,11 +18,11 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 class Receiver_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
index efe05403c37..e5b712073f8 100755
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib $ENV{"ACE_ROOT"}.'/bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -17,14 +16,11 @@ $status = 0;
 $nsior = PerlACE::LocalFile ("ns.ior");
 $outfile = PerlACE::LocalFile ("output");
 
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
-
 unlink $nsior;
 
 $NS = new PerlACE::Process ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", "-o $nsior");
 $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -f output");
-$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f $input -r 2");
+$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f input -r 2");
 
 print STDERR "Starting Naming Service\n";
 
@@ -66,6 +62,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $output, $input;
+unlink $output;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index 16a78c88b96..38c4f0fc664 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 class Sender_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 5af3fec6390..666894ccecf 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -21,9 +21,9 @@
 #ifndef CONNECTION_MANAGER_H
 #define CONNECTION_MANAGER_H
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 #include "tao/PortableServer/PortableServer.h"
 
 class Connection_Manager
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 7c6383e799c..4dbf363f16d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -3,8 +3,8 @@
 #include "distributer.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index ab6f4753a14..fc9205c72c2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -19,9 +19,9 @@
 // ============================================================================
 
 #include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class Signal_Handler : public ACE_Event_Handler
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/input b/TAO/orbsvcs/tests/AVStreams/Component_Switching/input
new file mode 100644
index 00000000000..77483aa8712
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/input
@@ -0,0 +1,1376 @@
+#----------------------------------------------------------------------------
+#	$Id$
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SENDER_OBJS = sender.o
+DISTRIBUTER_OBJS = distributer.o
+RECEIVER_OBJS = receiver.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = sender distributer receiver
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = sender distributer receiver
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+
+.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+
+.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+#----------------------------------------------------------------------------
+#	$Id$
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SENDER_OBJS = sender.o
+DISTRIBUTER_OBJS = distributer.o
+RECEIVER_OBJS = receiver.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = sender distributer receiver
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = sender distributer receiver
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index 19a9c673b8c..1870574ee10 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -19,9 +19,9 @@
 // ============================================================================
 
 #include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class Signal_Handler : public ACE_Event_Handler
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
index 386c038f9a0..878b86cc065 100755
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib $ENV{'ACE_ROOT'}."/bin";
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -18,16 +17,14 @@ $status = 0;
 
 $nsior = PerlACE::LocalFile ("ns.ior");
 $testfile = PerlACE::LocalFile ("output");
-
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
+$makefile = PerlACE::LocalFile ("input");
 
 unlink $nsior;
 
 $NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-ORBDottedDecimalAddresses 1 -o $nsior");
-$SV1  = new PerlACE::Process ("sender", "-ORBDottedDecimalAddresses 1 ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30 -f $input");
-$SV2  = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30 -f $input");
-$SV3  = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30 -f $input");
+$SV1  = new PerlACE::Process ("sender", "-ORBDottedDecimalAddresses 1 ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30");
+$SV2  = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30");
+$SV3  = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30");
 $RE1 = new PerlACE::Process ("receiver", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s distributer -r receiver1 -f output1");
 $RE2 = new PerlACE::Process ("receiver", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s distributer -r receiver2 -f output2");
 $DI1 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r distributer");
@@ -43,7 +40,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -154,7 +151,7 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $testfile, $input;
+unlink $testfile;
 
 exit $status;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index 6b5e8ef9e76..5d9d4971e62 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -19,9 +19,9 @@
 // ============================================================================
 
 #include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 class Signal_Handler : public ACE_Event_Handler
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 6f11e981b6d..1edecfe0c74 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -120,7 +120,7 @@ Client::parse_args (int argc,
           break;
         case 'l':
           this->address_ = ACE_OS::strdup (opts.opt_arg ());
-		  l_addr = 1;
+		  l_addr = 1; 
           break;
         case 'a':
           this->peer_addr_ = ACE_OS::strdup (opts.opt_arg ());
@@ -145,7 +145,7 @@ Client::parse_args (int argc,
       address_ = buf;
       address_ += ":5000";
     }
-
+  
   if (p_addr == 0)
     {
       char buf [BUFSIZ];
@@ -154,7 +154,7 @@ Client::parse_args (int argc,
       peer_addr_ = buf;
       peer_addr_ += ":5050";
     }
-
+  
   return 0;
 }
 
@@ -252,11 +252,7 @@ Client::init (int argc,char **argv)
         {
           ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
         }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, "ERROR: file %s could not be opened\n",
-                                       this->filename_), -1);
-        }
+
     }
   ACE_CATCHANY
     {
@@ -307,12 +303,12 @@ Client::run (void)
 
       CORBA::Boolean result =
         this->streamctrl_.bind (sep_a_.in(),
-				sep_b.in(),
-				the_qos.inout(),
-				flow_spec
+				sep_b.in(), 
+				the_qos.inout(), 
+				flow_spec 
 				ACE_ENV_ARG_PARAMETER );
       ACE_TRY_CHECK;
-
+      
       timer.stop ();
       timer.elapsed_time (elapsed);
       elapsed.dump ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
index 132c98f1af8..b780e067d95 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
@@ -6,12 +6,12 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Flows_T.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
 
 class Client;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
index 242253d1740..ba31ae468a7 100755
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -16,21 +15,20 @@ $status = 0;
 
 $nsior = PerlACE::LocalFile ("ns.ior");
 $outfile = PerlACE::LocalFile ("output");
+$makefile = PerlACE::LocalFile ("Makefile");
 
 $debug = 0;
 
 unlink $nsior;
 
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
 
 @protocols = ("TCP",
  	      "UDP"
 	      );
 
-for ($i = 0; $i <= $#ARGV; $i++)
+for ($i = 0; $i <= $#ARGV; $i++) 
 {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") 
     {
         print STDERR "\nusage:  run_test\n";
 
@@ -42,7 +40,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
 
 	exit;
     }
-    elsif ($ARGV[$i] eq "-d")
+    elsif ($ARGV[$i] eq "-d") 
     {
 	$debug = $ARGV[$i + 1];
 	$i++;
@@ -55,10 +53,10 @@ print STDERR "Starting Naming Service\n";
 
 $NS->Spawn ();
 
-if (PerlACE::waitforfile_timed ($nsior, 10) == -1)
+if (PerlACE::waitforfile_timed ($nsior, 10) == -1) 
 {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -70,31 +68,31 @@ for $protocol (@protocols)
     {
 	$output_file = "RTP_output";
     }
-    else {
+    else { 
 	$output_file = $protocol."_output";
     }
 
     $SV = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -f ".$output_file);
-    $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $input");
-
+    $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $makefile");
+    
     print STDERR "Using ".$protocol."\n";
     print STDERR "Starting Server\n";
-
+    
     $SV->Spawn ();
-
+    
     sleep $sleeptime;
-
+    
     print STDERR "Starting Client\n";
-
+    
     $sender = $CL->SpawnWaitKill (200);
-
+    
     if ($sender != 0) {
 	print STDERR "ERROR: sender returned $sender\n";
 	$status = 1;
     }
-
+    
     $receiver = $SV->TerminateWaitKill (200);
-
+    
     if ($receiver != 0) {
 	print STDERR "ERROR: receiver returned $receiver\n";
 	$status = 1;
@@ -109,6 +107,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $output, $input;
+unlink $output;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
index c09769d950c..58bbe6da8a7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
@@ -3,14 +3,14 @@
 
 #include "ace/Get_Opt.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Flows_T.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class Server;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 02ee69e90a2..f995c2764d0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 0bed10e783d..07801f4a170 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ping.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 #include "tao/ORB.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
index 88e6fc31b97..0567cc3f821 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
@@ -16,9 +16,9 @@
 #ifndef TAO_PING_H
 #define TAO_PING_H
 
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
 #include "ace/OS_NS_time.h"
 
 class Ping_Recv_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 28ad850add1..6153f46b0e6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "pong.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/ORB.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
index 92d90adaad4..c8527c9f6f1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
@@ -16,9 +16,9 @@
 #ifndef TAO_PONG_H
 #define TAO_PONG_H
 
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
 
 class Pong_Recv_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Makefile.am
index 616d62b1c76..78c1bdc6b4f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Makefile.am
@@ -1,18 +1,23 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Top-level Makefile for TAO's AVStreams Tests
+##
+##---------------------------------------------------------------------------
+
+##
 ##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
 
 SUBDIRS = \
-        Asynch_Three_Stage \
-        Bidirectional_Flows \
-        Component_Switching \
-        Full_Profile \
-        Latency \
-        Modify_QoS \
-        Multicast \
-        Multicast_Full_Profile \
-        Multiple_Flows \
-        Pluggable \
-        Pluggable_Flow_Protocol \
-        Simple_Three_Stage \
-        Simple_Two_Stage \
-        Simple_Two_Stage_With_QoS
+        benchmark \
+        mpeg \
+        server_discovery \
+        sfp
+
+EXTRA_DIST = README
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/input b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/input
new file mode 100644
index 00000000000..3a38e42d893
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/input
@@ -0,0 +1,9047 @@
+Wed Apr 11 20:36:36 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* examples/Synch/proc_sema.cpp (main): Fixd an assigning string
+	  literal to char* warning.
+
+Wed Apr 11 18:04:33 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.bin.GNU: Change the Visual Age C++
+          incremental build command to use vacbld_r, the thread-enabled
+          variant of vacbld.
+
+Wed Apr 11 11:00:50 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ACE-INSTALL.html: Added a section illustrating how to build
+	  ACE+TAO for RTEMS.  Thanks to Joel Sherrill <joel@OARcorp.com>
+ 	  for this build procedure.
+
+Wed Apr 11 11:38:37 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/IOStream.h: Reverted change from
+          Tue Apr 10 18:35:22 2001  Steve Huston  <shuston@riverace.com>
+          and replaced it with a section that sets ACE_LACKS_ACE_IOSTREAM
+          if ACE_HAS_STANDARD_CPP_LIBRARY is set and ACE_USES_OLD_IOSTREAMS
+          is not. This restriction is noted and tracked in Bugzilla # 857.
+
+        * ace/IOStream.cpp:
+        * tests/IOStream_Test.cpp: Reverted change from
+          Tue Apr 10 18:35:22 2001  Steve Huston  <shuston@riverace.com>
+
+Wed Apr 11 09:44:32 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/Misc/test_trace.cpp:
+
+          Fixed a strange compiler error with Tornado II.
+          My_Task::recursive was inline which caused an internal compiler
+          error.
+
+Wed Apr 11 08:04:21 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * include/makeinclude/platform_linux.GNU: By default, we build
+          ACE+TAO with exceptions enabled on Linux.  Thanks to Craig
+          Rodrigues <crodrigu@bbn.com> for motivating this change.
+
+        * ace/SString.i (operator+): Fixed an "inlined before use" warning.
+          Thanks to Bala for reporting this.
+
+Tue Apr 10 16:58:54 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS):
+
+          Changed the default values on UNIX from 0666 and 0777 to 0644
+          and 0755, i.e. removed global write permissions.  This addresses
+          some security issues.  Now, only the owner has write permissions
+          by default.
+
+Tue Apr 10 18:35:22 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU: Added a new
+          build option, stdcpplib, which defaults to 1. If set to 1,
+          Sun Workshop 5 and Forte 6 compilers will use the standard
+          C++ library, including standard iostreams. Set to 0 to
+          use the old, classic iostreams.
+
+        * include/makeinclude/platform_hpux_aCC.GNU: Added support for
+          the stdcpplib build option. It defaults to 1 if using aC++
+          x.27, or 0 if not. Thanks very much to Istvan Buki <ibuki@fedex.com>
+          for these changes.
+
+        * ace/config-aix-4.x.h: For Visual Age C++ 5, turn on
+          ACE_HAS_STANDARD_CPP_LIBRARY and
+          ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB.
+
+        * ace/config-sunos5.5.h: For Sun Workshop 5 and Forte 6 compilers,
+          take the ACE_USES_OLD_IOSTREAMS setting from the platform_macros.GNU
+          file; don't set it here.
+
+        * ace/config-hpux-11.00.h:
+        * ace/config-hpux-10.x-hpc++.h: If the stdcpplib=1 option was used,
+          then turn on ACE_HAS_STANDARD_CPP_LIB and
+          ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. Else turn on
+          ACE_USES_OLD_IOSTREAMS.
+
+        * ace/IOStream.{h cpp}: Only try to build this stuff if
+          ACE_LACKS_ACE_IOSTREAM is not defined and ACE_USES_OLD_IOSTREAMS
+          _is_ defined. The check on ACE_USES_OLD_IOSTREAMS can be removed
+          when ACE_IOStream gets ported to standard iostreams.
+
+        * tests/IOStream_Test.cpp: Only try this if ACE_USES_OLD_IOSTREAMS
+          is defined. Remove this if/when ACE_IOStream is ported to new
+          iostreams.
+
+Tue Apr 10 17:51:25 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+          Added TAO/tests/OctetSeq/run_test1{2}.pl to auto testing.
+
+Tue Apr 10 16:33:42 2001  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * ace/CDR_Stream.i:
+        * ace/CDR_Stream.cpp:
+          Added sanity checks for sizes of strings and arrays.
+
+Tue Apr 10 15:14:52 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_vxworks5.x_g++.GNU:
+
+          Added missing else/endif from previous support addition.
+
+Tue Apr 10 11:48:51 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * include/makeinclude/platform_vxworks5.x_g++.GNU: Added support
+          for the M68k line of CPUs.  Thanks to Albert Pariante
+           <albert@sw.bev.etn.com> for reporting this.
+
+Tue Apr 10 02:14:55 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * bin/PerlACE/Run_Test.pm (check_n_cleanup_files): Added a new
+          PerlACE function that checks for unwanted files and spits out a
+          warning before removing the file.  It makes sure that we not
+          only clean up resource leaks but also notice their existence.
+
+        * tests/run_test.pl (delete_temp_files): Used the new
+          <check_n_cleanup_files> to remove the temp files for
+          MEM_Stream_Test, if there are any.
+
+Tue Apr  10 1:44:02 2001  Yamuna Krishnamurthy  <yamuna@ace.cs.wustl.edu>
+
+        * examples/QOS/Change_Sender_TSpec/receiver.cpp:
+        * examples/QOS/Change_Sender_TSpec/receiver.dsp:
+        * examples/QOS/Change_Sender_TSpec/sender.cpp:
+        * examples/QOS/Change_Sender_TSpec/sender.dsp:
+        * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h:
+        * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp:
+        * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h:
+        * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp:
+        * examples/QOS/Change_Sender_TSpec/QoS_Util.h:
+        * examples/QOS/Change_Sender_TSpec/QoS_Util.cpp:
+        * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h:
+        * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp:
+        * examples/QOS/Change_Sender_TSpec/FlowSpec_Dbase.h:
+        * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h:
+        * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp:
+        * examples/QOS/Change_Sender_TSpec/README:
+        * examples/QOS/Change_Sender_TSpec/Makefile:
+
+          Added a test to dynamically change the Sender flow spec in
+          order to continuously change the PATH messages.
+
+        * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/receiver.dsp:
+        * examples/QOS/Change_Receiver_FlowSpec/sender.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/sender.dsp:
+        * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h:
+        * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h:
+        * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h:
+        * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h:
+        * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/FlowSpec_Dbase.h:
+        * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h:
+        * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp:
+        * examples/QOS/Change_Receiver_FlowSpec/README:
+        * examples/QOS/Change_Receiver_FlowSpec/Makefile:
+
+          Added a test to dynamically change the Receiver flow spec in
+          order to continuously change the RESV messages.
+
+        * examples/QOS/Simple/receiver.cpp:
+        * examples/QOS/Simple/receiver.dsp:
+        * examples/QOS/Simple/sender.cpp:
+        * examples/QOS/Simple/sender.dsp:
+        * examples/QOS/Simple/Sender_QoS_Event_Handler.h:
+        * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp:
+        * examples/QOS/Simple/Receiver_QoS_Event_Handler.h:
+        * examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp:
+        * examples/QOS/Simple/QoS_Util.h:
+        * examples/QOS/Simple/QoS_Util.cpp:
+        * examples/QOS/Simple/QoS_Signal_Handler.h:
+        * examples/QOS/Simple/QoS_Signal_Handler.cpp:
+        * examples/QOS/Simple/FlowSpec_Dbase.h:
+        * examples/QOS/Simple/Fill_ACE_QoS.h:
+        * examples/QOS/Simple/Fill_ACE_QoS.cpp:
+        * examples/QOS/Simple/README:
+        * examples/QOS/Simple/Makefile:
+
+          Moved the original QOS example to Simple.
+
+        * examples/QOS/Makefile:
+        * examples/QOS/QOS.dsw:
+
+          Updated the Makefile to compile the constituent tests.
+
+Mon Apr  9 18:48:02 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * include/makeinclude/Makefile.rtems: Zapped
+
+          export RTEMS_MAKEFILE_PATH=/opt/rtems/sparc-rtems/erc32/
+
+          so that the environment variable is obtained from the users
+          environment.  Thanks to Joel Sherrill <joel@OARcorp.com> for
+          this fix.
+
+        * ace/Log_Msg.h: Only define the ACE_ASSERT macro if it's not
+          already defined.  This make it easy for developers to override
+          this macro in their config.h file.  Thanks to Nathalie D'Amours
+          <nathalie@stentor.com> for motivating this change.
+
+Mon Apr  9 15:36:04 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/High_Res_Timer.cpp:
+          Use the 'cpu MHz' line from /proc/cpuinfo in favor of the
+          'bogomips' line, because the latter gives the wrong number on
+          multi-CPU boxes.
+
+Mon Apr  9 14:37:30 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp:
+
+          Removed extraneous template instantiations.
+
+Mon Apr 09 09:19:37 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/SString.cpp:
+          Fixed Fuzz error
+
+Mon Apr  9 08:28:47 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/SString.{h,i,cpp}: Added improved support for ACE_WString:
+          . The magic number 32 has been changed to ACE_DEFAULT_GROWSIZE.
+          . ACE_WString only allocates memory when it is needed.
+          . The grow strategy can be modified by setting the ACE_GROW_LINEAR define.
+            the string does not double the memory then, but increases the memory by
+            ACE_DEFAULT_GROWSIZE.
+          Thanks to Eric Zuur <Eric.Zuur@meco.nl> for contributing these
+          enhancements.
+
+        * ace/High_Res_Timer.cpp (get_cpuinfo): Added support for the Pentium
+          III and IV.  Thanks to Stephane Pion
+          <PION_Stephane@stna.dgac.fr> for contributing this fix.
+
+Mon Apr  9 07:50:08 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/Makefile:
+          Fixed a typo in the Makefile and added "CPP-inclient.h" include to
+          CPP-memclient.cpp.
+
+Mon Apr  9 07:42:29 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Basic_Types.cpp:
+          Changed format flags from ios::fmtflags to unsigned long.
+          This typedef is not supported by all platforms.  Thanks Carlos
+          <coryan@uci.edu> for suggesting this change.
+
+Mon Apr 09 08:08:11 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * ace/Timer_Queue_T.h
+          Declared private copy constructor and assignment operator
+          for class ACE_Event_Handler_Handle_Timeout_Upcall
+
+Sun Apr 08 18:55:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/DLL_Test.cpp:
+          Use ACE::ldname() instead of keeping a local function to
+          decorate the name.
+          Use the "d" suffix only on MSVC debug builds.
+
+        * tests/Makefile.bor:
+        * tests/DLL_Test.bor:
+          New Borland Makefile for the shared library in DLL_Test.  Thanks
+          to Christopher Kohlhoff  <chris@kohlhoff.com> for providing the
+          patches.
+
+        * tests/run_test.pl:
+          Add ExeSubDir to the path, required in Borland builds to find
+          the shared libraries created locally.
+
+Sun Apr  8 13:12:54 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/SString.cpp: Reordered various constructor initializers so
+          G++ doesn't complain.  Thanks to Bala for reporting this.
+
+        * ace/SString.{h,i,cpp}: Added various optimizations to ACE_WString
+          so it will perform certain operations as efficiently as
+          ACE_CString.  Thanks to Eric Zuur <Eric.Zuur@meco.nl> for
+          contributing these enhancements.
+
+Sun Apr 08 12:10:30 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp:
+        * examples/IPC_SAP/SOCK_SAP/Makefile: Updated obsolete
+          shared-memory transport functions.
+
+Sun Apr  8 09:49:26 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * bin: Added a new shell script called "make-components" that enables
+          each ACE component to be built in a simple manner using the
+          following change from Arturo.
+
+        * ace/Makefile: Generalized the libACE.a and libACE.$(SOEXT) targets
+          to simplify subsettings.  Thanks to Arturo Montes
+          <mitosys@colomsat.net.co> for reporting this.
+
+Sat Apr  7 16:00:48 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * tests: Added a new rtems_init.c file.  Thanks to Joel Sherrill
+          <joel@OARcorp.com> for contributing this port.
+
+        * include/makeinclude: Added the new platform_rtems.x_g++.GNU file.
+        * ace: Added the new config-rtems.h file.
+
+        * ace/OS.cpp: Added support for RTEMS, which is an open-source
+          real-time operating system that can be downloaded from
+          ftp://ftp.oarcorp.com/pub/rtems.  Thanks to Joel Sherrill
+          <joel@OARcorp.com> for contributing this port.
+
+        * ace/OS.cpp: The return type for ACE_OS::readv_emulation()
+          should have been ssize_t, not int, to be consistent with its
+          definition in the header file.  Thanks to Joel Sherrill
+          <joel@OARcorp.com> for reporting this.
+
+Sat Apr  7 21:16:49 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Add the new Crash_On_Write and MT_Timeout tests to the nightly
+          builds.
+
+Fri Apr  6 21:02:05 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/Synch/proc_sema.cpp:
+          Add missing #include for "ace/Log_Msg.h", on platforms that
+          define ACE_TEMPLATES_REQUIRE_SOURCE this include is magically
+          obtained, but this is not the case for SunCC 4.2, and
+          True64/CXX.
+
+Fri Apr 06 16:22:24 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/SString.h (ACE_Tokenizer): Updated documentation and added
+          some examples.  Thanks to Jody Hagins <jody@atdesk.com> for
+          providing the original example.
+
+Fri Apr  6 17:11:34 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst: Added the Single_Read test to the
+          nightly build list.
+
+Fri Apr  6 14:45:52 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Basic_Types.h:
+        * ace/Basic_Types.cpp:
+          Changed the as_string() method to avoid using floor() which
+          required math.h and ACE_CString which caused unnecessary coupling.
+
+Fri Apr  6 08:34:15 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/make_pretty.pl:
+          Do no give out warnings for the 'nocompatwarnings' option in
+          HP-UX.
+
+Fri Apr  6 08:23:02 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Basic_Types.cpp:
+        * ace/Basic_Types.h:
+        * tests/Process_Strategy_Test.cpp:
+        * examples/Connection/misc/Connection_Handler.cpp:
+          Remove build warnings for platforms that don't support unsigned
+          long long types and have unsigned char's.
+
+Fri Apr  6 02:02:01 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/OS.h:
+        * ace/OS.i: The implementation for process semaphore on platforms
+          lacking named POSIX semaphores was broken.  On these platforms,
+          semaphores are allocated in MMAP file so they should never be
+          deleted.  Added a flag <new_sema_> to remember if a semaphore
+          can be deleted (USYNC_THREAD) or not (USYNC_PROCESS).
+
+        * ace/config-sunos5.6.h: According to the man pages, SunOS started
+          supporting POSIX semaphores from 5.6.  Defined ACE_HAS_POSIX_SEM
+          and ACE_LACKS_NAMED_POSIX_SEM.
+
+Thu Apr  5 11:23:05 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * html/index.html:
+          Add link to the new QoS library documentation.
+
+Thu Apr 05 03:26:13 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * examples/Makefile:
+        * examples/Synch/Makefile:
+        * examples/Synch/README:
+        * examples/Synch/Synch.dsw:
+        * examples/Synch/proc_sema.cpp:
+        * examples/Synch/proc_sema.dsp: Added a new example to play with
+          process semaphores.
+
+Thu Apr 05 02:48:51 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_IO.cpp (write): My earlier change was causing the test
+          to crash.
+
+        * ace/MEM_Stream.h:
+        * ace/MEM_Stream.i:
+        * ace/MEM_Stream.cpp: Added a new method to inform the stream to
+          clean up its resources when closing down.
+
+        * tests/MEM_Stream_Test.cpp (handle_close): Handle_close should
+          only inform it's peer to destroy the mmap file instead of
+          removing the file itself.
+
+Wed Apr  4 16:21:13 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added the ImplRepo tests.
+
+Wed Apr  4 12:13:52 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_IO.h: Declared ACE_INLINE_FOR_GNUC for
+          ACE_MT_MEM_IO::Simple_Queue's constructor to eliminate a bogus
+          warning reported by vxworks' gcc compiler.
+
+Wed Apr 04 07:47:48 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * etc/ace_qos.doxygen:
+        * bin/generate_doxygen.pl:
+          Generate doxygen documentation for ACE QoS API
+
+Tue Apr 03 19:55:26 2001  Steve Huston  <shuston@riverace.com>
+
+        * bin/auto_compile: Added a -make_type option - the argument to
+          the option is the suffix of Makefile to use. Example:
+          -make_type vac  would use Makefile.vac instead of Makefile
+          when building.
+
+        * bin/make_pretty.pl: Corrected tests for AIX errors/warnings.
+
+        * ace/ace.icp: (new) Visual Age C++ 5 project file for libACE.
+
+        * ace/ace.icc: (new) Visual Age C++ 5 configuration file for
+          libACE. Replaces ace-dll.icc. It will eventually have the
+          stuff added to make debug/optimize as well as subsets.
+
+        * ace/ace_vacpp_options.icc: Visual Age C++ file for setting ACE
+          build options.
+
+        * ace/Makefile.vac: Makefile to build libACE using the Visual
+          Age C++ 5 incremental compiler. It only has "all" and "realclean"
+          targets, and uses vacbld_r to do the build.
+
+        * tests/tests.icp: Visual Age C++ 5 Project file for making all the
+          tests.
+
+        * tests/Makefile.vac: Makefile to drive vacbld_r for Visual Age C++.
+
+        * tests/Config_Test.icc:
+        * tests/Dirent_Test.icc:
+        * tests/Logging_Strategy_Test.icc:
+        * tests/MEM_Stream_Test.icc:
+        * tests/Message_Queue_Test_Ex.icc:
+        * tests/OS_Test.icc:
+             New files for building tests with Visual Age C++.
+
+        * tests/libDLL_Test.icc: Changed to use up-to-date source file.
+
+Tue Apr 03 13:45:02 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_IO.cpp: Fixed mismatched ACE_TRACE messages.  Thanks to
+          the all mighty fuzzmasterd for reporting this.
+
+Tue Apr  3 11:40:42 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * examples/IPC_SAP/SSL_SAP/dummy.pem:
+        * examples/IPC_SAP/SSL_SAP/key.pem:
+          The previous certificates expired. So, generated them
+          again.
+
+Tue Apr 03 09:30:10 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_IO.cpp (write): Fixed a compilation error for Borland
+          compiler.  Thanks to Johnny Willensen for reporting this.
+
+Mon Apr 02 23:41:34 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_SAP.cpp:
+        * ace/MEM_SAP.h:
+        * ace/MEM_SAP.i:
+          Generalized the ACE_MEM_SAP class to allocate memory in the new
+          memory wrapper class ACE_MEM_SAP_Node.
+
+        * ace/MEM_IO.cpp:
+        * ace/MEM_IO.h:
+        * ace/MEM_IO.i:
+          Separated the different signaling mechanisms into a different
+          class in ACE_MEM_IO so it can determine the "right" signaling
+          strategy allowed.  Currently, we implement the Reactive strategy
+          (ACE_Reactive_MEM_IO) which uses sockets for signaling and
+          multithreaded strategy (ACE_MT_MEM_IO) which uses semaphores for
+          signaling.
+
+        * ace/MEM_Stream.cpp:
+          Sending an empty buffer over to wake up the "other" end when we
+          are closing down.
+
+        * ace/MEM_Acceptor.cpp:
+        * ace/MEM_Acceptor.h:
+        * ace/MEM_Acceptor.i:
+        * ace/MEM_Connector.cpp:
+        * ace/MEM_Connector.h:
+        * ace/MEM_Connector.i: Added facility to specify the "preferred"
+          signaling strategy so the acceptor and connector can negociate
+          and agree on the best signaling mechanism to use.
+
+        * ace/MEM_Stream_Test.h:
+        * ace/MEM_Stream_Test.cpp:
+          Added the test for the new MT signaling MEM_Stream transfer.
+          This part of the test seems to be failing on system that depends
+          on SysV semaphores (because we need more semaphore than the
+          system can provide.)
+
+Mon Apr  2 15:17:13 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/config-chorus.h:
+
+          Chorus 4.x supports unsigned long long's.
+
+Mon Apr  2 14:23:31 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * ace/Makefile:
+            only build QoS directory under UNIX if rapi is installed
+        * ace/QoS/README:
+            add installation instructions and GQOS/RAPI information
+
+Mon Apr  2 09:57:31 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/PerlACE/MSProject.pm:
+
+          Made a change to the tao_idl depencency checking.
+          It was only checking for tao_idl and $(InputName) where
+          some places we use $(InputPath) instead.
+
+        * ace/config-win32-msvc-5.h:
+        * ace/config-win32-msvc-6.h:
+
+          Disabled the Inheritance by Dominance informational
+          warning that MSVC gives.  We have cases of this all over
+          the place, and normally we just disable the warning on
+          a file by file basis, but now we just do a blanket disable.
+
+Mon Apr  2 08:45:24 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+          Renamed the Debian_Full_WU build, its most important feature is
+          not that it is at WashU nor that it enables most components.  It
+          is the fact that interceptors are disabled on its configuration.
+
+Sun Apr  1 17:20:22 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/INET_Addr.h:
+
+          Added /**/ around for the inclusion of inetLib.h, since some
+          MS compilers pick this up in dependency generation.
+
+        * bin/PerlACE/MSProject.pm:
+
+          Used \Q\E around the library names when matching, otherwise
+          the backslashes were interpreted as escaping, and weird
+          unicode errors popped up.
+
+        * bin/pippen.pl:
+
+          Pippen was being case sensitive, so tao.lib was different
+          than TAO.lib.  Changes to store only lowercase.
+
+Sat Mar 31 10:16:01 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ACE-INSTALL.html:
+          Removed broken link, the web page does not exist anymore. Thanks
+          to John R. Ashmun <john.ashmun@esca.com> for pointing this out.
+          This fixes [BUGID:833]
+
+Fri Mar 30 14:08:18 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * performance-tests/TTCP/C/new-ttcp.cpp:
+        * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp:
+          Zapped the gettimeofday() method since it didn't seem to be
+          used.  Also, #include "ace/Log_Msg.h".  Thanks to Thomas Groth
+          <groth.th@nord-com.net> for reporting this.
+
+        * ace/OS.h: Changed all the ACE_DEFAULT_* default ports of the
+          various services to start with 200xx rather than 100xx to avoid
+          conflicts on AIX, which apparently hijacks port 10002 for
+          various things.  Thanks to David Sperry
+          <sperryd@res.raytheon.com> for reporting this.
+
+Sat Mar 31 02:06:09 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * ace/config-win32-borland.h:
+        * include/makeinclude/ace_flags.bor:
+          Fixed up use of inline functions in DEBUG build.
+
+        * include/makeinclude/ace_flags.bor:
+          Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory
+          libraries.
+
+Fri Mar 30 11:17:39 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/fuzz.pl:
+          Add a couple of TODO entries
+
+        * html/index.html:
+          Add the Audio/Video Streaming service to the index file.
+
+Fri Mar 30 11:12:53 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/*/Makefile:
+        * apps/*/Makefile:
+        * docs/*/Makefile:
+        * examples/*/Makefile:
+        * netsvcs/*/Makefile:
+        * performance-tests/*/Makefile:
+        * tests/*/Makefile:
+        * websvcs/*/Makefile:
+        * ASNMP/*/Makefile:
+          Regenerate dependencies.
+
+Fri Mar 30 08:15:26 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/QoS/QoS_Session.h:
+          Add #include for ACE_QoS_Export
+
+Fri Mar 30 07:31:54 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/QoS/QoS_Session.h:
+          Fixed export macro
+
+Thu Mar 29 20:14:00 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * ace/SOCK.h:
+           Remove include of QoS_Session.h, since it is not used here.
+
+Thu Mar 29 19:48:00 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * ace/QoS_Session.h:
+        * ace/QoS/QoS_Manager.h:
+        * ace/QoS/QoS_Session_Impl.h:
+        * ace/QoS/QoS_Session_Factory.h:
+        * examples/QOS/QoS_Signal_Handler.h:
+        * examples/QOS/Receiver_QoS_Event_Handler.h:
+        * examples/QOS/client.cpp:
+        * examples/QOS/QoS_Util.h:
+        * examples/QOS/Sender_QoS_Event_Handler.h:
+        * examples/QOS/server.cpp:
+        * examples/QOS/Makefile:
+
+        Move QoS_Session.h to the ace/QoS directory.
+
+Thu Mar 29 19:12:38 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.lib.GNU: AIX-specific changes to
+          build shared libraries by making a shared shr.o file and putting
+          that into an archive. Seems weird, but that's the way AIX does
+          things. This makes ACE consistent with other AIX software.
+
+        * include/makeinclude/platform_aix4_cset++.GNU: Made some changes
+          to attempt to work with the new scheme for shared lib creation on
+          AIX. Did not test it, and don't plan to. The CSet++ compiler is not
+          supported by IBM any longer, and Riverace is not supporting ACE
+          with it. If someone out there sends patches for this, I'll put
+          them in, but this file is going away after ACE 5.2 is released.
+          All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++
+          in batch mode) should be with the platform_aix_ibm.GNU file.
+
+Thu Mar 29 16:16:07 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/Token.cpp (renew): A conditional expression used an && rather
+          and ||, which was causing problems with ACE_Token.  Thanks to
+          Carsten Madsen <com@navicon.dk> for reporting this.
+
+        * ace/Message_Queue_T.cpp: If any of the various ACE_Message_Queue_Ex
+          enqueue*() methods fail then make sure to release the message
+          blocks!  Thanks to Boris Kolpackov <bosk@ipmce.ru> for reporting
+          this.
+
+Wed Mar 28 21:39:26 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/NT_Service.h:
+
+          Changed the ACE_NT_SERVICE macros to use ACE_TEXT_* API
+          calls for those that can take in unicode strings.
+
+        * examples/NT_Service/main.cpp:
+
+          Fixed use of ACE_NT_SERVICE to work with ACE_USES_WCHAR.
+
+        * examples/OS/Process/process.cpp:
+        * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp:
+
+          Changed some Win32 API calls to use ACE_TEXT_* equivalents.
+
+        * ace/ace_wchar.h:
+
+          Added all the ACE_TEXT_* API macros needed above.
+
+          Thanks to Nick Pratt <npratt@microstrategy.com> for
+          reporting the first of these errors.
+
+Wed Mar 28 22:07:03 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * tests/tests.dsw: Fixed project dependencies between DLL_Test and
+          DLL_Test_Impl.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be>
+          for reporting this.
+
+Wed Mar 28 20:33:28 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/ACE.cpp: Further improved the implementation of
+          handle_ready() by simply calling poll() with the timeout
+          pointer.  Thanks to Przemyslaw Marciniak <pmarciniak@lucent.com>
+          for reporting this.
+
+Wed Mar 28 17:45:22 2001  Steve Huston  <shuston@riverace.com>
+
+        * bin/make_pretty.pl: Adjust the error detector for IBM C/C++ 3.6.6.
+
+        * ace/Containers_T.cpp: Add #include "ace/Log_Msg.h" so IBM C/C++
+          can see ACE_DEBUG when compiling template instantiations.
+
+Wed Mar 28 16:40:24 2001  Luther Baker  <luther@cs.wustl.edu>
+
+        * ace/config-all.h
+
+          Removed ACE_WIN32 support for ACE_HAS_POSIX_SEM just because
+          ACE_HAS_PACE. This can be defined for ACE_WIN32 after we
+          write more WIN32 emulation.
+
+        * ace/OS.h
+        * ace/OS.i
+        * ace/OS.cpp
+
+          PACE updates.
+
+Wed Mar 28 11:37:09 2001  Fuzz Master D <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          There are several instances where fuzz gives false
+          positives, and the code is impossible to fix without
+          creating compiler warnings.  Example:
+
+          void function (CORBA::Environment &ACE_TRY_ENV)
+          {
+          #if FOO
+              some_other_function (ACE_TRY_ENV);
+              ACE_CHECK;
+          #else
+              ACE_UNUSED_ARG (ACE_TRY_ENV);
+          #endif
+          }
+
+          So normally ACE_UNUSED_ARG errors can be fixed by keeping
+          the CORBA::ENvironment unnamed and removing the ACE_UNUSED_ARG,
+          but in this case it isn't possible.  So fuzz now accepts
+          an ignore command for single line use.  The above can be fixed
+          by changing to:
+
+          void function (CORBA::Environment &ACE_TRY_ENV)
+          {
+          #if FOO
+              some_other_function (ACE_TRY_ENV);
+              ACE_CHECK;
+          #else
+              ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+          #endif
+          }
+
+Tue Mar 28 13:03:07 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/make_pretty.pl:
+          Modification to recognize HP's future errors as warnings.
+
+Wed Mar 28 11:34:54 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
+
+        * ace/CDR_Base.inl:
+          Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY ==
+          1, since it was causing some TAO unit tests to break (in
+          particular, the Portable_Interceptors/Service_Context_Manipulation
+          test).  After running Cubit and a few other tests, Purify didn't
+          notice any more uninitialized memory accesses.  Fixes bug #828.
+
+Wed Mar 28 11:55:39 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_aix_ibm.GNU: New file, replaces
+          platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces
+          use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6.
+          So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6
+          and Visual Age C++ 5) use this file. If you want to try to keep
+          using CSet++ 3.4 or earlier, you can keep using
+          platform_aix4_cset++.GNU, but it's not tested any longer and
+          will disappear at the next ACE version. If you want to use
+          Visual Age C++ 4, you should reconsider, and upgrade to version 5.
+
+        * include/makeinclude/platform_aix_vacpp.GNU: Deleted.
+
+        * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h"
+          to be after #include "ace/SOCK_Connector.h" to fix compile error
+          on AIX, Visual Age C++ 5.
+
+        * ace/config-aix-4.x.h: Clarified comments that this file is for
+          Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what
+          is now generated from platform_aix_ibm.GNU.
+
+        * bin/auto_compile:
+        * bin/make_pretty.pl: Add detection of compile/link warnings and
+          errors for AIX using the IBM compilers' code. Ignores the multiply
+          defined symbol warnings from ld if it's an ACE symbol.
+
+        * docs/ACE-development-process.html: Changed to link to Bugzilla so
+          it works from anywhere.
+
+Wed Mar 28 10:13:16 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Makefile.bor: Don't try to build the SSL directory if
+          SSL_ROOT is not set.
+
+Wed Mar 28 08:39:26 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * etc/tao_av.doxygen:
+          New configuration file for the AV streaming service.  Many
+          thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that
+          directory.
+
+        * bin/generate_doxygen.pl:
+          Add the new configuration file.
+
+Tue Mar 27 19:54:11 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Disable POA/On_Demand_Loading and POA/Loader for Linux/KCC
+          builds, because that compiler has problems with destructors
+          after dynamic loading.
+          Also add the new Hello test to the nightly regression tests.
+
+Tue Mar 27 19:43:39 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_linux.GNU:
+          Add support for Insure++
+
+        * include/makeinclude/rules.local.GNU:
+          Add new macro to let developers change the default destination
+          for the dependencies.
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Let the user override the default VDIR directory, and define the
+          default values for the IDL generated code extensions.
+
+          Thanks to Jody Hagins <jody@atdesk.com> for all these
+          improvements.
+
+Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Unbounded_Queue.h:
+          Add required #include for Chorus builds.
+
+Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/ACE.cpp (handle_ready): Don't try to dereference through
+          a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+          <pmarciniak@lucent.com> for reporting this.
+
+Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Select_Reactor_Base.h:
+          Add missing #include for builds that define
+          ACE_HAS_REACTOR_NOTIFICATION_QUEUE.
+
+Tue Mar 27 05:35:38 2001  Christopher Kohlhoff <chris@kohlhoff.com>
+
+        * include/makeinclude/make_flags.bor:
+        Prevent PASCAL build by default with BCB5 since it is not required.
+        Since both VCL and non-VCL applications share a common run-time
+        library you can simply link your VCL code with a non-PASCAL build
+        of the ACE+TAO libraries. This behaviour can be overridden by
+        defining the FORCE_PASCAL flag.
+
+        * include/makeinclude/build_core_exe.bor:
+        * include/makeinclude/build_core_library.bor:
+        * include/makeinclude/build_dll.bor:
+        * include/makeinclude/build_exe.bor:
+        * include/makeinclude/build_lib.bor:
+        * include/makeinclude/clean.bor:
+        Build all executables into a directory below the source directory.
+        Core executables are then copied to the common bin directory. This
+        is to allow the test scripts to assume all executables can be
+        found relative to the source directory.
+
+        * include/makeinclude/recurse.bor:
+        Removed definition of OBJFILES since Borland make doesn't seem to
+        support recursive macro expansion.
+
+        * ace/config-win32-borland.h:
+        * include/makeinclude/ace_flags.bor:
+        Always explicitly define __ACE_INLINE__, with it defaulting to 1.
+        This change will allow the same compiler flags to be used in user
+        applications regardless of whether a debug or non-debug build of
+        ACE is being used.
+
+Tue Mar 27 09:48:33 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * include/makeinclude/ace_flags.bor
+        Corrected the smartproxies_cflags
+
+        * examples/IPC_SAP
+        Added new BCB makefiles for these examples
+
+        * ace/Timer_Hash_T.cpp
+        * ace/Timer_Hash_T.h
+        * ace/Timer_Heap_T.cpp
+        * ace/Timer_Heap_T.h
+        * ace/Timer_List_T.cpp
+        * ace/Timer_List_T.h
+        * ace/Timer_Wheel_T.cpp
+        * ace/Timer_Wheel_T.h
+        Made the isdone method on the iterator classes constant
+
+        * ace/Timer_Queue_T.h
+        * ace/Timer_Queue_T.i
+        Several get methods are now const
+        Argument of set_timer_value and set_interval is now passed by const reference
+
+        * ace/Unbounded_Set.h
+        * ace/Unbounded_Set.cpp
+        * tests/Collection_Test.cpp
+        Added the ACE_Unbounded_Set_Const_Iterator which can be used
+        to iterate over an const set
+
+Mon Mar 26 21:02:24 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Log_Msg_NT_Event_Log.cpp:
+
+          Fixed a compilation problem with RegSetValueEx when
+          ACE_USES_WCHAR and UNICODE were defined.  Thanks to Nick
+          Pratt <npratt@microstrategy.com> for reporting this.
+
+        * ace/ace_dll.dsp:
+
+          Unchecked the "separate types" option for debug linking.
+          Thanks to Nick Pratt for this suggestion also.
+
+Mon Mar 26 13:00:37 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Node.h:
+        * ace/Node.cpp:
+        * ace/Array_Base.h:
+        * ace/Array_Base.inl:
+        * ace/Array_Base.cpp:
+        * ace/Unbounded_Queue.h:
+        * ace/Unbounded_Queue.inl:
+        * ace/Unbounded_Queue.cpp:
+        * ace/Unbounded_Set.h:
+        * ace/Unbounded_Set.inl:
+        * ace/Unbounded_Set.cpp:
+        * ace/Containers_T.h:
+        * ace/Containers_T.i:
+        * ace/Containers_T.cpp:
+          Move several containers to their own file.  This reduces the
+          amount of code that needs to be parsed, improving compilation
+          time (not to mention the fact that the code becomes more
+          readable.)
+          For backwards compatibility the Containers file still includes
+          the new smaller files.
+
+        * ace/Makefile:
+        * ace/Makefile.am:
+        * ace/Makefile.bor:
+          Add new files to the install rules.
+          Since they are templates they do not need to be compiled on MSVC
+          so no changes to the project files are required.
+
+        * ace/ARGV.h:
+        * ace/ARGV.cpp:
+        * ace/Future.h:
+        * ace/Handle_Gobbler.h:
+        * ace/Local_Name_Space.h:
+        * ace/Malloc_Base.h:
+        * ace/Memory_Pool.h:
+        * ace/Name_Space.h:
+        * ace/Priority_Reactor.h:
+        * ace/Remote_Name_Space.h:
+        * ace/Service_Config.h:
+        * ace/Signal.cpp:
+        * ace/Signal.h:
+        * ace/Stats.h:
+        * ace/Thread_Manager.h:
+        * ace/Timeprobe_T.h:
+        * ace/Timer_Heap_T.h:
+        * ace/Timer_Queue_Adapters.h:
+        * ace/TkReactor.cpp:
+          To reduce compilation and recompilation times we only include
+          the header file that includes the container used in each case,
+          instead of the full containers class.
+
+Fri Mar 23 12:40:34 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp: Make sure
+          to delete the Consumer_Dispatch_Set * that we get back from
+          unbind().  Thanks to the ever vigilant Mike Winter
+          <mwinter@sonic.net> for reporting this.
+
+Thu Mar 22 10:18:24 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/SString.h: Make the various data members protected
+          rather than private so subclasses can access them.  Thanks to
+          Martin Krumpolec <krumpo@pobox.sk> for this suggestion.
+
+        * tests/README: Clarified some things about the tests.
+          Thanks to Eric Desamore <Eric.Desamore@idtv.bull.net> for
+          motivating this.
+
+Mon Mar 26 11:03:22 2001  Balachandran  <bala@cs.wustl.edu>
+
+        * ACE version 5.1.14 released.
+
+Sat Mar 24 07:02:35 2001  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * ace/INET_Addr.i (get_host_addr): Added a const_cast to the
+        VxWorks-only arm that casts away const on the this ptr so that
+        inet_ntoa_b can access and fill in the buffer data member that's
+        used to hold the result from inet_ntoa_b.  Thanks to Erik Johannes
+        <ejohannes@oresis.com> for point this out.
+
+Fri Mar 23 18:01:05 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst: Some of the tests cannot be run in
+          Single threaded configurations. Prevented such tests from
+          running in the nightly builds.
+
+Fri Mar 23 16:25:18 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/New_Fail_Test.cpp: Reverted the change from "Fri Mar 23
+          06:34:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>". The
+          change fails to comipile when exceptions are on.
+
+Fri Mar 23 08:47:29 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * apps/Gateway/Gateway/Options.cpp:
+          Explicitly #include Log_Msg.h, on platforms that do not define
+          ACE_TEMPLATES_REQUIRE_SOURCE the header file is not implicitly
+          included.  This should fix compilation problems on Tru64/CXX and
+          SunCC/4.2
+
+Fri Mar 23 06:34:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++,
+          No_AMI_Messaging  builds. Surprising that it showed up only in
+          this build.
+
+Thu Mar 22 21:33:37 2001  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most
+        others, and our use was causing memory leaks.  VxWorks prefers
+        that you use its own inet_ntoa_b, which takes the buffer to fill
+        as an argument.  Thus, for VxWorks, added a data member char buf
+        of the appropriate length so that get_host_addr can use
+        inet_ntoa_b to fill that in.
+
+        * ace/INET_Addr.i (get_host_addr): For VxWorks only, changed this
+        to use the preferred inet_ntoa_b.  This eliminate memory leaks
+        under VxWorks.  Thanks to Erik Johannes <ejohannes@oresis.com> for
+        the suggested fix.
+
+Wed Mar 21 19:20:02 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error
+          in g++.
+
+Wed Mar 21 17:28:26 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue.h:
+        * ace/Message_Queue_T.h: Moved definition of typedef for
+          ACE_DEFAULT_MESSAGE_QUEUE_TYPE from Message_Queue.h to
+          Message_Queue_T.h, just after defining ACE_Message_Queue<>.
+          Fixes the case where Message_Queue_T.h is included first,
+          it includes Message_Queue.h before ACE_Message_Queue<> is
+          defined, and that breaks the compile. IBM C/C++ hit this.
+
+Wed Mar 21 16:42:19 2001  Steve Huston  <shuston@riverace.com>
+
+        * bin/auto_compile: Added an option: -notao to ignore the TAO aspects
+          of the non-configurable things, like looking at the TAO/ChangeLog.
+          Also, now looks for auto_run_tests.lst in the $BUILD/bin directory,
+          not the $MODULE/bin directory - this allows some builds to specify
+          their own lists.
+
+Wed Mar 21 16:00:56 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+          The followings are contributions from Scott Snyder
+          <snyder@fnal.gov> to make ACE happy on Digital UNIX with KCC
+          3.4d.
+
+        * include/makeinclude/platform_tru64_kcc.GNU:
+        * include/makeinclude/platform_osf1_4.0_kcc.GNU: Added KCCOPTS and
+          support for tru64 unix.
+
+        * ace/OS.h: On this platform, we ran into problems with sigwait
+          being a macro.  The fix that had been added for this was keyed
+          on __DECCXX_VER, so it isn't picked up on this platform.
+
+        * ace/Sock_Connect.cpp: Enum_Interface_Test failed on this
+          platform.  The code in Socket_Connect.cpp that implements this
+          is conditional on `__unix' being defined.  However, with this
+          compiler, we get `unix' and `__unix__' defined, but not
+          `__unix'.  Fixed by testing for `__unix__' too.
+
+        * ace/ACE.cpp:  Cache_Conn_Test was failing.  It looks like the
+          code in ACE::out_of_handles doesn't have a case to handle osf1.
+
+Wed Mar 21 12:08:35 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+          The followings are contributions from Scott Snyder
+          <snyder@fnal.gov> to make ACE happy on IRIX 6.x with KCC 3.4d.
+
+        * include/makeinclude/platform_irix6.x_kcc.GNU:
+          Disable the following warings and separate common options into
+          $(KCCOPTS).
+
+          280: declaration of a member with the same name as its class Get
+          this from <netinet/in.h>.
+
+          608: this pragma must immediately precede a declaration or
+          statement Get this from <ucontext.h>.
+
+        * ace/OS.h: Changed to only request RTLD_GROUP and RTLD_NODELETE
+          if they are actually available.
+
+        * ace/config-irix6.x-kcc.h: Undefined
+          ACE_LACKS_PLACEMENT_OPERATOR_DELETE since KCC actually supports it.
+
+          Config_Test was failing because with the default setup, ace
+          tries to locate the shared memory pool at 0x04000000.  But it
+          turns out that this is the same address at which irix likes to
+          load the KCC shared library, libKCC.so.  So the memory pool ends
+          up blowing away all the library code.  Fixed by shifting the
+          default base address to 0x05000000 for this configuration.
+
+          OS_Test was failing because on irix, kcc 4.0d miscompiles
+          memchr_emulation if +K3 optimization is used.  I worked around
+          this by just using the library version of memchr instead:
+
+        * ace/ACE.cpp:  Cached_Conn_Test was failing because the code in
+          ACE::out_of_handles doesn't have a case to handle irix.
+
+        * tests/DLL_Test.cpp: It died trying to run object dtors. Fixed by
+          turning off the close-on-destruction flag for this test.
+
+Wed Mar 21 13:33:58 2001  Ossama Othman  <ossama@uci.edu>
+
+        * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp:
+
+          Patched this file so that the example actually works.  It now
+          correctly interacts with the SSL client in this example.  Thanks
+          to Defang Zhou <dzhou@inktomi.com> for contributing the
+          patch/changes necessary to make it work.
+
+Wed Mar 21 07:23:15 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/SOCK_Connector_Test.cpp (find_another_host): Make the
+          test a bit more resilent against errors with gethostbyname().
+          Thanks to Lu Yunhai <luyunhai@huawei.com> for this fix.
+
+Tue Mar 20 17:31:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/run_test.lst:
+          The Logging_Strategy_Test dynamically loads the Logger service
+          (from netsvcs), therefore it does not work on static builds.
+
+Tue Mar 20 18:17:24 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/OS.i: Fixed the USYNC_PROCESS arm of CreateMutex() in
+          ACE_OS::mutex_init() so that it calls
+          ACE_OS::set_errno_to_last_error().  Thanks to Ram Ben-Yakir
+          <Ram@bandwiz.com> for reporting this.
+
+Tue Mar 20 01:33:24 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+        * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect):
+        * ace/SSL/SSL_SOCK_Stream.i (send, close):
+
+          Wrap the underlying OpenSSL calls in a do-while(SSL_pending())
+          loop.  I decided to wrap the SSL_write() calls just in case.
+          This should fix the last of the non-blocking IO issues in ACE's
+          SSL wrappers.  [Bug 393]
+
+Tue Mar 20 00:40:43 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Stream.i (recv):
+
+          Fixed non-blocking IO support for this method.  It was necessary
+          to ensure that a full SSL record was read before returning
+          control to the caller.  Note that the send() method doesn't need
+          modification since OpenSSL always writes a full record before
+          returning.  [Bug 393]
+
+Mon Mar 19 19:53:34 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/ace_flags.bor:
+          Define macros for the RT Event Service test library
+
+Mon Mar 19 16:57:43 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/TP_Reactor.cpp (handle_events): Return value from
+          handle_events() after the Reactor has been deactivated should be
+          -1.  We just need to remember that as illustrated in
+          ACE_Reactor::run_reactor_event_loop(), this is not an error:
+
+          if (result == -1 && this->implementation_->deactivated ())
+            return 0;
+
+        * tests/Thread_Pool_Reactor_Test.cpp (svr_worker): Changed this
+          function to call ACE_Reactor::run_reactor_event_loop() instead
+          of ACE_Reactor::handle_events().  In the previous revision, we
+          were not handling return values from
+          ACE_Reactor::handle_events() correctly when
+          ACE_Reactor::deactivated() had been called.
+
+Mon Mar 19 09:14:12 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+          Added an output option to the link command.  Linking would fail
+          in cases where the output was specified in another directory.
+
+Sun Mar 18 22:12:16 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Stream.i (close):
+
+          Commented out debugging output that was inadvertently committed
+          to the repository.
+
+          Don't bother invalidating the handle.  Doing so can potentially
+          cause some side-effects in the underlying OpenSSL
+          implementation since setting the handle in the SSL_SOCK_Stream
+          also causes the OpenSSL SSL_set_fd() function to be called.
+
+          Fixed a socket leak caused by the fact that the handle was
+          invalidated before the underlying ACE_SOCK_Stream was closed.
+
+Sun Mar 18 09:46:47 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/New_Fail_Test.cpp: Fixed warnings in g++.
+
+Sun Mar 18 08:31:34 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * apps/Gateway/Gateway,
+        * apps/Gateway/Peer: Added a number of fixes to the Gateway and Peer
+          applications.  Thanks to Lu Yunhai <luyunhai@huawei.com> for
+          contributing these.
+
+Sun Mar 18 08:31:34 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of
+          casts so that the arguments passed to printf() will match the
+          format specifier types.
+
+Sat Mar 17 18:02:28 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-aix-4.x.h: Fixed settings for exceptions and
+          placement delete to be ok for Visual Age C++ 5.
+
+        * include/makeinclude/platform_aix_vacpp.GNU: Basically new,
+          works with the Visual Age C++ 5 batch mode build on AIX.
+
+        * include/makeinclude/rules.lib.GNU: Added aix_build piece to
+          the section for linking a shared library. It uses the linker
+          to generate a shr.o (shared) file, then inserts that into
+          the library that's being built. This new section is only
+          used with platform_aix_vacpp.GNU at this point.
+
+Fri Mar 16 15:07:23 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_Context.h (set_mode):
+
+          Changed the default mode from SSLv3 to SSLv23, i.e. support
+          SSLv2 and SSLv3 by default.  This fixes interoperability
+          with applications that use Sun's JSSE, which only supports
+          SSLv2.  Thanks to Max Khon <fjoe@newst.net> for providing the
+          patch.
+
+Thu Mar 15 17:47:28 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Log_Msg_Test.cpp: Changed a ERROR message as a DEBUG
+          message. If it is an error message the scripts that run the
+          build gets confused.
+
+Thu Mar 15 17:42:54 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp: Changed the "-s" option in the
+          test to write the output in to the output generated in the "log"
+          directory. This is just a hack to make the scoreboard clean.
+
+Thu Mar 15 15:55:37 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue_T.h: Add #include "ace/Message_Queue.h" so
+          IBM Visual Age C++ sees ACE_Message_Queue_Base when instantiating
+          templates.
+
+        * ace/ace-dll.icc: Fixed after being munged in a previous commit.
+          Also, corrected libACE.a generation and cleanup, and incorporated
+          fixes from Steve Ige <steve.ige@reuters.com> and Jerry
+          Odenwelder <jerryo@atl.fundtech.com>.
+
+        * THANKS: Added Steve Ige to the Hall of Fame.
+
+Thu Mar 15 11:26:35 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Acceptor.i (ACE_SSL_SOCK_Acceptor):
+
+          Make sure the handle is set for the ACE_SSL_SOCK_Acceptor, after
+          initializing the underlying ACE_SOCK_Acceptor.  This ensures
+          that OpenSSL has the proper handle.  Thanks to Greg McCain
+          <greg.mccain@veritas.com> for suggesting this fix.
+
+        * THANKS:
+          Added Greg to the hall of the fame.
+
+Thu Mar 15 05:46:59 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/FILE_Addr.cpp (ACE_FILE_Addr): Make sure to divide the size of
+          the filename_ by the sizeof (ACE_TCHAR) to handle unicode
+          correctly.  Thanks to the ever vigilant Ivan Murphy for catching
+          this!
+
+Wed Mar 14 01:47:10 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * apps/Gateway/Gateway/Makefile:
+        * apps/Gateway/Peer/Makefile:
+        * apps/JAWS/server/Makefile:
+        * apps/gperf/tests/Makefile:
+        * examples/ASX/CCM_App/Makefile:
+        * examples/Service_Configurator/IPC-tests/server/Makefile:
+        * examples/Service_Configurator/Misc/Makefile:
+        * examples/Timer_Queue/Makefile:
+        * netsvcs/clients/Naming/Client/Makefile:
+        * netsvcs/clients/Naming/Dump_Restore/Makefile:  Removed
+          unnecessary 'LIBS += $(ACELIB)'.  They were causing link problem
+          for the latest KCC. compiner.
+
+Tue Mar 13 20:56:10 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/WFMO_Reactor.cpp (remove_to_be_added_handler_i):
+        * ace/WFMO_Reactor.cpp (remove_suspended_handler_i):
+        * ace/WFMO_Reactor.cpp (remove_handler_i):
+
+          If a user tried to (a) remove a "to be suspended handle" from
+          either the current info set or the to be added set, the handle
+          was correctly removed but the "to be suspended handle" count was
+          not reduced; (b) remove a "to be resumed handle" from the
+          suspended set, the handle was correctly removed but the "to be
+          resumed handle" count was not reduced.  Since the "to be resumed
+          handle" and the "to be suspended handle" were not adjusted
+          properly, the reactor kept waking up thinking that changes were
+          required. Thanks to Lu Yunhai <luyunhai@huawei.com> for
+          reporting this problem.
+
+        * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp: Added
+          an extensive example for regression testing the above use cases.
+
+Tue Mar 13 15:23:04 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/Service_Manager.cpp (list_services): Fixed Unicode bugs.
+
+Tue Mar 13 15:13:48 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp: Fixed Unicode related bugs.
+
+Tue Mar 13 10:04:06 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * performance-tests/TCP/run_test.pl:
+          Fixed the path to the $ACE_ROOT/bin directory, now the script
+          runs again.
+
+Tue Mar 13 06:04:03 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Service_Manager.cpp (list_services): Add an indication of whether
+          a service is active or paused.  Thanks to Mike Curtis for this
+          improvement.
+
+        * ace/Reactor.h: Clarified that the remove_handler (handle, mask)
+          method also removes the event handle.  Thanks to Pierre Fayolle
+          <fayolle@enseirb.fr> for reporting this.
+
+        * tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat
+          with ACE_stat.  Thanks to Johnny Willemsen for reporting this.
+
+Tue Mar 13 00:35:35 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/Select_Reactor_T.i (deactivated): Reverted this change
+          regarding Select_Reactor_T::deactivated():
+
+          Thu Feb 22 12:28:15 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+          Though my change improved correctness of access and change to
+          the <deactivated_> variable, it had a negative consequence: the
+          event loop calls Select_Reactor_T::deactivated() before calling
+          Select_Reactor_T::handle_events() to make sure that the reactor
+          is not closed yet.  Unfortunately, if
+          Select_Reactor_T::deactivated() has a guard, it will send a null
+          event waking up the current leader and thus lead to unnecessary
+          thrashing.  For now, I have removed the guard from the
+          Select_Reactor_T::deactivated() methods.  We should revisit this
+          issue some time again.  This fixes bug 816.
+
+Mon Mar 12 16:30:32 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp (main): Fixed the rest of the
+          warnings in VxWorks builds.
+
+Mon Mar 12 16:21:42 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp (main): Fixed a couple of
+          warnings in VxWorks build. Couple of more warnings are left.
+
+Mon Mar 12 14:16:03 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed a compile
+          error on Win32 Unicode platforms.
+
+Mon Mar 12 12:12:36 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ACE-INSTALL.html: Also mentioned Windows 2000 explicitly in the
+          document.  Thanks to Rahul Shukla <rshukla@ggn.aithent.com> for
+          raising the question.
+
+Mon Mar 12 00:49:24 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * tests/tests.dsw:
+        * tests/Logging_Strategy_Test.dsp: Added a new dsp file.
+
+Sun Mar 11 21:00:16 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Print out the config.h and platform_macros.GNU files, this is
+          useful when debugging builds.
+
+Sun Mar 11 18:41:08 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/CDR_Stream.h: Updated a comment to clarify that the buffer()
+          method just returns a pointer to the first block in the chain.
+          Thanks to Johnny Willemsen for pointing this out.
+
+Sun Mar 11 17:46:45 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/Local_Name_Space_T.cpp: Fixed a compiler error on Win32
+          Unicode platforms.
+
+Sun Mar 11 17:28:40 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/QoS/QoS_Session_Impl.cpp (rsvp_callback): <errflags> was unused.
+
+Sun Mar 11 08:31:05 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * tests/Makefile.bor (NAMES): Added Logging_Strategy_Test.
+
+Sun Mar 11 07:32:18 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/Logging_Strategy_Test.cpp (order): Fixed a warning in g++
+          builds.
+
+Sat Mar 10 23:15:10 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Fixed name of Crashed_Callback test
+
+Sat Mar 10 19:28:30 PST 2001 Mayur Deshpande <mayur@ics.uci.edu>
+
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
+          Fixes to enable debugging on QNX without ACE crashing.
+          Thanks to Andy Olson for the suggestions.
+
+Sat Mar 10 19:05:38 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32.h:
+
+          Include config-win32-common.h even on Windows CE.
+
+        * ace/config-win32-msvc-6.h:
+
+          If ACE_ENDTHREADEX is already defined, don't define it.
+
+        * ace/OS_Dirent.h:
+
+          Changed the use of ACE_WINCE to ACE_HAS_WINCE.
+
+        * ace/Service_Manager.cpp:
+
+          Fixed a couple of ACE_TCHAR/ACE_LIB_TEXT problems.
+
+        * ace/ace_wchar.h:
+
+          On Windows CE, #include wtypes.h.
+
+        * ace/ace_dll.vcp:
+        * ace/ace_os_dll.vcp:
+
+          Redid the output files and directories.  Now intermediate
+          files go into Release/PLATFORM and Debug/PLATFORM (where
+          PLATFORM = MIPS/ARM/X86EM/SH3/SH4).  The *.lib files go
+          into ../Lib/PLATFORM and the *.dll into ../bin/PLATFORM.
+          Also, the DLL's were renamed from ace_dll.dll and
+          ace_os_dll.dll to ace[d].dll and ace_os[d].dll.
+
+        * bin/pippen.pl:
+
+          Changed the environment variables from DEFAULT_COMPILER and
+          DEFAULT_CONFIGS to PIPPEN_COMPILER and PIPPEN_CONFIGS. Also
+          used \Q\E for the configs because some of the Windows CE
+          configs confused the script because they use parentheses.
+
+Sat Mar 10 16:59:51 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ACE-INSTALL.html:
+          Remove references to the now obsolete config-linux-lxpthreads.h
+          and platform_linux_lxpthread.GNU
+
+Sat Mar 10 16:38:22 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/run_test.lst:
+          Running the Recursive_Mutex_Test on single-threaded builds makes
+          very little sense.
+
+Sat Mar 10 16:35:19 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Add new tests: Muxing, Crashed_Callback, Client_Leaks and
+          Server_Leaks to the nightly runs.
+
+Sat Mar 10 17:55:53 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * include/makeinclude: Zapped the platform_linux_pthread.GNU,
+          platform_linux_lxpthread.GNU, and platform_linux_lxpthreads.GNU
+          files since they are confusing and shouldn't not be used in
+          favor of platform_linux.GNU.
+
+        * ace: Zapped the config-linux.pthread.h and config-linux-lxpthreads.h
+          file since they are confusing and shouldn't not be used in favor
+          of config-linux.h.  Thanks to Craig Rodrigues for this
+          suggestion.
+
+Sat Mar 10 12:39:16 2001  Craig Rodrigues  <crodrigu@bbn.com>
+
+        * ace/Reactor.h:
+        * ace/WFMO_Reactor.h:
+        * ace/Select_Reactor_T.h:
+        * ace/Reactor_Impl.h:
+          Cleaned up comment for schedule_timer()
+
+Sat Mar 10 07:05:16 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * tests: Added Logging_Strategy_Test.cpp.  Thanks to Orlando
+          Ribeiro <oribeiro@inescporto.pt> for contributing this.
+
+        * tests/Makefile (BIN): Added Logging_Strategy_Test.
+
+        * tests/run_test.lst: Added Log_Msg_Test and
+          the new Logging_Strategy_Test.
+
+        * tests/Log_Msg_Test.cpp: Added ACE_TEXT macros to all the ACE_DEBUG and
+          ACE_ERROR calls.
+
+        * ace/Service_Manager.{h,cpp}: Refactored the request processing
+          code so that it's in a single place.  Also, added support to
+          enable remote reconfiguration.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for contributing this.
+
+        * ace/Logging_Strategy.cpp (parse_args): Fixed a mistaken
+          re-initialization of the thread_priority_mask_ and the
+          process_priority_mask_.  Thanks to Martin Krumpolec
+          <krumpo@pobox.sk> for reporting this.
+
+        * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed this code so that
+          it doesn't fail if run on a directory that doesn't support locks
+          (like some NFS mounts).  Thanks to scott snyder
+          <snyder@fnal.gov> for reporting this.
+
+        * tests/SOCK_Connector_Test.cpp: Split up a loop so that the test
+          doesn't hang on RedHat Linux 7.0.  Thanks to Michael Searles
+          <msearles@base16.com> for this fix.
+
+Fri Mar  9 22:39:28 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Svc_Conf.h:
+        * ace/Service_Config.h:
+        * ace/Service_Config.cpp:
+          Add new method to the Service Configurator to add static
+          services into the repository, this factors out common code used
+          in the ORB and ACE.  In general it fixes the hacks done this
+          past Feb 20th
+
+Fri Mar  9 16:47:15 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * bin/nightlybuilds/builds.lst (LIST):
+          Added HPUX to the scoreboard.
+
+Fri Mar  9 14:34:34 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * PACE/Makefile:
+        * apps/drwho/Makefile:
+        * bin/PerlACE/Process_Unix.pm:
+        * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+          Modifications to make things build and run correctly with
+          Chorus 4.0.1.
+
+Thu Mar  8 08:38:01 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          The Single_Threaded_POA test cannot run with minimum CORBA or
+          (isn't this ironic) on single threaded configurations.
+
+Wed Mar 07 20:25:51 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+          Add QNX to the configurations in the scoreboard.
+
+Wed Mar  7 12:41:05 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Select_Reactor_T.h,
+        * ace/Reactor_Impl.h,
+        * ace/WFMO_Reactor.h,
+        * ace/Reactor.h: Updated the comments to be more accurate.  Thanks
+          to Craig Rodrigues for reporting this.
+
+Wed Mar  7 08:57:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Asynch_IO.h:
+          Changed use of ACE_UNIMPLEMENTED_FUNC to just defining the
+          assignment operators outright.  The point here is to just
+          provide any implementation, since the default one is flagged as
+          causing infinite recursion.
+
+          Thanks to David Levine for pointing out this incorrect usage of
+          the macro.
+
+        * ace/config-win32-msvc-5.h:
+        * ace/config-win32-msvc-6.h:
+
+          @file comments were mismatched.
+
+        * ace/config-win32.h:
+
+          Changed config-win32-wince.h to config-WinCE.h.
+
+        * ace/ace_wchar.h:
+        * ace/Log_Msg_NT_Event_Log.cpp:
+
+          Changed several system calls to ACE_TEXT_* (and needed to
+          add some to ace_wchar.h) since they need the ACE_TEXT
+          treatment.
+
+Wed Mar  7 08:20:01 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/ARGV.cpp:
+
+          Removed a warning about possible use of uninitialized variable.
+
+        * bin/ace_ld:
+
+          Added new functionality to filter out the harmless symbol size
+          change warnings for VxWorks 5.4.
+
+        * examples/Shared_Malloc/test_multiple_mallocs.cpp:
+        * examples/Shared_Malloc/test_persistence.cpp:
+        * examples/Shared_Malloc/test_position_independent_malloc.cpp:
+
+          Renamed the typedef MALLOC to TEST_MALLOC.  A MALLOC macro is
+          defined by a VxWorks system header.
+
+Wed Mar  7 06:11:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Asynch_IO.h: Removed the unnecessary/improper ';' at the
+          end of the line.  Thanks to Johnny Willemsen and Chris Kohlhoff
+          for reporting/fixing this.
+
+        * ace/*_Connector.h: Clarified in the comments that the
+          ACE_Time_Value *timeout represents the *maximum* amount of time
+          to wait.  If the server is not running, however, connect() can
+          return much sooner.  Thanks to Dipti Jain <dijain@hss.hns.com>
+          for motivating this.
+
+Tue Mar  6 14:14:06 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        Here are some fixes for MSVC 7 beta.  Note that no project files
+        are checked in.  Right now they will have to be generated from
+        the MSVC 5/6 files (The devenv.exe will do this automatically).
+        When MSVC 7 becomes released, we'll probably have to deal with
+        including their files (even if only for nightly builds).
+
+        * ace/OS.h:
+        * ace/config-win32-msvc.h:
+
+          Moved the inclusion of the crtdbg.h file to where it is being
+          used.  This is mainly to alleviate some excessive inclusions.
+
+        * ace/config-WinCE.h:
+        * ace/config-win32.h:
+        * ace/config-win32-msvc-5.h: (added)
+        * ace/config-win32-msvc-6.h: (added)
+        * ace/config-win32-msvc-7.h: (added)
+        * ace/config-win32-borland.h:
+        * ace/config-win32-common.h:
+        * ace/config-win32-ghs.h:
+        * ace/config-win32-msvc.h:
+        * ace/config-win32-visualage.h:
+
+          Added a new config-win32-msvc-7.h with some new settings.  While
+          doing this I also rearranged the files a bit.  Everything now
+          goes through config-win32.h (and an error will occur if you
+          include the others directly).
+
+        * ace/config-hpux-10.x-hpc++.h:
+        * ace/config-hpux-11.00.h:
+        * ace/config-win32-msvc-5.h:
+        * ace/config-win32-msvc-6.h:
+        * ace/README:
+
+          Removed ACE_HAS_ONE_DEFINITION_RULE.  Could not find this
+          actually used anywhere so I'm assuming it can be safely
+          removed.
+
+        * ace/Asynch_IO.h:
+
+          Added some dummy assignment operators.  It seems that the default
+          ones produce infinite recursion (at least with MSVC 6 SP5 and
+          MSVC 7 beta)
+
+        * ace/Future.h:
+
+          Future_Holder needs to be ACE_Export-ed.
+
+Tue Mar  6 16:58:17 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/ACE.cpp (format_hexdump): The format_hexdump () was missing
+          a space if the remaining message that needs dumping was less
+          than 16 bytes. Thansk to Johnny Willemsen"
+          <johnny.willemsen@meco.nl> for giving this fix.
+
+Tue Mar  6 11:25:53 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/PerlACE/Process_Unix.pm:
+          Ignore SIGABRT too, because it is used by abort() and we call
+          that function to test the ORB under fault conditions.
+
+Tue Mar  6 12:25:34 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * configure.in:
+
+          The configure script was broken on major releases (i.e. those with
+          no beta numbers).  A test for an empty string should have double
+          quotes around the variable.
+
+Tue Mar  6 10:16:31 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32-common.h:
+          Removed old comment about ACE_HAS_WINSOCK2 being related to
+          ACE_HAS_WINNT4.  Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for pointing this out.
+
+Tue Mar  6 10:13:03 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Membership_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+        * tests/RMCast/RMCast_Reordering_Test.cpp:
+        * tests/RMCast/RMCast_Retransmission_Test.cpp:
+          Use ACE_OS::time(0) to initialize the pseudo-random numbers
+          seed.  It is good enough for our purposes, and it works on
+          platforms without 64-bit integer support.
+
+Mon Mar  5 13:56:33 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Synch_T.{h,i}: Further simplified the new ACE_Guard constructor.
+          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing
+          this.
+
+Mon Mar  5 19:20:45 2001  Fuzz Master D <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+          As Ossama pointed out, the ACE_CHECK test was seeing
+          problems in the tao_idl files since it has uses of ACE_TRY_ENV
+          inside quotes.  Made sure not to detect problems in this case.
+
+Mon Mar  5 18:58:32 2001  Fuzz Master D <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+          Fixed some false positives in the resolve_initial_reference
+          test and also added an ACE_CHECK test by Carlos's request.
+
+Mon Mar  5 18:54:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/PerlACE/Process_Unix.pm:
+          Updated the signal detection to not pay attention to TERM and
+          KILL.  Will print out better output when signals cause a process
+          to exit during most calls like Kill () or TerminateWaitKill ().
+
+Mon Mar  5 13:56:33 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Synch_T.{h,i}: Added a new ACE_Guard constructor that
+          allows the caller to select whether the guard owns/acquires the
+          lock or not.  Thanks to Chris Kohlhoff <chris@kohlhoff.com> for
+          contributing this.
+
+        * ace/Synch_T.{h,i}: Added a disown() method that relinquishes
+          ownership of the lock so that it is not released implicitly in
+          the destructor.  Thanks to Chris Kohlhoff <chris@kohlhoff.com>
+          for contributing this.
+
+        * ace/Event_Handler.h: Updated the comment on handle_close() so that
+          it more accurately reflects what is going on.  Thanks to Defang
+          Zhou <dzhou@inktomi.com> for suggesting this.
+
+        * apps/Gateway/Gateway/Concrete_Connection_Handlers.{h,cpp}: Added
+          handle_close() operations to solve problems with certain
+          concurrency models.  Thanks to Defang Zhou <dzhou@inktomi.com>
+          for reporting this.
+
+Mon Mar  5 11:29:36 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * docs/ACE-categories.html:
+          Fixed links to the doxygen files.
+
+        * ace/Pipe.cpp:
+          Fixed what looks like a typo, we want to *disable* the stream
+          pipes under QNX, not to enable them just on that platform.
+
+Mon Mar  5 08:20:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+          Undo Doug's changes.  They broke the test.
+
+Mon Mar  5 07:52:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Log_Record.cpp (priority): Clarified the behavior of the
+          priority() set/get methods.  Thanks to Christian Schuhegger
+          <Christian.Schuhegger@cern.ch> for reporting this.
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp,
+        * tests/RMCast/RMCast_Reassembly_Test.cpp,
+        * tests/Dynamic_Priority_Test.cpp,
+        * tests/Thread_Pool_Test.cpp: Make sure to write into the
+          wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
+          <Gonzalo.Diethelm@sonda.com> for reporting this.
+
+Mon Mar  5 08:00:23 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/nightlybuilds/builds.lst:
+
+          Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds.
+
+Mon Mar 05 00:10:15 2001  Ossama Othman  <ossama@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Updated to detect missing ACE_TRY_ENV parameters in
+          ORB::resolve_initial_references() calls when emulated exceptions
+          are used.  Thanks to Darrell for providing this update.
+
+Mon Mar  5 07:57:07 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tests/Makefile.bor:
+
+          Added missing Refcounted_Auto_Ptr_Test to the build
+
+Sun Mar  4 19:31:16 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added the run_test_mt.pl for Leader_Follers.
+
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/Process_Win32.pm:
+
+          Added a destructor to detect if a process wasn't explicitly
+          killed before the object went out of scope. Will print out
+          an error and kill it.
+
+        * bin/PerlACE/Run_Test.pm:
+
+          Turned on autoflush for all scripts.
+
+        * docs/run_test.txt:
+
+          Updated run_test.pl instructions to fit all the changes I
+          just made.
+
+        * examples/Export/run_test.pl:
+        * performance-tests/RPC/run_test.pl:
+        * performance-tests/TCP/run_test.pl:
+        * performance-tests/UDP/run_test.pl:
+
+          Updated to use PerlACE::Run_Test;
+
+        * tests/Atomic_Op_Test.dsp:
+        * tests/Auto_IncDec_Test.dsp:
+        * tests/Barrier_Test.dsp:
+        * tests/Basic_Types_Test.dsp:
+        * tests/Buffer_Stream_Test.dsp:
+        * tests/CDR_Array_Test.dsp:
+        * tests/CDR_File_Test.dsp:
+        * tests/CDR_Test.dsp:
+        * tests/Cache_Map_Manager_Test.dsp:
+        * tests/Cached_Accept_Conn_Test.dsp:
+        * tests/Cached_Conn_Test.dsp:
+        * tests/Capabilities_Test.dsp:
+        * tests/Collection_Test.dsp:
+        * tests/Config_Test.dsp:
+        * tests/Conn_Test.dsp:
+        * tests/DLL_Test.dsp:
+        * tests/DLList_Test.dsp:
+        * tests/Dirent_Test.dsp:
+        * tests/Dynamic_Priority_Test.dsp:
+        * tests/Enum_Interfaces_Test.dsp:
+        * tests/Env_Value_Test.dsp:
+        * tests/Future_Set_Test.dsp:
+        * tests/Future_Test.dsp:
+        * tests/Handle_Set_Test.dsp:
+        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
+        * tests/Hash_Map_Manager_Test.dsp:
+        * tests/High_Res_Timer_Test.dsp:
+        * tests/IOStream_Test.dsp:
+        * tests/Lazy_Map_Manager_Test.dsp:
+        * tests/Log_Msg_Test.dsp:
+        * tests/MEM_Stream_Test.dsp:
+        * tests/MM_Shared_Memory_Test.dsp:
+        * tests/MT_Reactor_Timer_Test.dsp:
+        * tests/MT_SOCK_Test.dsp:
+        * tests/Malloc_Test.dsp:
+        * tests/Map_Manager_Test.dsp:
+        * tests/Map_Test.dsp:
+        * tests/Mem_Map_Test.dsp:
+        * tests/Message_Block_Test.dsp:
+        * tests/Message_Queue_Notifications_Test.dsp:
+        * tests/Message_Queue_Test.dsp:
+        * tests/Message_Queue_Test_Ex.dsp:
+        * tests/Naming_Test.dsp:
+        * tests/New_Fail_Test.dsp:
+        * tests/Notify_Performance_Test.dsp:
+        * tests/OS_Test.dsp:
+        * tests/Object_Manager_Test.dsp:
+        * tests/OrdMultiSet_Test.dsp:
+        * tests/Pipe_Test.dsp:
+        * tests/Priority_Buffer_Test.dsp:
+        * tests/Priority_Reactor_Test.dsp:
+        * tests/Priority_Task_Test.dsp:
+        * tests/Process_Manager_Test.dsp:
+        * tests/Process_Mutex_Test.dsp:
+        * tests/Process_Strategy_Test.dsp:
+        * tests/RB_Tree_Test.dsp:
+        * tests/Reactor_Exceptions_Test.dsp:
+        * tests/Reactor_Notify_Test.dsp:
+        * tests/Reactor_Performance_Test.dsp:
+        * tests/Reactor_Timer_Test.dsp:
+        * tests/Reactors_Test.dsp:
+        * tests/Reader_Writer_Test.dsp:
+        * tests/Recursive_Mutex_Test.dsp:
+        * tests/Refcounted_Auto_Ptr_Test.dsp:
+        * tests/Reverse_Lock_Test.dsp:
+        * tests/SOCK_Connector_Test.dsp:
+        * tests/SOCK_Send_Recv_Test.dsp:
+        * tests/SOCK_Test.dsp:
+        * tests/SPIPE_Test.dsp:
+        * tests/SString_Test.dsp:
+        * tests/SV_Shared_Memory_Test.dsp:
+        * tests/Semaphore_Test.dsp:
+        * tests/Service_Config_Test.dsp:
+        * tests/Sigset_Ops_Test.dsp:
+        * tests/Simple_Message_Block_Test.dsp:
+        * tests/Svc_Handler_Test.dsp:
+        * tests/TSS_Test.dsp:
+        * tests/Task_Test.dsp:
+        * tests/Thread_Manager_Test.dsp:
+        * tests/Thread_Mutex_Test.dsp:
+        * tests/Thread_Pool_Reactor_Test.dsp:
+        * tests/Thread_Pool_Test.dsp:
+        * tests/Time_Service_Test.dsp:
+        * tests/Time_Value_Test.dsp:
+        * tests/Timeprobe_Test.dsp:
+        * tests/Timer_Queue_Test.dsp:
+        * tests/Tokens_Test.dsp:
+        * tests/UPIPE_SAP_Test.dsp:
+        * tests/Upgradable_RW_Test.dsp:
+        * tests/version_tests/Atomic_Op_Test.dsp: (removed)
+        * tests/version_tests/Auto_IncDec_Test.dsp: (removed)
+        * tests/version_tests/Barrier_Test.dsp: (removed)
+        * tests/version_tests/Basic_Types_Test.dsp: (removed)
+        * tests/version_tests/Buffer_Stream_Test.dsp: (removed)
+        * tests/version_tests/CDR_Array_Test.dsp: (removed)
+        * tests/version_tests/CDR_File_Test.dsp: (removed)
+        * tests/version_tests/CDR_Test.dsp: (removed)
+        * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed)
+        * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed)
+        * tests/version_tests/Cached_Conn_Test.dsp: (removed)
+        * tests/version_tests/Capabilities_Test.dsp: (removed)
+        * tests/version_tests/Collection_Test.dsp: (removed)
+        * tests/version_tests/Config_Test.dsp: (removed)
+        * tests/version_tests/Conn_Test.dsp: (removed)
+        * tests/version_tests/DLL_Test.dsp: (removed)
+        * tests/version_tests/DLList_Test.dsp: (removed)
+        * tests/version_tests/Dirent_Test.dsp: (removed)
+        * tests/version_tests/Dynamic_Priority_Test.dsp: (removed)
+        * tests/version_tests/Enum_Interfaces_Test.dsp: (removed)
+        * tests/version_tests/Env_Value_Test.dsp: (removed)
+        * tests/version_tests/Future_Set_Test.dsp: (removed)
+        * tests/version_tests/Future_Test.dsp: (removed)
+        * tests/version_tests/Handle_Set_Test.dsp: (removed)
+        * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed)
+        * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed)
+        * tests/version_tests/High_Res_Timer_Test.dsp: (removed)
+        * tests/version_tests/IOStream_Test.dsp: (removed)
+        * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed)
+        * tests/version_tests/Log_Msg_Test.dsp: (removed)
+        * tests/version_tests/MEM_Stream_Test.dsp: (removed)
+        * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed)
+        * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed)
+        * tests/version_tests/MT_SOCK_Test.dsp: (removed)
+        * tests/version_tests/Malloc_Test.dsp: (removed)
+        * tests/version_tests/Map_Manager_Test.dsp: (removed)
+        * tests/version_tests/Map_Test.dsp: (removed)
+        * tests/version_tests/Mem_Map_Test.dsp: (removed)
+        * tests/version_tests/Message_Block_Test.dsp: (removed)
+        * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed)
+        * tests/version_tests/Message_Queue_Test.dsp: (removed)
+        * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed)
+        * tests/version_tests/Naming_Test.dsp: (removed)
+        * tests/version_tests/New_Fail_Test.dsp: (removed)
+        * tests/version_tests/Notify_Performance_Test.dsp: (removed)
+        * tests/version_tests/OS_Test.dsp: (removed)
+        * tests/version_tests/Object_Manager_Test.dsp: (removed)
+        * tests/version_tests/OrdMultiSet_Test.dsp: (removed)
+        * tests/version_tests/Pipe_Test.dsp: (removed)
+        * tests/version_tests/Priority_Buffer_Test.dsp: (removed)
+        * tests/version_tests/Priority_Reactor_Test.dsp: (removed)
+        * tests/version_tests/Priority_Task_Test.dsp: (removed)
+        * tests/version_tests/Process_Manager_Test.dsp: (removed)
+        * tests/version_tests/Process_Mutex_Test.dsp: (removed)
+        * tests/version_tests/Process_Strategy_Test.dsp: (removed)
+        * tests/version_tests/RB_Tree_Test.dsp: (removed)
+        * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed)
+        * tests/version_tests/Reactor_Notify_Test.dsp: (removed)
+        * tests/version_tests/Reactor_Performance_Test.dsp: (removed)
+        * tests/version_tests/Reactor_Timer_Test.dsp: (removed)
+        * tests/version_tests/Reactors_Test.dsp: (removed)
+        * tests/version_tests/Reader_Writer_Test.dsp: (removed)
+        * tests/version_tests/Recursive_Mutex_Test.dsp: (removed)
+        * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed)
+        * tests/version_tests/Reverse_Lock_Test.dsp: (removed)
+        * tests/version_tests/SOCK_Connector_Test.dsp: (removed)
+        * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed)
+        * tests/version_tests/SOCK_Test.dsp: (removed)
+        * tests/version_tests/SPIPE_Test.dsp: (removed)
+        * tests/version_tests/SString_Test.dsp: (removed)
+        * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed)
+        * tests/version_tests/Semaphore_Test.dsp: (removed)
+        * tests/version_tests/Service_Config_Test.dsp: (removed)
+        * tests/version_tests/Sigset_Ops_Test.dsp: (removed)
+        * tests/version_tests/Simple_Message_Block_Test.dsp: (removed)
+        * tests/version_tests/Svc_Handler_Test.dsp: (removed)
+        * tests/version_tests/TSS_Test.dsp: (removed)
+        * tests/version_tests/Task_Test.dsp: (removed)
+        * tests/version_tests/Thread_Manager_Test.dsp: (removed)
+        * tests/version_tests/Thread_Mutex_Test.dsp: (removed)
+        * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed)
+        * tests/version_tests/Thread_Pool_Test.dsp: (removed)
+        * tests/version_tests/Time_Service_Test.dsp: (removed)
+        * tests/version_tests/Time_Value_Test.dsp: (removed)
+        * tests/version_tests/Timeprobe_Test.dsp: (removed)
+        * tests/version_tests/Timer_Queue_Test.dsp: (removed)
+        * tests/version_tests/Tokens_Test.dsp: (removed)
+        * tests/version_tests/UPIPE_SAP_Test.dsp: (removed)
+        * tests/version_tests/Upgradable_RW_Test.dsp: (removed)
+        * tests/version_tests/run_all_tests.bat: (removed)
+        * tests/version_tests/version_tests.dsw: (removed)
+
+          Moved the version_tests back into the tests/*.dsp files.  The
+          reason they were originally moved is because it was easier to
+          select all the debug versions during a batch build.  But now we
+          have pippen.pl and msvc_auto_compile.pl, so this is no longer an
+          issue, while this strange setup would compilicate the nightly
+          builds.  Thus, it was standardized back.
+
+        * bin/create_vt_dsps.pl: (removed)
+
+          No need for this anymore.
+
+Sun Mar  4 19:27:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Log_Msg.cpp:
+        * ace/Log_Msg_NT_Event_Log.h:
+        * ace/OS.cpp:
+
+          Disabled Log_Msg_NT_Event_Log on Windows CE.
+
+Sun Mar 04 13:19:35 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * etc/tao.doxygen:
+          Add .txt files, so we can add web pages to the basic TAO
+          documentation.
+
+Sun Mar 04 10:58:08 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT
+          project files.
+
+Sun Mar  4 10:41:57 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Log_Msg.cpp,
+          ace/Log_Msg.h,
+          ace/Logging_Strategy.cpp,
+          ace/Makefile.bor,
+          ace/OS.cpp,
+          ace/OS.h,
+          ace/OS.i,
+          ace/ace.rc: Added support for the new NT event logging capability.
+          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
+
+        * ace/Log_Msg_NT_Event_Log.cpp
+          ace/Log_Msg_NT_Event_Log.h
+          ace/ace_message_table.bin:  Added these files to support the new
+          NT event logging capability.
+          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing
+          this.
+
+Sun Mar  4 04:46:44 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+
+          Added new Windows CE nightly build.
+
+Sun Mar 04 03:12:17 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly
+          typed in as ACE_STATIC_LIBS.
+
+        * ace/svc_export.h:
+        * ace/RMCast/RMCast_Export.h:
+        * ace/SSL/SSL_Export.h:
+        * websvcs/lib/websvcs_export.h: These files didn't check for
+          ACE_AS_STATIC_LIBS to determine if they should define their
+          export macros for static build.  Thanks to Chris Kohlhoff
+          <chris@kohlhoff.com> for reporting this.  [Bug 813]
+
+Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/QoS/QoS_Session_Impl.cpp:
+        * ace/QoS/QoS_Session_Impl.i:
+        * examples/QOS/Fill_ACE_QoS.cpp:
+        * examples/QOS/Fill_ACE_QoS.h:
+        * examples/QOS/Makefile:
+        * examples/QOS/QoS_Util.cpp:
+        * examples/QOS/Receiver_QoS_Event_Handler.cpp:
+        * examples/QOS/Sender_QoS_Event_Handler.cpp:
+          Fixed various compile warnings when compiling with rapi=1 on
+          Redhat Linux 6.2
+
+Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Changed the detection pattern a bit to pick up
+          stuff like:
+
+          void
+          operator < (...)
+
+          better.
+
+        * ace/Auto_Ptr.i:
+        * ace/Base_Thread_Adapter.cpp:
+        * ace/Based_Pointer_T.i:
+        * ace/Connector.cpp:
+        * ace/Containers_T.cpp:
+        * ace/DEV_Addr.i:
+        * ace/Dynamic.i:
+        * ace/FILE.cpp:
+        * ace/Flag_Manip.i:
+        * ace/Handle_Set.i:
+        * ace/Hash_Map_Manager_T.cpp:
+        * ace/Lib_Find.cpp:
+        * ace/Local_Name_Space_T.cpp:
+        * ace/Local_Tokens.cpp:
+        * ace/MEM_Addr.i:
+        * ace/Malloc.cpp:
+        * ace/Malloc_Allocator.cpp:
+        * ace/Malloc_T.cpp:
+        * ace/Memory_Pool.cpp:
+        * ace/Message_Block.cpp:
+        * ace/Message_Block.i:
+        * ace/Message_Block_T.cpp:
+        * ace/Message_Queue.i:
+        * ace/Message_Queue_T.cpp:
+        * ace/Message_Queue_T.i:
+        * ace/Naming_Context.cpp:
+        * ace/OS.cpp:
+        * ace/OS.i:
+        * ace/PI_Malloc.cpp:
+        * ace/POSIX_Asynch_IO.cpp:
+        * ace/Process_Manager.cpp:
+        * ace/QtReactor.cpp:
+        * ace/RB_Tree.i:
+        * ace/RW_Process_Mutex.cpp:
+        * ace/Reactor.cpp:
+        * ace/Remote_Name_Space.cpp:
+        * ace/Remote_Tokens.cpp:
+        * ace/SOCK_Dgram.i:
+        * ace/SString.cpp:
+        * ace/SUN_Proactor.cpp:
+        * ace/Select_Reactor_Base.cpp:
+        * ace/Select_Reactor_T.cpp:
+        * ace/Service_Object.i:
+        * ace/Service_Repository.cpp:
+        * ace/Signal.cpp:
+        * ace/Signal.i:
+        * ace/Svc_Handler.cpp:
+        * ace/Synch.cpp:
+        * ace/Synch_T.cpp:
+        * ace/Thread_Adapter.cpp:
+        * ace/Thread_Manager.cpp:
+        * ace/Timer_Heap_T.cpp:
+        * ace/TkReactor.cpp:
+        * ace/Token.cpp:
+        * ace/Token_Manager.cpp:
+        * ace/CLASSIX/CLASSIX_CO_Acceptor.i:
+        * ace/CLASSIX/CLASSIX_Select_Reactor.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+        * netsvcs/ACE-netsvcs.html:
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+        * netsvcs/lib/Token_Handler.cpp:
+
+          Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors)
+
+        * docs/ACE-categories.html:
+        * docs/ACE-porting.html:
+        * docs/ACE-subsets.html:
+        * docs/tutorials/new-tutorials.html:
+
+          Changed references to
+          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
+          relative paths instead (Fixes the last of the fuzz errors).
+
+Fri Mar 2 20:08  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
+          Added macros tha expand to multiple libraries
+          on QNX RTP to fix most of the link problems.
+
+Fri Mar  2 16:35:58 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32-borland.h:
+
+          Added /**/ to #include <vcl.h> so it isn't picked up by
+          MSVC-based dependency generators.
+
+Fri Mar 02 19:36:22 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and
+          errno is EAGAIN, change it to EWOULDBLOCK. Improve portability
+          for platforms where EAGAIN and EWOULDBLOCK are different values
+          and both used, like HP-UX.  Thanks to Michael Grove
+          <snowymike@aol.com> for reporting this problem.
+
+        * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX.
+          This makes it pick up the EAGAIN->EWOULDBLOCK change.
+
+        * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where
+          ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless
+          ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree
+          will get ENOTSUP anyway.
+
+Fri Mar 02 17:50:40 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
+
+        * ace/QtReactor.cpp:
+          Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting
+          and fixing the problem - crashing of TAO/tests/QtTests/ client
+          example after moving the slider.
+
+Fri Mar 02 15:35:40 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_Acceptor.cpp:
+        * ace/MEM_Acceptor.h:
+        * ace/MEM_Addr.cpp:
+        * ace/MEM_Addr.h:
+        * ace/MEM_Connector.cpp:
+        * ace/MEM_Connector.h:
+        * ace/MEM_IO.cpp:
+        * ace/MEM_IO.h:
+        * ace/MEM_SAP.cpp:
+        * ace/MEM_SAP.h:
+        * ace/MEM_Stream.cpp:
+        * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses
+          not to support position independent pointers.
+
+Fri Mar 02 13:17:36 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/IOStream/server/iostream_server.cpp (main): Removed the
+          call to register peer_acceptor with the reactor. The
+          acceptor::open call already registers for ACCEPT_MASK. Prevents
+          leaving a hanging READ_MASK registered after the acceptor is
+          destroyed when main() returns. This fixes Bugzilla # 801. Thanks
+          to Pim Philipse <pph@rogan-medical.com> for reporting this.
+
+        * THANKS: Added Pim Philipse to the Hall of Fame.
+
+Fri Mar 02 12:24:27 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions
+          (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set
+          ACE_NEW_THROWS_EXCEPTIONS either).
+
+        * ace/Thread_Manager.cpp (join_thr): Moved the code for
+          ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here to
+          ACE_OS::thr_join (which this function calls) so that
+          ACE_Thread::join also causes a pthread_detach. This is needed on
+          Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread
+          storage and avoid leaking memory. Thanks to Vladimir Kondratiev
+          <vladimir.kondratiev@intel.com> for reporting this and providing
+          excellent test cases to help resolve it quickly.
+
+        * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from
+          ACE_Thread_Manager::join_thr, above.
+
+        * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard
+          around purge_pending_notifications to prevent against an ENOTSUP
+          from purge_pending_notifications.
+
+Thu Mar  1 17:02:10 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/Process_Win32.pm:
+
+          Fixed up the Spawn code to use the Executable () instead of
+          {EXECUTABLE}, since that's how we get the adjusted name (with
+          .exe and stuff).  And also skipped the file existance with
+          IgnoreExeSubDir, since IgnoreExeSubDir is often used when you
+          need to find the program in the path.
+
+Thu Mar  1 15:48:10 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Fuzz was being a bit to eager with the class matching in the
+          TRACE test.  It was having problems with something like:
+
+          char *foo::bar ()
+
+          since it thought the class was "char *foo" instead of just
+          "foo".
+
+          But it is feeling muuuuuuch better now.
+
+Thu Mar  1 13:18:07 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Added two new tests:
+
+          - absolute ACE_wrappers test:
+
+            Check for ~schmidt/ACE_wrappers in html files.  These should
+            be relative links since these html files already exist in
+            their own ACE_wrappers tree.
+
+          - TRACE test:
+
+            Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually
+            refers to the function/method it is in.
+
+          And expanded the checks in the bad run_test test (level 6)
+
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/Process_Win32.pm:
+
+          - Added checks for file existence before running.
+          - Added IgnoreExeSubDir option.
+          - Added TerminateWaitKill method.
+
+        * bin/pippen.pl: (added)
+        * bin/PerlACE/MSProject.pm: (added)
+        * bin/PerlACE/MSProject/DSP.pm: (added)
+        * bin/PerlACE/MSProject/VCP.pm: (added)
+
+          There is nothing to see here...please be on your way.
+
+          It isn't like this is a super top secret project to
+          replace msvc_auto_compile.pl with something that works
+          better and also has a cool code-name that is shorter
+          than "msvc_auto_compile.pl".
+
+          But remember, you didn't hear that from me.
+
+Thu Mar  1 10:54:23 2001  Ossama Othman  <ossama@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added the TAO Codec to the list of tests to run.
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Fixed all incorrect uses of CFLAGS and CCFLAGS where
+          preprocessor macros were defined.  Preprocessor macros should be
+          defined in the CPPFLAGS variable.
+
+          Define ACE_USE_RCSID in non-debug builds (i.e. debug=0).
+
+Thu Mar 01 07:29:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Fixed typos in the Service_Context_Manipulation test.  It was
+          running in platforms where it shouldn't.
+
+Thu Mar 01 07:07:03 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * include/makeinclude/recurse.bor:
+          Added support for makefiles which contain multiple targets.
+
+        * examples/IPC_SAP/SOCK_SAP/Makefile.bor:
+        * examples/Log_Msg/Makefile.bor:
+        * examples/Map_Manager/Makefile.bor:
+        * examples/Mem_Map/file-reverse/Makefile.bor:
+        * examples/RMCast/Send_File/Makefile.bor:
+        * examples/Service_Configurator/IPC-tests/client/Makefile.bor:
+        * examples/Threads/Makefile.bor:
+        * netsvcs/clients/Logger/Makefile.bor:
+        * tests/Makefile.bor:
+        * tests/RMCast/Makefile.bor:
+          Updated to work with new multi-target makefile support.
+
+Wed Feb 28 22:58:50 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * html/index.html:
+          Reference */index.html directly, instead of assuming that the
+          web browser will use index.html as the default file, this also
+          works better when browsing locally.  Thanks to Alain Decamps
+          <Alain.Decamps@pidpa.be> for pointing this out.
+
+Wed Feb 28 16:41:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * docs/bugzilla-build-setup.html:
+
+          Updated the section about the scoreboard and added a
+          placeholder for Win32 nightly build information.
+
+Wed Feb 28 16:04:14 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and
+          Messaging support disabled for the nightly builds.
+
+Wed Feb 28 15:35:59 2001  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * docs/bugzilla-build-setup.html:
+          Added html file outlining steps for adding a bugzilla nightly
+          build.
+
+Wed Feb 28 00:25:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          The examples/POA/Adapter_Activator/run_test.pl test was being
+          run twice.  In fairness to all the other tests that only get to
+          run once, I removed the second instance.
+
+Tue Feb 27 17:31:48 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for
+          the threads=0 build - this enables the reentrant functions which
+          are present, threads or not. It does not turn on threads, which
+          are instead enabled by -D_POSIX_C_SOURCE=199506L.
+
+        * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+
+        * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to
+          the POSIX.1c-conformant version of rand_r. Allows clean compile
+          on HP-UX 11 without thread support.  Also lined up some
+          misaligned #if/else/endif lines to make it easier to find one's
+          way through.
+
+        * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the
+          ways to get the POSIX.1c-conformant version of readdir_r. Allows
+          clean compile on HP-UX 11 without thread support.
+
+Tue Feb 27 11:38:38 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * performance-tests/TCP/tcp_test.cpp (main): Zapped the
+          non-existent '-f' option.  Thanks to Mike Curtis for reporting
+          this.
+
+        * performance-tests/TCP/tcp_test.cpp (main): Check for improper
+          bufsz.  Thanks to Mike Curtis for reporting this.
+
+        * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t'
+          option, which specifies the number of threads.
+
+        * performance-tests/TCP/README: Fixed a typo.  Thanks to
+          Mike Curtis for reporting this.
+
+Tue Feb 27 10:51:18 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst: Added the AMI tests to the daily
+          builds.
+
+Tue Feb 27 10:23:20 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES
+          to ChangeLog*. This should help us to avoid missing ChangeLog
+          entries in the beta distribution, just about every time we split
+          and add a ChangeLog.
+
+Mon Feb 27 07:39:16 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_hpux_aCC.GNU:
+
+          Removed suppression of Future Error 129.
+          Removed the use of CFLAGS.
+
+        * ace/OS.h:
+        * ace/config-hpux-11.00.h:
+          Modification to remove system header macro definition conflicts.
+          This change does not suppress the conflicts, but does an undef
+          of the two conflicting macros before includeing tcp.h.  Thanks
+          to Sam Chong <sam@i2i-inc.com> for reporting this problem.
+
+Mon Feb 26 19:01:16 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/Logging_Strategy.{h,cpp}: Added a new -k option to
+          set the logging key via the ACE_Logging_Strategy.  Thanks to
+          Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
+
+Mon Feb 26 18:18:38 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/SString.i
+          (ACE_CString::find (const char *s, int pos) const):
+          (ACE_CString::find (char c, int pos) const):
+          (ACE_SString::find (const char *s, int pos) const):
+          (ACE_SString::find (char c, int pos) const):
+          (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const):
+          If match is found, return index from start of string, not from
+          'pos'. Matches the C++ string standard, which was the model for
+          these classes.  Thanks to Glen Osterhout <gosterho@elronsw.com>
+          for this fix.
+
+        * ace/SString.h: Clarified comments on return value for above
+          functions.
+
+        * tests/SString_Test.cpp: Changed to look for the correct return
+          from the npos tests of the functions above.
+
+        * THANKS: Added Glen Osterhout to the Hall of Fame.
+
+Mon Feb 26 15:01:55 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/DLL_Test_Impl.dsp:
+        * tests/version_tests/DLL_Test_Impl.dsp: (removed)
+          Me thinks that the Release and Static configurations should
+          also compile, and me thinks that it is now fixed.
+
+Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
+          method assumes ownership of <next_arg>, rather than copying it.
+          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
+          Fixes [Bug 807].
+
+          The generated version_tests dsp didn't work (since DLL_Test_Impl
+          creates a library).  Manually created the configurations in the
+          tests/DLL_Test_Impl.dsp version instead.
+
+Mon Feb 26 15:54:33 2001  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b)
+
+        * docs/tutorials/013/message_queue.cpp:
+        * tests/Malloc_Test.cpp:
+
+        Fixed errors in #pragma instiate lines including removal of ';',
+        mispellings
+
+        * ace/config-all.h:
+
+        Added definition of Unixware UDK for definition of ACE_NOTREACHED()
+
+        * ace/config-unixware-7.1.0.udk.h:
+        * include/makeinclude/platform_unixware_udk.GNU:
+
+        New configuration files for building on Unixware 7 with UDK CC.
+
+Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
+          method assumes ownership of <next_arg>, rather than copying it.
+          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
+          Fixes [Bug 807].
+
+Mon Feb 26 12:27:46 2001  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ace/CDR_Stream.h:
+        * ace/CDR_Stream.i:
+          Added method to reset the byte order in class OuputCDR.  This
+          will be used by a gateway to set the byte order of a reply to a
+          reqest it has handled to one different than the gateway's own
+          byte order, if necessary. It should be called while the stream
+          is still empty, that is, before any part of the reply, including
+          the header, has been marshaled.
+
+Mon Feb 26 12:07:00 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before
+          setting the MAP_FIXED flag.  Thanks to <rhuber@amadeus.net> for
+          reporting this. [Bug 752]
+
+Mon Feb 26 09:29:36 2001  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+        * ace/RB_Tree.h:
+          Fully qualified enum name. This fixes problems on gcc-272 builds.
+
+Mon Feb 26 00:19:28 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        Time to do some spring cleaning...
+
+        * tests/version_tests/Config_Test.dsp: (added)
+        * tests/version_tests/DLL_Test_Impl.dsp: (added)
+        * tests/version_tests/Log_Msg_Test.dsp: (added)
+        * tests/version_tests/Message_Queue_Test_Ex.dsp: (added)
+        * tests/version_tests/version_tests.dsw:
+
+          Updated the version_tests dir with create_vt_dsps.pl.
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+        * netsvcs/lib/netsvcs.dsp:
+        * netsvcs/servers/servers.dsp:
+        * tests/ACE_Init_Test.dsp:
+        * tests/Atomic_Op_Test.dsp:
+        * tests/Auto_IncDec_Test.dsp:
+        * tests/Barrier_Test.dsp:
+        * tests/Basic_Types_Test.dsp:
+        * tests/Buffer_Stream_Test.dsp:
+        * tests/CDR_Array_Test.dsp:
+        * tests/CDR_File_Test.dsp:
+        * tests/CDR_Test.dsp:
+        * tests/Cache_Map_Manager_Test.dsp:
+        * tests/Cached_Accept_Conn_Test.dsp:
+        * tests/Cached_Conn_Test.dsp:
+        * tests/Capabilities_Test.dsp:
+        * tests/Collection_Test.dsp:
+        * tests/Config_Test.dsp:
+        * tests/Conn_Test.dsp:
+        * tests/DLL_Test.dsp:
+        * tests/DLList_Test.dsp:
+        * tests/Dirent_Test.dsp:
+        * tests/Dynamic_Priority_Test.dsp:
+        * tests/Enum_Interfaces_Test.dsp:
+        * tests/Env_Value_Test.dsp:
+        * tests/Future_Set_Test.dsp:
+        * tests/Future_Test.dsp:
+        * tests/Handle_Set_Test.dsp:
+        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
+        * tests/Hash_Map_Manager_Test.dsp:
+        * tests/High_Res_Timer_Test.dsp:
+        * tests/IOStream_Test.dsp:
+        * tests/Lazy_Map_Manager_Test.dsp:
+        * tests/Log_Msg_Test.dsp:
+        * tests/MEM_Stream_Test.dsp:
+        * tests/MM_Shared_Memory_Test.dsp:
+        * tests/MT_Reactor_Timer_Test.dsp:
+        * tests/MT_SOCK_Test.dsp:
+        * tests/Malloc_Test.dsp:
+        * tests/Map_Manager_Test.dsp:
+        * tests/Map_Test.dsp:
+        * tests/Mem_Map_Test.dsp:
+        * tests/Message_Block_Test.dsp:
+        * tests/Message_Queue_Notifications_Test.dsp:
+        * tests/Message_Queue_Test.dsp:
+        * tests/Message_Queue_Test_Ex.dsp:
+        * tests/Naming_Test.dsp:
+        * tests/New_Fail_Test.dsp:
+        * tests/Notify_Performance_Test.dsp:
+        * tests/OS_Test.dsp:
+        * tests/Object_Manager_Test.dsp:
+        * tests/OrdMultiSet_Test.dsp:
+        * tests/Pipe_Test.dsp:
+        * tests/Priority_Buffer_Test.dsp:
+        * tests/Priority_Reactor_Test.dsp:
+        * tests/Priority_Task_Test.dsp:
+        * tests/Process_Manager_Test.dsp:
+        * tests/Process_Mutex_Test.dsp:
+        * tests/Process_Strategy_Test.dsp:
+        * tests/RB_Tree_Test.dsp:
+        * tests/Reactor_Exceptions_Test.dsp:
+        * tests/Reactor_Notify_Test.dsp:
+        * tests/Reactor_Performance_Test.dsp:
+        * tests/Reactor_Timer_Test.dsp:
+        * tests/Reactors_Test.dsp:
+        * tests/Reader_Writer_Test.dsp:
+        * tests/Recursive_Mutex_Test.dsp:
+        * tests/Refcounted_Auto_Ptr_Test.dsp:
+        * tests/Reverse_Lock_Test.dsp:
+        * tests/SOCK_Connector_Test.dsp:
+        * tests/SOCK_Send_Recv_Test.dsp:
+        * tests/SOCK_Test.dsp:
+        * tests/SPIPE_Test.dsp:
+        * tests/SString_Test.dsp:
+        * tests/SV_Shared_Memory_Test.dsp:
+        * tests/Semaphore_Test.dsp:
+        * tests/Service_Config_Test.dsp:
+        * tests/Sigset_Ops_Test.dsp:
+        * tests/Simple_Message_Block_Test.dsp:
+        * tests/Svc_Handler_Test.dsp:
+        * tests/TSS_Test.dsp:
+        * tests/Task_Test.dsp:
+        * tests/Thread_Manager_Test.dsp:
+        * tests/Thread_Mutex_Test.dsp:
+        * tests/Thread_Pool_Reactor_Test.dsp:
+        * tests/Thread_Pool_Test.dsp:
+        * tests/Time_Service_Test.dsp:
+        * tests/Time_Value_Test.dsp:
+        * tests/Timeprobe_Test.dsp:
+        * tests/Timer_Queue_Test.dsp:
+        * tests/Tokens_Test.dsp:
+        * tests/UPIPE_SAP_Test.dsp:
+        * tests/Upgradable_RW_Test.dsp:
+
+          Removed the Alpha configurations.  I don't think we've actually
+          looked at these for over a year, and they are missing from a lot
+          of projects.  Thankfully, they are easy to recreate if they are
+          needed.
+
+        * ACE-INSTALL.html:
+
+          Changed the Windows NT Alpha section to mention that we no
+          longer have configurations out of the box for Win32/Alpha, they
+          must be recreated if needed.
+
+        * WindozeCE/ACEApp.cpp: (removed)
+        * WindozeCE/ACEApp.h: (removed)
+        * WindozeCE/README: (removed)
+        * WindozeCE/StdAfx.cpp: (removed)
+        * WindozeCE/StdAfx.h: (removed)
+        * WindozeCE/WindozeCE.aps: (removed)
+        * WindozeCE/WindozeCE.clw: (removed)
+        * WindozeCE/WindozeCE.cpp: (removed)
+        * WindozeCE/WindozeCE.dsp: (removed)
+        * WindozeCE/WindozeCE.h: (removed)
+        * WindozeCE/WindozeCE.rc: (removed)
+        * WindozeCE/WindozeCEDlg.cpp: (removed)
+        * WindozeCE/WindozeCEDlg.h: (removed)
+        * WindozeCE/resource.h: (removed)
+        * WindozeCE/res/WindozeCE.ico: (removed)
+        * WindozeCE/res/WindozeCE.rc2: (removed)
+
+          No longer used.
+
+        * Makefile:
+
+          Removed WindozeCE from CONTROLLED_FILES.
+
+        * tests/WinCE/Atomic_Op_Test.dsp: (removed)
+        * tests/WinCE/Barrier_Test.dsp: (removed)
+        * tests/WinCE/Basic_Types_Test.dsp: (removed)
+        * tests/WinCE/Buffer_Stream_Test.dsp: (removed)
+        * tests/WinCE/Conn_Test.dsp: (removed)
+        * tests/WinCE/DLL_Test.dsp: (removed)
+        * tests/WinCE/Enum_Interfaces_Test.dsp: (removed)
+        * tests/WinCE/Future_Test.dsp: (removed)
+        * tests/WinCE/Handle_Set_Test.dsp: (removed)
+        * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed)
+        * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed)
+        * tests/WinCE/MT_SOCK_Test.dsp: (removed)
+        * tests/WinCE/Map_Manager_Test.dsp: (removed)
+        * tests/WinCE/Mem_Map_Test.dsp: (removed)
+        * tests/WinCE/Message_Block_Test.dsp: (removed)
+        * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed)
+        * tests/WinCE/Message_Queue_Test.dsp: (removed)
+        * tests/WinCE/Notify_Performance_Test.dsp: (removed)
+        * tests/WinCE/OrdMultiSet_Test.dsp: (removed)
+        * tests/WinCE/Priority_Buffer_Test.dsp: (removed)
+        * tests/WinCE/Priority_Task_Test.dsp: (removed)
+        * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed)
+        * tests/WinCE/Reactor_Notify_Test.dsp: (removed)
+        * tests/WinCE/Reactor_Performance_Test.dsp: (removed)
+        * tests/WinCE/Reactor_Timer_Test.dsp: (removed)
+        * tests/WinCE/Reactors_Test.dsp: (removed)
+        * tests/WinCE/Reader_Writer_Test.dsp: (removed)
+        * tests/WinCE/Recursive_Mutex_Test.dsp: (removed)
+        * tests/WinCE/SOCK_Connector_Test.dsp: (removed)
+        * tests/WinCE/SOCK_Test.dsp: (removed)
+        * tests/WinCE/SString_Test.dsp: (removed)
+        * tests/WinCE/Semaphore_Test.dsp: (removed)
+        * tests/WinCE/Sigset_Ops_Test.dsp: (removed)
+        * tests/WinCE/Simple_Message_Block_Test.dsp: (removed)
+        * tests/WinCE/TSS_Test.dsp: (removed)
+        * tests/WinCE/Task_Test.dsp: (removed)
+        * tests/WinCE/Thread_Manager_Test.dsp: (removed)
+        * tests/WinCE/Thread_Mutex_Test.dsp: (removed)
+        * tests/WinCE/Thread_Pool_Test.dsp: (removed)
+        * tests/WinCE/Time_Value_Test.dsp: (removed)
+        * tests/WinCE/Timer_Queue_Test.dsp: (removed)
+        * tests/WinCE/ce_tests.dsw: (removed)
+
+          Removed these Windows CE Toolkit for Visual C++ files.
+
+Mon Feb 26 00:15:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/DLL_Test_Impl.dsp:
+
+          Made sure the Code Generation settings were correct.
+
+Sun Feb 25 19:40:11 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/ACEutils.pm (CheckForConfig):
+          This routine was not removing all the -Config options from the
+          command-line, causing problems in some of the tests.
+
+Sun Feb 25 16:33:26 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/DLL_Test.cpp:
+
+          Left the DLL end with a d in debug mode, but changed
+          the test to add the d when _DEBUG and ACE_WIN32 is
+          defined.  Test should now work again on Win2000_Debug.
+
+Sun Feb 25 11:28:06 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/run_test.pl:
+
+          When there are errors in the log, print out the entire
+          log.  This should make it much easier to understand
+          problems in the nightly build logs.
+
+Sun Feb 25 09:04:43 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/DLL_Test.cpp:
+          Accidentally left the 'd' suffix in the name of the DLL.
+
+Sat Feb 24 22:58:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/msvc_auto_compile.pl:
+        * TAO/TAOACE.dsw:
+        * TAO/TAOACE_Static.dsw:
+        * Static_Performance.dsw:
+
+          Removed references to gperf_lib.dsp
+
+        * TAO/version_tests.dsw: (removed)
+
+          This was still referring to orbsvcs.dsp, which shows that
+          it is way out of date (and not used).  Zapped.
+
+Sat Feb 24 20:59:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * apps/gperf/src/gperf.dsp:
+        * apps/gperf/src/gperf.dsw:
+        * apps/gperf/src/gperf_lib.dsp: (removed)
+
+          Merged gperf into one project.  This will bring the
+          structure in line with the Makefiles.
+
+Sat Feb 24 19:28:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.i:
+
+          Fixed my recent changes to ACE_OS::dlsym () to work on
+          Windows CE.
+
+Sat Feb 24 17:50:38 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/DLL_Test.cpp:
+
+          OBJ_PREFIX was being created by attaching a char string to
+          a ACE_TCHAR string.  Needed to add ACE_TEXT to the first
+          string for compilation on ACE_USES_WCHAR.
+
+        * tests/DLL_Test_Impl.dsp:
+
+          Changed the internal name to "DLL_Test DLL" to make sure
+          this gets compiled in the first pass by msvc_auto_compile.pl.
+
+        * tests/run_test.pl:
+
+          Added a check for LM_WARNINGs in log files.  Let's see if
+          there have been any hidden (DLL_Test actually was producing
+          a warning on Windows, but Carlos's fix already got rid of it,
+          Yay!).
+
+Sat Feb 24 15:44:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/tests.dsw:
+        * tests/DLL_Test_Impl.dsp:
+          Add new project file for the shared library used in the test.
+
+        * tests/DLL_Test.cpp:
+        * tests/DLL_Test_Impl.cpp:
+          Change the Win32 version to load a shared library instead of the
+          exe.
+
+Sat Feb 24 14:07:11 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/Thread_Pool_Reactor_Test.cpp:
+
+          Did a careful study of what this test was doing in regards to
+          sending wide-character strings, and made it consistent.  The
+          most troublesome aspect was the fact that the length is encoded
+          in the shutdown string ("\011shutdown") which meant that I had
+          to send the length in characters, not in bytes.  This should
+          really fix [Bug 537].
+
+Sat Feb 24 14:37:00 2001  Craig Rodrigues <crodrigu@bbn.com>
+
+        * ace/config-g++-common.h
+          gcc 2.97 and higher require the use of the std namespace for
+          iostrams
+
+Sat Feb 24 10:27:04 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Disable the interceptor tests when the ORB is compiled without
+          interceptor support.
+
+        * tests/run_test.lst:
+          Disable the Reactor_Notify_Test on single threaded builds, it
+          uses threads.
+
+        * bin/nightlybuilds/scoreboard_update.pl:
+          Fixed usage message.
+
+Sat Feb 24 09:45:18 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/run_test.lst:
+          Disable the DLL_Test on KCC/Linux builds.  The test runs
+          normally, but crashes on shutdown(), it appears as if the
+          run-time system is invoking the destructors after the library is
+          unloaded.
+
+        * tests/Makefile:
+        * tests/Makefile.DLL_Test:
+        * tests/DLL_Test.h:
+        * tests/DLL_Test.cpp:
+        * tests/DLL_Test_Impl.h:
+        * tests/DLL_Test_Impl.cpp:
+          Cleanup code, and truly separate the shared library code to a
+          completely new separate file.
+
+Sat Feb 24 09:51:45 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Pass the -Config options to each script, this helps the
+          $ACE_ROOT/bin/run_test.pl script that needs to disable some
+          tests in certain configurations.
+
+Sat Feb 24 08:21:48 2001  David L. Levine <levine@cs.wustl.edu>
+
+        * include/makeinclude/platform_vxworks5.x_g++.GNU:
+          added -fno-implicit-templates on Tornado II for Intel 386
+          family targets.  Thanks to Albert Wijnja <Albert.Wijnja@meco.nl>
+          for reporting that static template data members weren't really on
+          VxWorks/386, and to Greg Holtmeyer <greg.holtmeyer@windriver.com>
+          for confirming that -fno-implicit-templates should work with
+          the Tornado II g++.  [Bug 658]
+
+Thu Feb 22 15:59:04 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the
+          function as "localtime".  This is now fixed.  Thanks to Mason
+          Deaver <mason.deaver@tripointglobal.com> for reporting this.
+
+Fri Feb 23 19:44:36 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ACE version 5.1.13 released.
+
+Thu Feb 22 12:28:15 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/TP_Reactor.cpp (handle_events): Here is the description of
+          how things were working and where the problem was: In the
+          TP_Reactor there is one leader thread waiting in select() and
+          the others waiting on the token.  During deactivation(), the
+          <deactivation_> flag is set on the reactor, signal_all_threads()
+          is called on the token, and an empty notification is send to the
+          current leader thread.  signal_all_threads() sets the
+          <signal_all_threads_> flag on the Token when there are waiters
+          on the Token (does nothing if there are no waiters).  This
+          scheme worked fine when there were leader and follower threads
+          waiting.  When a new leader is chosen, it returns the magic
+          number 2 from token.acquire_read() and hence exits gracefully
+          from the handle_events().  However, the problem was that when
+          some (or all) of the TP threads are busy running upcalls,
+          signal_all_threads() was a no-op and the magic number 2 was not
+          returned from token.acquire_read() and hence the exit from
+          handle_events() was flagged as an error.
+
+          The fix is as described below:
+
+          (1) ACE_Token::signal_all_threads() does not make sense.  The
+          token is a mutex, not a condition variable.  Therefore, it does
+          not make sense to have a signal_all_threads() methods.  Plus I
+          believe that the method does not do as advertised.  Therefore, I
+          removed this method from the token class.
+
+          (2) There is no need to signal all the threads in the
+          TP_Reactor.  Marking the Reactor as closed and signaling the
+          leader thread is enough.  The leader thread will wake up to
+          handle the empty event, the next leader will see that the
+          Reactor is closed and exit gracefully.  This will continue until
+          all the waiters are drained.
+
+          (3) With the above change, there is no need to check for an
+          magic returns from token.acquire_read().  When a thread gets the
+          token, it checks the deactivation flag before proceeding.  If
+          the Reactor is closed, it gracefully exits.  Otherwise, it
+          continues as leader.
+
+          (4) Since there is no need to call token.signal_all_threads(),
+          ACE_TP_Reactor::wakeup_all_threads() can be removed since it is
+          now the same as ACE_Select_Reactor_T::wakeup_all_threads().
+
+          Note that this change should help with making
+          Thread_Pool_Reactor_Test run without shutdown errors.
+
+        * ace/Select_Reactor_T.i (deactivate): The setting of the
+          <deactivated_> flag and waking up of all the threads should be
+          atomic.  I am being picky about this one but I think am I right.
+          Also added the guard to the accessor.
+
+Thu Feb 22 08:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.i:
+
+          Bleh.  Changed an && to || to make sure we get a symbolname
+          variable for non-Unicode Win32.
+
+          "He who lives without committing any folly is not so
+          wise as he thinks"  - La Rochefoucauld
+
+Thu Feb 22 08:43:30 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/rules.local.GNU:
+          Add SunWS_cache and ir.out to the list of files removed by
+          the realclean pseudo-target.  This directory is used by Sun/CC
+          5.0 (and Forte), if not removed the information there can become
+          stale, and break the builds.
+          This should fix the Sun/CC 5.0 nightly builds.
+
+Thu Feb 22 07:51:36 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001
+          Krishnakumar B  <kitty@ace.cs.wustl.edu> ".
+
+Thu Feb 22 03:31:06 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
+
+        * ace/OS.i (dlsym):
+          Hopefully fixed the Win32 builds. Removed a extra ! in the
+          #ifdef.
+
+Thu Feb 22 02:58:36 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
+
+        * VERSION:
+        * PROBLEM-REPORT-FORM:
+        * ace/Version.h:
+        Reverted the changes and restored the old versions of
+        these files as the beta build script was killed. Pain :-(
+
+Wed Feb 21 20:10:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.i:
+        * tests/DLL_Test.cpp:
+        * tests/Thread_Pool_Reactor_Test.cpp:
+
+          Fixed the remaining problems with the Win2000_Unicode tests.
+          [Bug 537]
+
+Tue Feb 20 21:19:39 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Svc_Conf.h:
+          Add ACE_Export macro for ace_create_service_type() it is used
+          outside the library now.
+
+Tue Feb 20 06:34:26 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly
+          set ACE_HAS_GNUG_PRE_2_8.  Thanks to Christian von Mueffling
+          <cvm@aiss.de> for reporting this.
+
+        * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in
+          the ACE_TRACE macro.  Thanks to Mike Curtis for reporting this.
+
+Mon Feb 19 16:38:08 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/Asynch_Acceptor.{h,cpp}:
+        Added method void handle (ACE_HANDLE) and made it call the base
+        class's handle(ACE_HANDLE) method to remove warning about
+        partial overloading. Fix suggested by Irfan.
+
+Sun Feb 18 21:55:16 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/OS.h:
+        Added an extern "C" void ace_mutex_lock_cleanup_adapter before
+        the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on
+        SunCC 5.x.
+
+Sun Feb 18 17:16:41 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * netsvcs/clients/Tokens/manual/manual.cpp (main),
+        * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the
+          ACE_HAS_TOKENS_LIBRARY stuff.  Thanks to Kitty for reporting
+          this.
+
+Sun Feb 18 16:28:45 2001  Chris Gill  <cdgill@cs.wustl.edu>
+
+        * ace/RB_Tree.h: Changed order of method declarations to (hopefully)
+          dodge an internal compiler error on VxWorks.
+
+Sun Feb 18 09:59:18 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * netsvcs/clients/Tokens:
+        * netsvcs/servers/main.cpp (main):
+        * netsvcs/servers/svc.conf:
+        * netsvcs/lib/Token_Handler: Only compile this stuff if the
+          ACE_HAS_TOKENS_LIBRARY macro is enabled.  Thanks to Carlos
+          for reporting this.
+
+        * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY
+          so we can skip initializing certain things if that macro is
+          undefined.
+
+        * ace/Token_Collection.*:
+        * ace/Token_Invariants.*:
+        * ace/Token_Manager.*:
+        * ace/Local_Tokens.*:
+        * ace/Remote_Tokens.*:
+        * ace/Token_Request_Reply.*:
+          Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled
+          since this functionality does not appear to be widely used and
+          yet it takes up space.
+
+        * tests/Tokens_Test.cpp (main): Only run this test if
+          ACE_HAS_TOKENS_LIBRARY is defined.
+
+Sat Feb 17 17:23:46 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/SOCK_Dgram_Mcast.cpp:
+
+          Integrated a fix from Keith Nicewarner <knicewar@erg.sri.com>
+          In effect, this reverts the multicast code changed on
+              Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
+          for all platforms except linux.
+
+Sat Feb 17 15:52:09 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/run_all_list.pm:
+        * tests/run_tests.pl:
+          Remove obsolete scripts.
+
+Sat Feb 17 13:26:17 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast
+          -1 to void * since that's the signature of the method.  Thanks
+          to Bala for reporting this.
+
+        * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused
+          result local variable and also changed the logic to bailout if
+          handle_events() returns -1.  This fixes a warning reported by
+          KCC.
+
+Fri Feb 16 17:39:16 2001  Mayur Deshpande  <mayur@ics.uci.edu>
+
+        * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER.
+          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
+
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to
+          CCFLAGS and 'exceptions=1' at end of file.
+          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
+
+Fri Feb 16 05:37:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Logging_Strategy.h: Updated the documentation to explain what
+          the various options mean.
+
+        * tests/Log_Msg_Test.cpp (test_log_msg_features): Added
+          ACE_Log_Msg::PROCESS to a couple of priority_mask() calls to
+          make the test work correctly.  Thanks to Kitty for reporting
+          this.
+
+Thu Feb 15 17:53:31 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * ace/Thread_Manager.i: Simplified casting in
+          ACE_Thread_Descriptor::get_next per suggestion from Carlos.
+
+Thu Feb 15 14:57:59 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next.
+
+Thu Feb 15 11:33:55 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0)
+          to make sure that this test terminates...
+
+        * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to
+          make certain compilers happy.
+
+        * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32.
+
+Thu Feb 15 08:49:44 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+          Rename WashU builds so all the Debian builds appear together.
+
+Thu Feb 15 07:15:39 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple
+          log files, rather than just two.  Thanks to Orlando Ribeiro
+          <oribeiro@inescporto.pt> for this fix.
+
+Thu Feb 15 03:36:46 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * bin/nightlybuilds/builds.lst (WEB):
+        Added a new build with TAO_MINIMUM linked statically.
+
+Wed Feb 14 05:28:59 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(),
+          task(), get_next(), and self().  Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for reporting this.
+
+Tue Feb 13 17:51:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS.
+          Thanks to Mike Curtis for reporting this.
+
+        * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run.
+          Thanks to Mike Curtis for reporting this.
+
+Wed Feb 14 12:08:10 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read.
+          If record was a multiple of BUFSIZ and the record was
+          terminated with an EOF instead of a "term" character,
+          rec_read would return 0 instead of the actual data read in.
+          The problem was that the partial buffer fill size was being
+          checked instead of the total number of bytes read in.  This
+          issue was noticed when trying to read in an IOR file in TAO
+          that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long.
+
+Tue Feb 13 14:44:28 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/ace_wchar.inl: Changed several variable from type <size_t>
+          to type <int> as on 64-bit whistler, size_t and int are not the
+          same size which confuses 64-bit compiler.  (Per Kitty's
+          request.)
+
+Tue Feb 13 10:23:31 2001  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of
+          handle () method and handle_ member to ACE_Handler). Moved the
+          handle_ member to the JAWS_Synch_IO class - it needs it, and
+          JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left
+          the handle () methods in JAWS_IO, but made them pure virtual,
+          implemented in JAWS_Synch_IO (implementation moved from JAWS_IO)
+          and in JAWS_Asynch_IO, where they forward up to ACE_Handler's
+          handle () methods.
+
+Mon Feb 12 18:18:05 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
+
+        * tests/Thread_Mutex_Test.cpp:
+          Modified test to use process mutexes for Win32 platforms
+          so that timed mutexes could be tested.
+
+Sun Feb 11 15:33:39 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/QoS/ACE_QoS_Export.h:
+
+          Added ACE_AS_STATIC_LIBS support.
+
+        * ace/QoS/ACE_QoS.dsp:
+        * ace/QoS/ACE_QoS_Lib.dsp:
+
+          Fixed to comply with ACE standards.
+
+Sun Feb 11 10:50:10 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_g++.GNU (exceptions):
+          Only set the -fno-exceptions option if we're *not* using GCC
+          2.7.2!  Thanks to Pradeep for explaining how to do this.
+
+Sun Feb 11 10:15:08 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * ace/Makefile.bor:
+        * ace/QoS/Makefile.bor:
+        * include/makeinclude/ace_flags.bor:
+          Added build support for QoS library with Borland compiler.
+
+Sat Feb 10 15:29:08 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Message_Block.h:
+          Improved documentation for the lenth(), size() and space()
+          methods.
+
+Sat Feb 10 07:19:37 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * include/makeinclude/outputdir.bor:
+          Removed the now out-of-date comment about pascal/non-pascal
+          build directories.
+
+        * ace/config-win32-borland.h:
+          Added support for new ACE_HAS_VCL define to enable inclusion
+          of VCL header files.
+
+Fri Feb  9 16:47:44 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/Makefile.am:
+          Removed references to the AQoSA files.
+
+Fri Feb  9 16:42:10 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * examples/QOS/client.dsp:
+        * examples/QOS/server.dsp:
+          Updated the corrected project files.
+          Thanks to Darrell for pointing this out.
+
+Thu Feb  8 19:25:03 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * performance-tests/RPC/run_test.pl:
+        * performance-tests/TCP/run_test.pl:
+        * performance-tests/UDP/run_test.pl:
+          Add driver strings
+
+Thu Feb 08 19:18:36 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Removed comment from Exposed Policies test. The test has been fixed.
+
+Thu Feb  8 14:11:36 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ws2tcpip.h:  [Removed]
+
+          I don't see any reason to have this file in ace; it is a system
+          header file.  And from [Bug 722], our version is out of date anyway.
+
+        * ace/OS.h:
+
+          Changed to include system version of ws2tcpip.h
+
+        * ace/Makefile.am:
+        * ace/ace-dll.icc:
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+
+          Removed references to ws2tcpip.h.
+
+        * ace/SOCK_Connect.cpp:
+
+          Changed get_ip_interfaces to remove a memory error.  Thanks to
+          Viatcheslav Batenine <slavikb@infra2000.com> for helping out with
+          this.
+
+        * ace/SOCK_Dgram_Mcast.cpp:
+
+          It looks like the change made on:
+
+          Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
+
+          doesn't work on Win32.  Reverted back to the old scheme for Win32
+          only.
+
+Thu Feb  8 00:34:57 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_g++.GNU: Added support for
+          -fno-exception when exceptions=0 is given to the Makefile.
+          Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting
+          this.
+
+Wed Feb  7 23:02:46 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a
+          new overridden cancel_aio() method.  Thanks to Alexander Libman
+          <Alibman@baltimore.com> for contributing this.
+
+Thu Feb  8 02:09:05 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * examples/QOS/Makefile:
+        * examples/QOS/client.dsp:
+        * examples/QOS/server.dsp:
+          Modified to use the ACE_QoS lib.
+        * Receiver_QoS_Event_Handler.cpp:
+        * Sender_QoS_Event_Handler.cpp:
+          Added missing Log_Msg.h for ACE_DEBUG.
+          Other files were modified to reflect changed directory location
+          of AQosA imclude files.
+
+Thu Feb  8 00:17:43 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/QoS_Decorator.cpp:
+        * ace/QoS_Session_Factory.cpp:
+        * ace/SOCK_Dgram_Mcast_QoS.cpp:
+        * ace/QoS_Decorator.h:
+        * ace/QoS_Session_Factory.h:
+        * ace/SOCK_Dgram_Mcast_QoS.h:
+        * ace/QoS_Manager.cpp:
+        * ace/QoS_Session_Impl.cpp:
+        * ace/SOCK_Dgram_Mcast_QoS.i:
+        * ace/QoS_Manager.h:
+        * ace/QoS_Session_Impl.h:
+        * ace/QoS_Session_Impl.i:
+          Moved the AQoSA classes to ace/QoS directory.
+
+        * ace/Makefile:
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+          Removed the QoS related files, added QoS directory to build.
+
+        * ace/Qos/Makefile
+        * ace/QoS/ACE_QoS.dsw:
+        * ace/QoS/ACE_QoS.dsp:
+        * ace/QoS/ACE_QoS_Lib.dsp:
+        * ace/QoS/ACE_QoS_Export.h:
+          Added Makefile and MSVC project files.
+          Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this
+          change and providing the patch.
+
+Wed Feb  7 11:34:56 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp:
+          Fix build problems for single threaded environments.
+
+Wed Feb  7 09:03:22 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed
+          incorrect if/else branching.  Thanks to Lu Yunhai
+          <luyunhai@huawei.com> for reporting this.
+
+Tue Feb  6 23:43:49 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of
+          %s to be %*s since the string may not be nul terminated!  Thanks
+          to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+
+Tue Feb  6 20:11:28 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+
+        Remove double inclusion of $(CFLAGS) for Sun CC 5.0.
+
+Tue Feb  6 19:30:26 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/Malloc_T.cpp (shared_malloc):
+        Added a #ifdef to remove the warnings from Digital Tru64 cxx. This
+        is a temporary workaround. TODO: Change ACE_SEH_* macros so that such
+        hacks are unnecessary.
+
+Tue Feb  6 19:23:16 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+        Complete reverting the changes made by Irfan on Sat Jan 27
+        01:06:09 2001. This file was missed in the last revert done by me.
+
+Tue Feb 06 19:03:35 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure
+          to add CFLAGS into CCFLAGS, even if no other options are added. Else
+          things get built without -mt.
+
+Tue Feb 06 18:37:41 2001  Steve Huston  <shuston@riverace.com>
+
+        * tests/Thread_Mutex_Test.cpp: Changed wording of the message for
+          "timed acquire" not supported so as not to trip the error catcher
+          in run_tests.pl.
+
+Tue Feb 06 17:55:28 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/post_completions.cpp: Allow this to
+          run with AIOCB_Proactor.
+
+        * ace/Asynch_IO.{h cpp}: Added ACE_Handler::handle (ACE_HANDLE)
+          function to set the handle; changed ACE_HANDLE ACE_Handler::handle
+          to return the actual value.
+
+        * ace/Asynch_Acceptor.cpp (handle_accept): Call ACE_Handler::handle
+          to set the handle value for the new handler before calling its
+          open() method.
+
+Tue Feb 06 17:16:43 2001  Steve Huston  <shuston@riverace.com>
+
+        * tests/MEM_Stream_Test.cpp:
+        * tests/MEM_Stream_Test.h: New file; moved definition of Echo_Handler
+          from MEM_Stream_Test.cpp to this file to make it visible to AIX
+          C++ 3.6.6 at template instantiation time.
+
+Mon Feb  5 16:19:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname").
+          Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+
+        * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN
+          macros to use the form 0x0123 rather than 0123X.  Thanks to
+          Craig Rodrigues <crodrigu@bbn.com> for helping find this
+          problem.
+
+Mon Feb  5 18:20:11 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/config-sunos5.5.h (ACE_USES_OLD_IOSTREAMS):
+
+          Reverted the change to config-sunos5.5.h and turned on
+          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION,
+          ACE_TEMPLLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the
+          SunCC 5.0 compiler.
+
+Mon Feb  5 16:19:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/RMCast/Send_File/Receiver.cpp (init): Replaced
+          a hard-coded file permission of 0644 with
+          ACE_DEFAULT_FILE_PERMS.  Thanks to Chris Kohlhoff
+          <chris@kohlhoff.com> for reporting this.
+
+Mon Feb  5 13:00:17 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * tests/Thread_Mutex_Test.cpp: (reported_notsup)
+          Removed a warning about defined but not used.
+
+Sat Feb  3 14:41:17 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.h:
+        * ace/config-win32-msvc.h:
+
+          Fixed problems with LLSEEK and ACE_stat on Windows CE.
+
+Sat Feb  3 14:12:36 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/Config_Test.cpp:
+        * tests/Config_Test.h:
+        * tests/Log_Msg_Test.cpp:
+
+          Fixed ACE_USES_WCHAR problems.
+
+Fri Feb 02 18:36:42 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-linux-common.h: Added #define ACE_POSIX_AIOCB_PROACTOR
+          unless the user #defines ACE_POSIX_SIG_PROACTOR before including
+          config-linux.h. (At least prior to 2.4 kernels) queueing signals
+          across threads does not work - it fails silently, which breaks
+          basic functionality of the async model - like asynchronously
+          accepting TCP connections - and pretty much prevents multi-threaded
+          work with timers and probably other async operations.
+
+        * examples/Reactor/Proactor/test_proactor.cpp: Disabled the ACE_DEBUG
+          calls that display message buffers - they're often too large and
+          overrun the ACE_Log_Msg buffers and crash the program.
+
+Fri Feb  2 08:38:37 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/WFMO_Reactor.cpp (handler): Set the existing_masks variable to 0
+          to avoid warnings from static analysis tools.  Thanks to Ivan
+          Murphy for reporting this.
+
+Thu Feb 01 22:00:17 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp
+
+          Fixed the bugs which were giving runtime error on
+          Win32 - removed "queue_type" from single_thread_performance_test
+          and performance_test functions. Now these funtions dont
+          have args.
+
+        * tests/tests.dsw
+
+          Just an update of the workspace.
+
+Thu Feb  1 21:00:57 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * bin/auto_compile_win32.pl:
+        * bin/run_all_list.pm:
+
+          Added TAO RT Mutex unit tests to auto build and test
+          lists.
+
+Thu Feb 01 18:52:27 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+        * RTJava:
+          Added Directory for RTJava related research. Check the
+          ChangeLog included in the newly directory for more info.
+
+Thu Feb 01 18:23:17 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
+
+        * tests/Log_Msg_Test.dsp:
+        * tests/Config_Test.dsp:
+
+          Added these files.
+        * tests/tests.dsw:
+
+          Added the above two projects to the workspace.
+
+Thu Feb  1 18:01:26 2001  Luther J Baker  <luther@cs.wustl.edu>
+
+        * ace/OS.i (mutex_init):
+
+          Removed call into PACE.
+
+Thu Feb 01 18:21:15 2001  Steve Huston  <shuston@riverace.com>
+
+        * tests/Thread_Mutex_Test.cpp: Only report "operation not supported"
+          once for a failed ACE_Thread_Mutex::acquire (ACE_Time_Value &).
+          Also, if it reports ENOTSUP while ACE_HAS_MUTEX_TIMEOUT is
+          defined, warns the user that it's probably the wrong setting.
+
+Thu Feb 01 17:36:28 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/test_proactor3.cpp: Fixed a non-constant
+          array dimension and some output formatting.
+
+Thu Feb 01 17:07:35 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/post_completions.cpp: Removed extraneous
+          'd' from the 'count' display.
+
+Thu Feb 01 15:33:26 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Reactor.h (purge_pending_notifications):
+        * ace/WFMO_Reactor.h (purge_pending_notifications):
+        * ace/Select_Reactor_Base.h (purge_pending_notifications):
+          Removed the default argument value - callers must now explicitly
+          specify a 0 ACE_Event_Handler* to remove all handler notifications.
+          Thanks to Edan Ayal <edana@bandwiz.com> for arguing this point.
+
+Thu Feb  1 09:57:41 2001  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ace/SString.i:
+
+          Changed behavior of ACE_WString::rep to be the same
+          as ACE_CString::rep, that is, to return an empty
+          (w)string rather than a null (w)string when the length
+          is 0. Thanks to Johnny Willemsen <johnny.willemsen@meco.nl>
+          for pointing out this discrepancy.
+
+Thu Feb  1 09:42:41 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+          Modification to allow building for Chorus 4.x on x86.  CPU will be
+          set to x86, but CLX_TYPE will be set to i486-elf-sysv4.
+
+Thu Feb 01 10:29:31 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed
+          the arg name to fix "unused argument" warning from g++.
+
+Wed Jan 31 22:01:00 2001  Rick Stille  <stille_r@ociweb.com>
+        * ace/OS.cpp(operator FILETIME): Corrected an error in the Jan 26 GHS
+          revision. The term "ACE_Time_Value::FILETIME_to_timval_skew" had been
+          omitted from the calculation.
+
+Wed Jan 31 18:43:26 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test):
+          Removed the warning about queue_type using ACE_UNUSED_ARG.
+
+Wed Jan 31 17:27:35 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Acceptor.cpp (ACE_Oneshot_Acceptor::handle_input): Unregister
+          the acceptor from the reactor before doing the shared_accept call
+          to guard against the use-case where the acceptor is destroyed during
+          the service handler activation sequence.
+
+Wed Jan 31 15:55:23 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * ace/Synch.i:
+          Added ACE_Null_Mutex::acquire (ACE_Time_Value &tv)
+          to fix link error.
+
+Wed Jan 31 15:12:00 2001  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ace/CDR_Stream.h:
+
+          Made method do_byte_swap() public. If ACE_ENABLE_SWAP_ON_WRITE
+          is defined, TAO_GIOP_Message_Base::format_message() and
+          TAO_GIOP_Message_Lite::format_message() both call this method.
+          Thanks to Paul Rubel <prubel@bbn.com> for reporting this bug.
+
+Wed Jan 31 12:19:51 2001  Steve Huston  <shuston@riverace.com>
+
+        * docs/tutorials/Chap_2/ex03.html, ex04.html: Fixed these example
+          programs to 1) send the Nul terminators with the strings,
+          2) allow enough space on the recv to get it all, 3) return a
+          value from main.
+
+        * docs/tutorials/Chap_2/Chap_2.zip: Updated the above examples.
+
+Wed Jan 31 06:43:27 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Message_Queue_T.cpp: Make sure that dequeue_head() returns
+          the number of items still on the queue.  Thanks to Johnny
+          Willemsen for reporting this.
+
+Tue Jan 30 21:39:15 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
+
+       * tests/Log_Msg_Test.cpp: In funtion test_ostream(), removed the
+          if condition to check if ACE_OS::unlink() succeeds. Also set
+          the ostream to NULL before calling ACE_ERROR_RETURN(). Thanks
+          to Mike Curtis <mccurry@my-deja.com> for pointing out problem
+          caused when ACE_OS::unlink() fails. Thanks to Doug in helping
+          fix the problem.
+
+Tue Jan 30 18:04:08 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test):
+          Zap the Win32 and VxWorks-specific code from this function.
+          Thanks to Sharath for reporting this.
+
+Tue Jan 30 11:34:26 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/test_aiosig_ace.cpp: Fixed a bunch
+          of mis-coded ACE_ERROR_RETURNs; added a explicit queued completion,
+          and disabled the display of buffers that may overrun ACE_Log_Msg's
+          internal buffers to prevent spurious crashes.
+
+Tue Jan 30 11:26:42 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/post_completions.cpp: Added a count
+          to be sure that all expected completions are delivered, and
+          print error message if not.
+
+Tue Jan 30 10:47:52 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Select_Reactor_Base.cpp
+          (ACE_Select_Reactor_Notify::purge_pending_notifications):
+        * ace/WFMO_Reactor.cpp
+          (ACE_WFMO_Reactor_Notify::purge_pending_notifications): Changed
+          to not purge notifications destined for the reactor only
+          (notification buffer with 0 handler value). Thanks to Edan
+          Ayal <edana@bandwiz.com> for this fix.
+
+Tue Jan 30 01:05:51 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test):
+          Add cases for VxWorks and NT.  Thanks to Sharath for reporting
+          this.
+
+        * ace/OS.h: #define _SC_AIO_MAX to 1 if it's not set by default.
+          Thanks to Jean-Francois Daune <Daune@IBA.be> for reporting this
+          fix for VxWorks.
+
+Mon Jan 20 18:36:41 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue_T.h (ACE_Message_Queue_Ex): Use _USE
+          rather than _DECL to define the ACE_Message_Queue - fixes
+          compile error.
+
+Mon Jan 29 17:29:31 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references
+          to Message_Queue_Ex's queue_ member to use . rather than ->
+          and removed the ACE_NEW to allocate it (follow-ups from Doug's
+          Sun Jan 28 08:32:07 2001 change). Fixed other compile
+          errors to allow tests/Message_Queue_Test_Ex.cpp to build.
+          FYI... whomever added this, it probably should have been named
+          Message_Queue_Ex_Test to conform.
+
+Mon Jan 29 15:30:27 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't
+          mask/block all signals, just the one(s) being used for this
+          sig proactor instance. Blocking everything can break other
+          things, such as debuggers and the ability to kill a program.
+          Also, don't setup a handler for the signals being blocked/waited
+          as this is a combination whose behavior is undefined.
+
+Sun Jan 28 08:39:17 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/Thread_Mutex_Test.cpp:
+          Fixed use of ACE_TEXT and string concatenation.
+
+Sun Jan 28 08:03:08 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/tests.dsw:
+        * tests/Message_Queue_Test_Ex.dsp:
+          Add NT project files for the new test
+
+Sun Jan 28 08:32:07 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * netsvcs/lib/Client_Logging_Handler.cpp: Fixed the order in which
+          the iostream messages are logged so that we don't bomb out when
+          the VERBOSE option is enabled.  Thanks to Craig Rodrigues
+          <crodrigu@bbn.com> for helping find this problem.
+
+        * ace/Message_Queue_T.h: Make sure the lock() forwarding method
+          forwards to queue_.lock().
+
+        * ace/Message_Queue_T.{h,i,cpp}: There's no reason to dynamically
+          allocate the implementation of ACE_Message_Queue_Ex -- instead
+          it can be simply an instance of ACE_Message_Queue.
+
+        * ace/Message_Queue_T.h: Make sure that the methods on
+          ACE_Message_Queue_Ex are properly virtual.  Thanks to Kitty for
+          pointing this out.
+
+Sat Jan 27 19:40:36 2001  Ossama Othman  <ossama@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added TAO's Portable Interceptor "Service_Context_Manipulation"
+          test to the list of tests to run.
+
+Sat Jan 27 19:34:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Config_Test.{h,cpp}: Fixed the use of "bool," which is
+          not supported on older compilers.  Thanks to Kitty for reporting
+          this.
+
+Sat Jan 27 15:22:03 2001  Ossama Othman  <ossama@uci.edu>
+
+        * tests/Thread_Mutex_Test.cpp (test):
+
+          Added code that tests mutex timeout functionality.
+
+Sat Jan 27 15:16:33 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/POSIX_Proactor.h: Replace ACE_Thread_Mutex with ACE_SYNCH_MUTEX
+          to avoid the need for conditional compilation.
+
+        * ace/SUN_Proactor.h: Don't use ACE_Condition<ACE_Thread_Mutex>
+          but instead use the ACE_SYNCH_CONDITION, which also avoids the
+          need to conditionally compile for threaded platforms.
+
+Sat Jan 27 13:29:51 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/config-linux.h:
+
+          Declare the pthread_mutex_timedlock() prototype as an
+          'extern "C"' function.  This fixes an "unresolved symbol" link
+          error.
+
+Sat Jan 27 10:39:28 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+          Apparently the blank in 'RedHat 7.0' breaks the scoreboard.
+
+Sat Jan 27 01:06:09 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU: SPRO 5.0
+          compiler should be able to support automatic template
+          instantiation.  Also, standard C++ library should be ok.  -g was
+          added to DCCFLAGS.
+
+        * ace/config-sunos5.5.h: Turned off
+          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION,
+          ACE_TEMPLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the
+          SPRO 5.0 compiler.
+
+          Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com>
+          for contributing the above patches.
+
+Sat Jan 27 00:37:26 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/OS.i:
+
+          - (mutex_lock): Windows code must use relative time since that
+          is what WaitForSingleObject() expects.  Also, fixed extra
+          "return" before ACE_NOTSUP_RETURN.
+
+          - (thread_mutex_lock): Made thread_mutex_lock() with timeout
+          close to the thread_mutex_lock() without timeouts.
+
+Fri Jan 26 21:53:45 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h:
+        * ace/OS.i (thread_mutex_lock):
+
+          Added an overloaded version of this method that accepts a
+          timeout argument.  It delegates to the standard
+          ACE_OS::mutex_lock() method on non-Windows platforms.
+          Otherwise, it returns with an ENOTSUP.
+
+          The addition of this method was necessary to fix a compile
+          problem related to the ACE_Thread_Mutex class.
+
+        * ace/Synch.i (acquire):
+
+          In ACE_Thread_Mutex::acquire() that accepts a timeout argument,
+          call the corresponding ACE_OS::thread_mutex_lock() method.  This
+          fixes compile-time error on MS Windows builds due to the fact
+          that ACE_mutex_t and ACE_thread_mutex_t are different types on
+          that platform.
+
+Fri Jan 26 17:31:26 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.i (mutex_lock):
+
+          Fixed unused argument warnings that occured when compiling for
+          the single threaded case.
+
+Fri Jan 26 16:58:03 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/config-linux.h:
+
+          glibc 2.1.x doesn't have the (very useful) __GLIBC_PREREQ
+          macro.  Use a preprocessor test that doesn't rely on it.
+
+Fri Jan 26 16:48:06 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/config-qnx-neutrino.h (ACE_HAS_MUTEX_TIMEOUTS):
+        * ace/config-qnx-rtp.h (ACE_HAS_MUTEX_TIMEOUTS):
+
+          QNX supports pthread_mutex_timedlock().  Yes!
+
+Fri Jan 26 17:50:38 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/config-win32-common.h:
+          ace/config-vxworks-5.x.h: Added ACE_HAS_MUTEX_TIMEOUTS macro.
+
+        * ace/OS.i: Added timed mutex operations for Win32, VxWorks, and
+          pSoS.
+
+Fri Jan 26 16:31:15 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h (mutex_lock):
+
+          Updated documentation for the version of this method that
+          accepts a timeout value.
+
+        * ace/OS.i (mutex_lock):
+
+          If the platform does not support timed mutexes, then return with
+          an ENOTSUP.
+
+        * ace/Process_Mutex.h:
+        * ace/Process_Mutex.inl (acquire):
+
+          Added version of this method that accepts a timeout value.
+
+Fri Jan 26 17:50:38 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp (report_stats):
+          Fixed some unintentional tabs.  Thanks to Mike Curtis for
+          reporting this!
+
+Fri Jan 26 15:34:01 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h:
+        * ace/OS.i (mutex_timedlock, mutex_lock):
+        * ace/Synch.i (acquire):
+
+          Renamed the ACE_OS::mutex_timedlock() to the overloaded
+          ACE_OS::mutex_lock().
+
+Fri Jan 26 14:13:32 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.h:
+        * ace/OS.i (mutex_timedlock):
+
+          Wrapped the pthread_mutex_timedlock() function.  It times out if
+          a lock hasn't been acquired by the given absolute time.
+
+        * ace/Synch.h:
+        * ace/Synch.i (acquire):
+
+          Added versions of this method that accept an ACE_Time_Value.
+          They are used to prevent blocking definitely while waiting for a
+          given mutex to become available.
+
+        * ace/config-linux.h (ACE_HAS_MUTEX_TIMEOUTS):
+
+          glibc 2.2.x supports the pthread_mutex_timedlock() function.
+
+        * ace/config-linux-common.h:
+
+          Undefine ACE_LACKS_{LLSEEK,LSEEK64}_PROTOTYPE prior to include
+          the KCC configuration file.  Thanks to Jeff Greif
+          <jgreif@befree.com> for reporting this.
+
+        * ace/README:
+
+          Added ACE_HAS_MUTEX_TIMEOUTS to the list of ACE macros.
+
+Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Log_Msg.cpp (dump): Fixed some unintentional tabs.  Thanks
+          to Mike Curtis for reporting this!
+
+        * ace/SOCK_Dgram_Mcast.cpp (open): Modified the call to
+          ACE_SOCK_Dgram::shared_open() to just pass in this->mcast_
+          rather than making a local copy that just contained the port
+          number.  Thanks to Keith Nicewarner <knicewar@erg.sri.com> for
+          reporting this.
+
+        * tests/Makefile.bor (TESTS): Added Message_Queue_Test_Ex.cpp.
+
+Fri Jan 26 13:37:30 2001  Luther J Baker  <luther@cs.wustl.edu>
+
+        * ace/OS.h:
+
+          If using PACE, ACE_stat typedefs to pace_stat_s.
+
+Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * tests/Message_Queue_Test_Ex.cpp: Fixed some ASYS_* macros with
+          ACE_* stuff.  Thanks to Darrell for reporting this.
+
+        * ace/Message_Queue_T.h,
+        * ace/Message_Queue_T.i,
+        * ace/Message_Queue_T.cpp:
+          Added the ACE_Message_Queue_Ex, which provides a message queue
+          abstraction whose type is templatized.  Thanks to Michael Vitalo
+          <mvitalo@sprynet.com> for contributing this.
+
+        * tests/run_tests.lst:
+        * tests/run_test.lst:
+        * tests: Added support for the new Message_Queue_Test_Ex.cpp file.
+          Thanks to Michael Vitalo <mvitalo@sprynet.com> for contributing
+          this.
+
+Fri Jan 26 09:33:20 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Add TAO/tests/Object_Loader to the list
+
+        * include/makeinclude/rules.lib.GNU:
+          Allow both .cpp and .c files in the LSRC macro.  This should
+          let the PACE guys use the real name for their files, and
+          generate proper dependencies.
+
+Fri Jan 26 02:16:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/OS_Test.cpp:
+
+          Changed a use of struct stat to ACE_stat.
+
+Thu Jan 25 19:16:48 2001  Ossama Othman  <ossama@uci.edu>
+
+        * ace/config-linux.h:
+
+          Only define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and
+          ACE_LACKS_THREAD_STACK_SIZE for glibc < 2.1.  glibc 2.1+ has the
+          netdb reentrant functions (albeit with funky signatures), and it
+          has pthread_attr_setstacksize().
+
+        * ace/OS.h:
+
+          Removed trailing whitespace.
+
+        * ace/OS.i (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r,
+          gethostbyname_r, getservbyname_r):
+
+          Added glibc-specific calls to these functions.  This allows us
+          to avoid grabbing a lock! Thanks to Ben Strong
+          <bstrong@bluelark.com> for providing the patch.
+
+        * THANKS:
+
+          Added Ben Strong to list of contributors.
+
+Thu Jan 25 20:10:24 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * include/makeinclude/platform_irix6.x_sgic++.GNU:
+        * include/makeinclude/platform_irix5.3_sgic++.GNU:
+
+          Removed -rpath "$(ACE_ROOT)/ace" from LDFLAGS.
+
+        * ace/Message_Queue_T.{h,i}: Moved code from .i to .h to work
+          around a compiler bug.  The Sun Forte 6 (CC 5.1) compiler is
+          only happy if this is in the header file.
+
+        * ace/Message_Block_T.cpp: Fixed template parameter name mismatch
+          between declaration and definition.
+
+          Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com>
+          for contributing the above patches.
+
+Thu Jan 25 10:50:35 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Reactor.h: Add comments to schedule_wakeup/cancel_wakeup that
+          they don't cause an immediate re-examination of the masks like
+          register_handler does. Thanks to Oscar Rodriquez
+          <Oscar.Rodriquez@eln.ericsson.se> for prompting this clarification.
+
+        * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor_Notify::handle_signal):
+          The call to ACE_Message_Queue::dequeue_head may change the
+          ACE_Time_Value passed to it, so don't override ACE_Time_Value::zero's
+          const-ness, lest ACE_Time_Value::zero take on some strange new value.
+          Thanks to Edan Ayal <edana@bandwiz.com> for this fix.
+
+Thu Jan 25 05:34:58 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Connector.cpp (connector): Added an ACE_const_cast() to
+          get rid of the const for the accessor method!
+
+        * ace/Acceptor.cpp (acceptor): Added an ACE_const_cast() to
+          get rid of the const for the accessor method!
+
+        * ace/Log_Msg.{h,cpp},
+        * ace/Trace.{h,cpp}: The Log_Msg -I flag now uses the current
+          ACE_Trace nesting level rather than always using 1.  Thanks to
+          Mike Curtis for providing this.
+
+Wed Jan 24 19:43:24 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/OS.i (lstat,stat): Separated win32 cases out.
+
+Wed Jan 24 18:15:59 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/OS.i (fstat): Oops, wrong version of this function was
+          modified.
+
+Wed Jan 24 14:44:12 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/FILE.cpp:
+        * ace/Filecache.cpp:
+        * ace/Filecache.h:
+        * ace/OS.h:
+        * ace/OS.i:
+        * ace/OS.cpp: Changed the signature of <stat>, <fstat>, and
+          <lstat> to use ACE_stat instead of "struct stat".  Also changed
+          to use _fstat and _stat on win32 instead of <fstat> and <stat>
+          directly.  Also replaced several use of "struct stat" to
+          ACE_stat.  Thanks to Mike Anderson <manderson@sonusnet.com> for
+          reporting this.  [Bug 762]
+
+Wed Jan 24 16:13:10 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/OS_Dirent.cpp: Fixed a bug in the readdir_emulation() method.
+          Thanks to Yung Trinh <ytrinh@email.com> for reporting this.
+
+        * ace/Connector.{h,cpp}: Added a new connector() accessor to
+          return the underlying ACE_PEER_CONNECTOR.  Thanks to Pedro
+          Brandao <pbrandao@inescn.pt> for suggesting this.
+
+Wed Jan 24 10:17:03 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Makefile:
+          Add dependencies (again). They were lost is a previous commit.
+
+        * */Makefile:
+          Update dependencies (yet another time).
+
+Wed Jan 24 09:41:54 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Configuration.cpp:
+          Fixed warning under gcc.  Also made the for() loop more
+          ACE-like, not better, but at least consistent.
+
+Wed Jan 24 08:56:16 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.h:
+          The changed to document the ACE_SVC_* macros were accidentally
+          lost, fixed.
+
+        * ace/Service_Config.cpp:
+          New debug message when processing an explicit directive, useful
+          to find out when and why TAO invokes
+          ACE_Service_Config::process_directive() directly.
+          As with all other debug messages in this file it only shows up
+          if ACE::debug() returns non-zero.
+
+Wed Jan 24 01:44:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Configuration.cpp (expand_path): Fixed a bug with assignment to
+          temp in the loop.  Thanks to Jonathan Reis for reporting this!
+
+Tue Jan 23 17:02:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/msvc_auto_compile.pl:
+
+          Removed PACE until we figure out how to handle it in the
+          DLL builds.
+
+Tue Jan 23 16:50:35 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/Dirent_Test.dsp:
+
+          Updated to make consistent with the rest of the dsps in
+          this directory in regards to output directories and non-use
+          of ACE_ROOT.
+
+        * tests/Dirent_Test.cpp:
+
+          Updated wide character compatibility and removed the use
+          of ACE_ROOT (now looks at ../tests", which should give
+          the same results).
+
+        * tests/run_test.lst:
+
+          Added the Dirent_Test to the list
+
+        * tests/version_tests/Dirent_Test.dsp: (added)
+        * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (added)
+        * tests/version_tests/version_tests.dsw:
+
+          Used the create_vt_dsps.pl script to update this directory.
+
+Tue Jan 23 18:03:26 2001  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ace/CDR_Stream.cpp:
+
+          Added patches to read_8 and write_8 sent in by
+          Keith Nicewarner <knicewar@erg.sri.com> to deal
+          with the ARM byte format for doubles
+
+Tue Jan 23 15:06:18 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Configuration.cpp:
+        * ace/OS_Dirent.cpp:
+
+          Updated wide character compatibility.
+
+        * ace/ace_dll.dsp:
+
+          Removed unneeded verbose library option.
+
+Tue Jan 23 10:54:14 2001  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ace/config-doxygen.h:
+        * bin/autoconf_compile:
+
+          Removed all occurrences of 'smart_proxies' and 'interface_repo'.
+          These are no longer necessary.
+
+        * include/makeinclude/ace_flags.bor:
+
+          Added necessary variables to go along with the Borland
+          makefiles for the new libraries tao/Domain and
+          tao/IFR_Client.
+
+Mon Jan 22 17:01:17 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS_String.cpp:
+        * ace/OS_String.inl:
+        * ace/ace_wchar.inl:
+        * ace/config-qnx-rtp.h:
+
+          ACE_HAS_WCHAR fixes.  Support is really bad on QNX RTP
+          so we just end up emulating most everything.  As far as
+          I could tell, there isn't even a way to convert between
+          the two types of strings.
+
+        * ace/OS_Dirent.cpp:
+
+          Rewrote a paragraph to remove the use of "/*" in a larger
+          /*...*/ comment, since gcc complains about it.
+
+        * tests/Message_Queue_Test.cpp:
+
+          Backed out some changes to it on Jan 21, since it had
+          problems and I couldn't find any ChangeLog entry for the
+          changes (mistakenly checked in?).
+
+Mon Jan 22 13:51:11 2001  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/OS_Dirent.cpp (opendir_emulation): Added code to make the
+          emmulation work properly on Win32.  Thanks to Edwin Wrench
+          <edwin.wrench@itt.com> for finding this.
+
+        * tests/Dirent_Test.cpp:
+          tests/Makefile:
+          tests/run_tests.bat:
+          tests/run_tests.lst: Added test to verify correctness of above
+          fix. This test attempts to scan $ACE_ROOT/tests and will fail if
+          the number of entries is 0 or 1.
+
+Mon Jan 22 10:21:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Map_Manager.h: Clarify that find() returns 0, rather than
+          saying "a non-negative number".  Thanks to Albert Wijna
+          <albert.wijnja@meco.nl> for clarifying this.
+
+Mon Jan 22 15:38:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * ace/Containers_T.h:
+          ace/Containers_T.cpp:
+          Added operator* to the ACE_Ordered_Multiset_Iterator class
+
+        * tests/Ordmultiset_test.cpp
+          Expanded test for the new operator* of the ACE_Ordered_Multiset_
+          Iterator class
+
+Sat Jan 20 14:53:07 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Configuration.{h,cpp}: Fixed some problems with const char *
+          that was busting the compilation.  Thanks to Carlos for pointing
+          this out.
+
+        * ace/Configuration.{h,cpp}: Added several fixes for
+          mistakes with memory management and other minor problems.
+          Thanks to Jonathan Reis <reis@stentorsoft.com> for contributing
+          these fixes!
+
+Sat Jan 20 10:49:05 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * docs/ACE-guidelines.html:
+          Update the guidelines to point people to the Doxygen
+          documentation, instead of the now abandoned OSE tools.
+
+Sat Jan 20 10:21:08 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.cpp:
+          Another pass fixing problems with ACE_BEGINTHREADEX() under
+          Win32, this time Win32 is working fine.
+
+Sat Jan 20 10:20:50 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * doc/tutorials: Integrated the new Service Configurator tutorial
+          into the main tutorials page.
+
+Fri Jan 19 16:57:43 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Svc_Handler.h: Updated the comments to explain why
+          operator new is overloaded.  Thanks to Kirill Kuolechov
+          <Kirill.Koulechov@gmx.net> for reporting this.
+
+Fri Jan 19 15:39:43 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.cpp:
+          QNX/RTP has the same problem that LynxOS has, after fork() is
+          invoked trying to destroy the preallocated objects in
+          ACE_OS_Object_Manager fails.
+          Factor out this variation in a new macro:
+          ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK
+
+        * ace/config-lynxos.h:
+        * ace/config-qnx-rtp.h:
+          Define the new macro for the two relevant platforms.
+
+        * ace/README:
+          Document the macro.
+
+Fri Jan 19 15:08:37 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.cpp:
+          I disabled too much in the commit at 10:50am... Now it seems to
+          be OK.
+
+        * ace/Makefile:
+          Remove extra -v
+
+Fri Jan 19 13:16:49 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * include/makeinclude/platform_hpux_aCC.GNU:
+          Added new options to the CCFLAGS so that the known future errors
+          arising because of HPUX are suppressed.
+
+Fri Jan 19 13:01:13 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/SSL/Makefile:
+          Put a check for defining ACE_SHLIBS to get it compiled on HPUX.
+
+        * ace/RMCast/Makefile:
+        * ace/Makefile :
+          Updated dependencies
+
+        * ace/config-all.h
+          Fix a build problem on HP-UX 11.00 with aCC A.03.25.  The macro
+          used to determine the use of the std namespace changed from
+          RWSTD_NO_NAMESPACE to _NAMESPACE_STD.  NOTE: I did preserve the
+          check for RWSTD_NO_NAMESPACE with aCC versions less than A.03.25.
+
+          Thanks to Chad Elliott  <elliott_c@ociweb.com> for making this fix.
+
+Fri Jan 19 11:22:42 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * docs/tutorials/022/client_handler.cpp :
+        * docs/tutorials/022/client_hander.h :
+        * docs/tutorials/022/Acceptor_Service.cpp :
+        * docs/tutorials/022/Acceptor_Service.h :
+        * docs/tutorials/022/server.cpp :
+        * docs/tutorials/022/Makefile :
+
+        * docs/tutorials/022/client/Makefile:
+        * docs/tutorials/022/client/client.cpp:
+
+        * docs/tutorials/022/page01.html:
+        * docs/tutorials/022/page02.html:
+        * docs/tutorials/022/page03.html:
+        * docs/tutorials/022/page04.html:
+        * docs/tutorials/022/page05.html:
+
+          Developed a new tutorial for the ACE_Service_Configurator.
+          Based on the ACE tutorial 005.
+
+Fri Jan 19 10:50:11 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.cpp:
+          Use the Green Hills specific tricks *only* if we are compiling
+          under Green Hills, and only for the platform where they make
+          sense (in this case Win32).
+
+Thu Jan 18 23:21:53 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.h:
+          Document the infamous ACE_STATIC_SVC macros.
+
+Thu Jan 18 23:50:35 2001  Rick Stille  <stille_r@ociweb.com>
+
+        The Green Hills(GHS) Native x86 compiler does not provide support
+        for 64-bit integers, structural exceptions, or DLL's. Thus the
+        keywords __int64, __try, __dllimport, etc., are not defined. In
+        addition, exceptions do not work in a multi-threaded environment.
+        The following changes were made to address these shortcomings.
+
+        * ace/Basic_Types.h: Because the GHS compiler has both
+          ACE_LACKS_LONGLONG_T and ACE_WIN32 defined, the
+          ACE_LACKS_LONGLONG_T macro must appear first, so the order of
+          these two macros has been reversed in the defines of both
+          ACE_UINT64_LITERAL(n) and ACE_UINT64_DBLCAST_ADAPTER(n).
+
+        * ace/config-win32-common.h: The typedef of ACE_UINT64 as an
+          unsigned __int64 and the define of ACE_HAS_LLSEEK are blocked
+          out for ghs.
+
+        * ace/config-win32-ghs.h: This is the new configuration file for
+          Green Hills/Win32.
+
+        * ace/Configuration.cpp(resolve_key): The "return 0" at the end of
+          this function has been blocked out for ghs to eliminate an
+          "unreachable code" warning.
+
+        * ace/Event_Handler_T.h(handle_signal): The type of the "signum"
+          parameter has been changed to "int" so that it matches the type
+          in the Event_Handler class.
+
+        * ace/Event_Handler_T.i(handle_signal): The type of the "signum"
+          parameter has been changed to "int" so that it matches the type
+          in the Event_Handler class.
+
+        * ace/High_Res_Timer.cpp(global_scale_factor): The Native x86
+          compiler defines "QuadPart" in the LARGE_INTEGER union as a
+          "double," so it cannot be used in the calculation of
+          "global_scale_factor." Instead, for GHS, the low and high parts
+          of the LARGE_INTEGER structure are copied into an ACE_UINT64
+          structure (which is actually an ACE_U_LongLong) and the
+          ACE_U_LongLong operators are used. The code segment if
+          (ACE_High_Res_Timer::global_scale_factor_ == 1u) // Failed to
+          retrieve CPU speed from system, so calculate it.
+          ACE_High_Res_Timer::calibrate (); is unreachable hen ACE_WIN32
+          is defined, so it has been blocked out for Win32 platforms to
+          silence the Green Hills "unreachable code" warning.
+
+        * ace/High_Res_Timer.i(hrtime_to_tv): There is no assignment
+          operator that converts an ACE_U_LongLong to a "long," so an
+          intermediate ACE_U_LongLong variable "usec64" has been
+          introduced. The type of "msec" and "usec" have been changed from
+          "long" to ACE_UINT32, as have been the casts. The conversion is
+          then carried out by using the lower part of "usec64."
+
+        * ace/Local_Name_Space_T.cpp(remap): The "DWORD" cast has been
+          removed from both EXCEPTION_CONTINUE_SEARCH and
+          EXCEPTION_CONTINUE_EXECUTION beause the function return value is
+          of type "int" and the cast was causing an "integer conversion
+          resulted in a change of sign" warning.
+
+        * ace/Memory_Pool.cpp(map): Removed references to the "mem_offset"
+          variable because it was not being used and the compiler was
+          issuing a warning to this effect.
+
+        * ace/NT_Service.cpp(startup): This function was returning "-1"
+          when svc_sc_handle() failed, and returning a "0" when
+          QueryServiceConfig() failed. Since the return type of this
+          function is "DWORD," the compiler was issuing an "integer
+          conversion resulted in a change of sign" warning for the "-1"
+          value. Upon investigation of this issue, it was discovered that
+          "0" is a valid service type value, and thus the use of "0" to
+          indicate failure is a bug. The return value for svc_sc_handle()
+          failure has been changed to "MAXDWORD - 1," which is the DWORD
+          equivalent of "-2," and the return value for failure of
+          QueryServiceConfig() has been changed to "MAXDWORD," which is
+          the DWORD equivalent of -1.
+
+        * ace/OS.cpp: The compiler cannot handle a 64-bit literal, so the
+          literal passed to FILETIME_to_timval_skew has been created as
+          ACE_U_LongLong(0xd53e8000, 0x19db1de).
+
+        * ace/OS.cpp(set): The Native x86 compiler defines "QuadPart" in
+          the LARGE_INTEGER union as a "double," so it cannot be used in
+          the calculations of tv_sec and tv_usec.  Instead, the low and
+          high parts of the LARGE_INTEGER structure are copied into an
+          ACE_U_LongLong structure, and the ACE_U_LongLong operators are
+          used.
+
+        * ace/OS.cpp(operator FILETIME): The Native x86 compiler defines
+          "QuadPart" in the LARGE_INTEGER union as a "double," so it
+          cannot be used in the calculation of file_time. Instead, tv_sec
+          and tv_usec are converted iinto ACE_U_LongLong structures and
+          the ACE_U_LongLong operators are used.
+
+        * ace/OS.cpp(uname): The Native x86 compiler names both the union
+          and the structure within the SYSTEM_INFO structure, so the
+          "wProcessorArchitecture" member within the "s" structure, which
+          is itself within the "u" union, must be accessed by using
+          ".u.s."
+
+        * ace/OS.cpp(ACE_BEGINTHREADEX): Green Hills compiler gets
+          confused when __stdcall is imbedded in parameter list, so the
+          type ACE_WIN32THRFUNC_T has been defined, then used within the
+          parameter list of ::_beginthreadex().
+
+        * ace/OS.h(ACE_Time_Value): The Native x86 compiler defines
+          "DWORDLONG" as type "double," so FILETIME_to_timval_skew is
+          instead defined as type ACE_U_LongLong.
+
+        * ace/OS.h: The pragmas "#pragma warning( disable : ... " are
+          unknown to the Native x86 compiler, so it produces warnings to
+          this effect. These pragma have been blocked out for ghs.
+
+        * ace/OS.h: Because the Native x86 compiler does not support the
+          __int64 keyword, the typedef of ACE_hrtime_t has been changed
+          from "unsigned __int64" to "ACE_UINT64" for ghs. Because no
+          usage of "ACE_QWORD" could be foound, its definition has been
+          blocked out for ghs.
+
+        * ace/OS.i(gettimeofday):The code at the end of this function is
+          not reachable if either ACE_HAS_WINCE or ACE_WIN32 is
+          defined. In order to quiet the Green Hills compiler warnings
+          about unreachable code, this code has been blocked out for
+          ACE_HAS_WINCE and ACE_WIN32. With this code blocked out,
+          however, the variables "tv" and "result" are not used, and the
+          compiler warns about about variables defined, but never used. In
+          order to quiet these warnings, the definitions of these two
+          variables have been blocked out for ACE_HAS_WINCE and ACE_WIN32.
+
+        * ace/OS.i(gethrtime): The ACE_gethrtime() function is not meant
+          to be used by a Win32 platform, but because both "ghs" and
+          "ACE_HAS_PENTIUM" are defined for the Native x86 platform, a
+          call to ACE_gethrtime() was included in the code.  This problem
+          has been solved by adding "&& !defined(ACE_WIN32)" to the two
+          "... defined (ghs) && defined (ACE_HAS_PENTIUM)" statements
+          which block out references to ACE_gethrtime().
+
+          The Native x86 compiler defines "QuadPart" in the LARGE_INTEGER
+          union as a "double," so it cannot be used as the return
+          value. Instead, because the return type is "ACE_hrtime_t," which
+          is type "ACE_UINT64," the low and high parts of the
+          LARGE_INTEGER structure are copied into an ACE_UINT64, which is
+          then returned.
+
+        * ace/Process_Manager.cpp(wait): The "result >= WAIT_OBJECT_0"
+          test within the ACE_ASSERT statement causes the Native x86
+          compiler to produce a �pointless comparison of unsigned
+          integer with zero� warning because "result" is of type
+          "DWORD," which is defined by the Native x86 compiler as type
+          "unsigned int."  This test has been blocked out for ghs.
+
+        * ace/Profile_Timer.cpp(elapsed_time): Because the "__int64"
+          keyword is not defined by the Native x86 compiler, it cannot be
+          used to cast the value of "delta_t" in the calculation of
+          "real_time." But "delta_t" is of type "ACE_hrtime_t," and
+          ACE_hrtime_t is typedefed as ACE_U_LongLong, so the division
+          operator defined for in the ACE_U_LongLong class can be used
+          directly with a divisor of type "double." Thus the "__int64"
+          cast has been removed for ghs.
+
+        * ace/Sock_Connect.cpp(get_reg_value): This function is used
+          within the function get_ip_interfaces() function only when
+          either ACE_HAS_WINSOCK2 is not defined or when ACE_HAS_WINSOCK2
+          is defined as "0." Because ACE_HAS_WINSOCK2 is defined on the
+          Native x86 platform, the compiler was issuing a �defined, but
+          never used� warning. This warning has been eliminated by
+          blocking out the definition of get_reg_value() when
+          ACE_HAS_WINSOCK2 is defined as a value other than "0."
+
+        * ace/Stats.cpp(accumulate): The comparison "rhs.samples_count ()
+          == 0" was producing a warning because rhs.samples_count()
+          returns an ACE_UINT32, but is being compared to the signed
+          literal "0." The "0" has been changed to "0u."
+
+        * ace/WFMO_Reactor.cpp(ok_to_wait): The comparison of the "switch"
+          statement parameter "result" to "DWORD" values in the case
+          statements elicited an "integer conversion resulted in a change
+          of sign" warning from the compiler, so the type of "result" has
+          been changed to "DWORD."
+
+        * ace/WFMO_Reactor.cpp(dispatch): The comparison of the "switch"
+          statement parameter "wait_status" to "DWORD" values in the case
+          statements elicited an "integer conversion resulted in a change
+          of sign" warning from the compiler, so the type of "wait_status"
+          has been cast to "DWORD."
+
+        * ace/WFMO_Reactor.cpp(dispatch_handles): The "wait_status >=
+          WAIT_OBJECT_0" comparison was producing a �pointless
+          comparison of unsigned integer with zero� warning because
+          "wait_status" is an unsigned integer. This was a known problem
+          with Borland, so the blocking out of this comparison has been
+          extende to ghs.
+
+        * tests/Basic_Types_Test.cpp(main): Because both the
+          ACE_LACKS_LONGLONG_T and ACE_WIN32 macros are defined, the
+          ACE_LACKS_LONGLONG_T macro must appear first, so the order of
+          these two macros has been reversed.
+
+        * tests/Cached_Accept_Conn_Test.cpp: The template class
+          ACE_Node<ACE_HANDLE> must be explicitly instantiated for this
+          platform.
+
+        * tests/Cached_Conn_Test.cpp: The template class
+          ACE_Node<ACE_HANDLE> must be explicitly instantiated for this
+          platform.
+
+        * tests/Handle_Set_Test.cpp: The template class
+          ACE_Node<ACE_HANDLE> must be explicitly instantiated for this
+          platform. This was already being done for the _CRAYMPP, so it
+          has been extended to ghs.
+
+        * tests/Malloc_Test.cpp: Because the Native x86 compiler does not
+          support structural exceptions, it cannot support the "remap"
+          function, so the blocking of the ACE_TEST_REMAP_ON_FAULT macro
+          definition, which was already in effect for linux, has been
+          extended to ghs.
+
+Thu Jan 18 12:49:53 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/SUN_Proactor.cpp: Added support for cancel_aiocb().  Thanks
+          to Alexander Libman <Alibman@baltimore.com> for contributing
+          this.
+
+        * tests/Makefile.bor (TESTS): Added Config_Test so that this test
+          runs on Borland.
+
+        * tests: Moved the config_test stuff (which tests ACE_Configuration*
+          classes) from the examples/Configuration/ directory to the
+          tests/ directory and made it a one-button test.
+
+        * ace/Future.h: Changed the order of the thread mutex and the condition
+          variable to avoid confusion in the future regarding "order of
+          initialization."  Thanks to Edan Ayal <edan@bandwiz.com> for
+          reporting this.
+
+        * examples/Configuration: Updated this example to include the new
+          test for the ACE_Configuration_Heap methods.  Thanks to Michael
+          Searles <msearles@base16.com> for contributing this.
+
+Thu Jan 18 18:55:37 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/nightlybuilds/builds.lst:
+          Add the RedHat_Implicit_Templates build.
+
+Thu Jan 18 18:48:33 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Log_Msg.cpp:
+          Declare sys_nerr as const int under QNX/RTP (and NTO).
+
+        * ace/Pipe.cpp:
+          Use pipe() under QNX because it lacks both socketpair() and it
+          cannot open a socket to itself.
+
+        * ace/config-qnx-rtp.h:
+          Remove ACE_NTRACE hacks.
+
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
+          Do not enable the repo by default it breaks QNX.
+          Instead of removing the definition of DCFLAGS by default we
+          set debug=0 all the time, that seems like a cleaner way to
+          disable debugging.
+
+Thu Jan 18 09:34:35 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_linux.GNU:
+          The -fno-implicit-templates flag was hardcoded, but this gave
+          the users no recourse to remove should they want to use
+          -fimplicit-templates.
+          The macro IMPLICIT_TEMPLATES_FLAG is used to set the flag now,
+          unless the user provides a value for the macro the makefiles
+          continue to work as they did before this change, i.e., adding
+          -fno-implicit-templates to CCFLAGS.
+          Notice that this functionality was available in
+          platform_linux_lxpthreads.GNU, but dissapeared when everything
+          was rolled into platform_linux.GNU.
+
+Thu Jan 18 06:26:42 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Configuration.{h,cpp}: Added functionality to read in all
+          values in a config file without requiring a type prefix on each
+          value, skips whitespace and allows comments on the end of lines.
+          Thanks to Michael Searles <msearles@base16.com> for contributing
+          this.
+
+Wed Jan 17 11:48:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/msvc_auto_compile.pl:
+
+          Added PACE to the list of ACE directories so PACE is
+          compiled in full auto builds.
+
+Wed Jan 17 10:00:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Handle_Ops.cpp: (handle_timed_open)
+
+          Removed the use of ACE_NONBLOCK on Win32.  This use
+          didn't function as expected, since ACE_NONBLOCK would
+          be interpreted as O_WRONLY.  Also, the CreateFile API
+          call doesn't support any nonblocking option, so
+          redefining ACE_NONBLOCK would not seem to fix anything.
+
+          Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting
+          a problem report form about this.
+
+        * bin/PerlACE/Process_Unix.pm:
+
+          Fixed up the use of the RUNNING state, so wait and kill
+          work properly.  Also made Kill automatically use waitpid
+          (since I can't think of any time we'd kill without wanting to
+          clean up the resources).
+
+Wed Jan 17 07:44:29 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to
+          EWOULDBLOCK if n < len so that the caller will initiate a
+          handle_output()-driven reply.  Thanks to Klaus H. Wolf
+          <hw@cyland.com> for reporting this.
+
+        * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message
+          is stored in TSS.  Thanks to Pierre Oberson
+          <oberson@nagra-kudelski.ch> for pointing out the need for this
+          clarification.
+
+        * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by
+          adding ACE_Log_Msg::PROCESS so that the messages do not print
+          out (which is the correct behavior for this test).  Thanks to
+          Mike Curtis <mccurry@my-deja.com> for reporting this.
+        * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to
+          EWOULDBLOCK if n < len so that the caller will initiate a
+          handle_output()-driven reply.  Thanks to Klaus H. Wolf
+          <hw@cyland.com> for reporting this.
+
+        * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message
+          is stored in TSS.  Thanks to Pierre Oberson
+          <oberson@nagra-kudelski.ch> for pointing out the need for this
+          clarification.
+
+        * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by
+          adding ACE_Log_Msg::PROCESS so that the messages do not print
+          out (which is the correct behavior for this test).  Thanks to
+          Mike Curtis <mccurry@my-deja.com> for reporting this.
+
+Tue Jan 16 15:28:22 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+          The formal parameter names must match in the .h and .cpp file
+          to make Sun/CC 6.0 happy.
+
+Tue Jan 16 11:25:32 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Log_Msg.cpp (log): Convert strerror() text string to a
+          TCHAR so that this call will work correctly with Unicode.
+          Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting
+          this.
+
+Tue Jan 16 09:58:20 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ace_wchar.inl:
+
+          Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to
+          preserve null pointers.
+
+          Thanks to Matthias Wittig <m.wittig@com-on.de> for
+          reporting this and suggesting a fix.
+
+Tue Jan 16 10:47:33 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * ace/config-win32-common.h:
+        * ace/config-win32-msvc.h:
+          Moved #define ACE_HAS_LLSEEK from config-win32-common.h to
+          config-win32-msvc.h, since _lseeki64 isn't defined for
+          Borland.  Also implicitly removed ACE_HAS_LLSEEK for the
+          VisualAge compiler - it might have worked (didn't know,
+          couldn't test)
+
+Mon Jan 15 15:22:42 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read()
+          method's "bytes_to_read" parameter to "num_bytes_to_read" to
+          workaround a weird problem with some compilers.  Thanks to Chris
+          Kohlhoff <chris@kohlhoff.com> for this fix.
+
+        * examples/Service_Configurator/IPC-tests/README: Updated this
+          file so that it's now up-to-date and also explains how to
+          reconfigure a server if SIGHUP isn't supported.  Thanks to Mike
+          Curtis <mccurry@my-deja.com> for reporting this.
+
+Mon Jan 15 12:13:48 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/nightlybuilds/builds.lst: [Added]
+        * bin/nightlybuilds/scoreboard_update.pl: [Added]
+
+          Moved the scoreboard stuff from the internal cvs repos
+          to this one, so it is easier for people to edit the
+          list.
+
+Mon Jan 15 12:29:53 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME
+          is spelled correctly.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for reporting this.
+
+        * ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions
+          with ACE_OS::strcpy() functions.  Thanks to Ron Hashimshony
+          <Ron@bandwiz.com> for reporting this.
+
+Mon Jan 15 09:44:16 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/RMCast/Makefile:
+          Fixed Makefile to link the ACE library, otherwise we get
+          undefined symbols under certain platforms (AIX).  Thanks to
+          Scott Bolin <scott.bolin@pgs.com> for pointing this out.
+
+Mon Jan 15 09:11:12 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/config-win32-common.h: Added support for ACE_HAS_LLSEEK, though
+          this should probably be changed to be compiled only on some
+          Win32 platforms.
+
+        * ace/OS.{h,i}: Added support for ACE_OS::llseek() on Win32.  Thanks
+          to Nick Lin <nicklin@vantech.com.tw> for contributing this.
+
+        * ace/Log_Priority.h: Clarified the fact that we only use 12 bits
+          for ACE_Log_Priority.  Thus, the remaining bits are available
+          for application use.  Thanks to David Singer
+          <David_P_Singer@res.raytheon.com> for motivating this comment.
+
+Sun Jan 14 16:53:11 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Configuration.{h,cpp}: Fixed a memory leak that occurred
+          with transient heaps.  Also added a list of current limitations
+          to import/export routine.  Thanks to Chris Hafey
+          <chafey@stentor.com> for contributing this stuff.
+
+Fri Jan 12 20:46:05 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
+          Platform macros needed to run ACE on QNX RTP.
+
+        * ace/config-qnx-rtp.h:
+          Configuration file needed to run ACE on QNX RTP.
+
+        * ACE-INSTALL.html:
+          Added documentation on how to install ACE on QNX RTP,
+          and the issue with the current version of QNX RTP.
+
+
+Fri Jan 12 14:59:15 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+          Fixed conversion from 64-bit ulong to 32-bit ulong under some
+          VxWorks compilers where 64 bits are emulated.  Thanks to Edwin
+          McKay <mckayea@betalasermike.com> for pointing this out.
+
+Fri Jan 12 07:18:16 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/OS.{h,i}: Moved some "using std::*" definitions from OS.i to
+          OS.h.  Thanks to Mike Curtis <mccurry@my-deja.com> for reporting
+          this and to Christopher Kohlhoff <chris@kohlhoff.com> for
+          suggesting the fix.
+
+Fri Jan 12 15:34:28 2001  Steve Huston  <shuston@riverace.com>
+
+        * ace/Managed_Object.h: Added <TYPE> to the unimplemented operator=
+          declaration. Fixes compile w/ IBM C/C++ 3.6 on AIX.
+
+Fri Jan 12 07:59:19 2001  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * Makefile:
+          Add the PACE directory back into the build. PACE should
+          not generate any build failures for the platforms
+          currently supported.
+
+Wed Jan 10 23:30:21 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/FILE_Addr.cpp (set): Replace (sizeof this->filename_)
+          with (sizeof this->filename_ / sizeof (ACE_TCHAR)).  Thanks to
+          Matthias Wittig <m.wittig@com-on.de> for reporting this.
+
+Tue Jan  9 07:27:19 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Containers_T.h: Clarified that the ACE_Ordered_Multiset class
+          allows duplicates.  Thanks to Albert Wijna
+          <albert.wijnja@meco.nl> for clarifying this.
+
+Sat Jan  6 10:20:55 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/File_Lock.{h,inl}: Made the get_handle() method const.
+          Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for
+          reporting this.
+
+        * ace/TP_Reactor.h:
+        * ace/Get_Opt.h:
+        * ace/Caching_Utility_T.h: Added "ACE_UNIMPLEMENTED_FUNC" macros
+          for all copy constructors and assignment operators.  Thanks to
+          Johnny Willemsen <johnny.willemsen@meco.nl> for reporting this.
+
+Fri Jan  5 01:09:28 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * performance-tests/Misc/context_switch_time.cpp (get_options),
+        * performance-tests/Misc/preempt.cpp (open),
+        * examples/Reactor/Misc/pingpong.cpp (run_svc),
+        * examples/Reactor/Misc/notification.cpp (main),
+        * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp (main),
+        * examples/Shared_Malloc/Options.cpp (print_usage_and_die),
+        * examples/Service_Configurator/IPC-tests/client/: Updated all
+          these programs so that don't abort via %a, but instead call
+          ACE_OS::exit().  Thanks to Mike Curtis <mccurry@my-deja.com> for
+          suggesting this.
+
+        * apps/Gateway/Peer/Options.cpp (print_usage_and_die): Make sure to
+          actually *die* when we're done with this function!  Thanks to
+          Mike Curtis <mccurry@my-deja.com> for suggesting this.
+
+Thu Jan  4 00:10:26 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Select_Reactor_T.i: The cancel_timer() method should return the
+          number of events canceled, rather than 0 or 1.  Thanks to Joe
+          Guan <jguan@mistwireless.com> for reporting this and providing
+          the fix.
+
+        * ace/Synch.h: Added an acquire (ACE_Time_Value &) method to ACE_Null_Mutex
+          so that this will work properly when
+          ACE_HAS_OPTIMIZED_MESSAGE_QUEUE is enabled.  Thanks to Yuriy
+          Zaporozhets <zaz@internet-zahav.net> for reporting this.
+
+Wed Jan  3 23:00:52 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Lib_Find.cpp (ldfind),
+        * ace/Makefile.bor (CFLAGS),
+        * include/makeinclude/outputdir.bor (OBJDIR),
+        * ace/config-win32-msvc.h: Added support for the new ACE_LD_DECORATOR_STR
+          macro which is used to work around the fact that Borland
+          attaches a so-called "decorator suffix" to all library names.
+          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting
+          this.
+
+        * ace/Lib_Find.h: Fixed a typo where ACE_LIB_FIND_H was misspelled.
+          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting
+          this.
+
+        * ace/SOCK_Stream.i,
+          ace/MEM_Stream.i: Updated the calls to ACE_OS::shutdown() to use
+          the new macros described below!
+
+        * ace/OS.h: Added better support for the ACE_OS::shutdown() second
+          parmeter in the form of new macros ACE_SHUTDOWN_READ,
+          ACE_SHUTDOWN_WRITE, and ACE_SHUTDOWN_BOTH.  Thanks to Mike
+          Curtis <mccurry@my-deja.com> for suggesting this.
+
+        * ace/SOCK_Stream.h: Clarified the role of the timeout parameters in
+          the various methods.  Thanks to Allen Broadman
+          <broadmana@plural.com> for motivating this.
+
+Thu Jan 11 17:24:30 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * Makefile:
+          Add new target 'Core' to quickly compile the basic ACE+TAO
+          components.
+
+Thu Jan 11 09:56:43 2001  Frank  <fhunleth@cs.wustl.edu>
+
+        * ACE version 5.1.12 released.
+
+Thu Jan 11 05:38:24 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/TP_Reactor.cpp: Reverted the change that was made for SPRO
+          5.1 compilers. The change that was reverted is this
+
+          Thu Jan  4 17:14:33 2001  Balachandran Natarajan
+          <bala@cs.wustl.edu>
+
+        * ace/Handle_Set.cpp: Changed the macro
+
+          ACE_DIV_BY_WORDSIZE(x) ((x) >> (ACE_Handle_Set::WORDSIZE)) to
+
+          ACE_DIV_BY_WORDSIZE(x) ((x) >> ((int)
+          ACE_Handle_Set::WORDSIZE)). This seems to be a better
+          fix. Thanks to David Allen <dallen@storm.com> for suggesting
+          this.
+
+Tue Jan  9 09:53:53 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/MEM_Stream_Test.cpp:
+          Run the event loop for at most 1 minute.  After that we know
+          that something is amiss with the client threads, and we should
+          exit.  This fixes the deadlock problems we were seeing in the
+          nightly builds.
+          The real cause of the problem is something broken with the way
+          MEM_Addr objects compare local addresses, sometimes they fail to
+          compare equal.  In the test this results in failed connections.
+
+Mon Jan  8 18:53:39 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
+
+        * examples/Map_Manager/test_hash_map_manager.cpp:
+          Removed template instantiations for
+          ACE_Guard<ACE_SYNCH_RW_MUTEX>,
+          ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>, and
+          ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> to fix linker
+          errors under Lynx_I386.
+
+Mon Jan  8 10:44:57 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.h:
+
+          Added some more protection (!VXWORKS) around the cuserid
+          inline statement since VXWORKS doesn't have cuserid.
+
+Mon Jan 08 10:04:55 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/Thread_Manager.cpp (terminate): Reordered some statements so
+          we get the thread descriptor's log_msg pointer before we delete
+          the thread descriptor.  Thanks to Tomer Amiaz
+          <Tomer@bandwiz.com> for reporting this.
+
+Sun Jan  7 16:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ace_dll.dsp:
+
+          Removed the PACE libraries from linking.  We are going to come
+          up with a different solution for pace.
+
+        * docs/run_test.txt:
+
+          Changed the instructions a little to use PerlACE::LocalFile
+          for the server's IOR file.
+
+Sun Jan  7 08:59:09 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement.
+        * tests/run_test.lst: Disabled MEM_Stream_Test in Linux.
+
+Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/TP_Reactor.cpp (dispatch_i): Eliminate a portion of the
+          code from SunCC5 builds. This piece of code was trying to set
+          things right when it sees all the masks clear and the <size_>
+          greater than zero. This seems to be creating problems with SunCC
+          5 builds alone. Commenting out this piece for SunCC5 helps. This
+          should also be a work around for the bug #750 in bugzilla.
+
+Thu Jan 04 17:07:48 2001  Luther Baker  <luther@cs.wustl.edu>
+
+        * ace/ace_dll.dsp
+
+          Consistent typography (win32 specific backslash).
+
+Thu Jan  4 15:34:14 2001  Luther J Baker  <luther@cs.wustl.edu>
+
+        * ace/ace_dll.dsp
+
+          Added PACE library to the ACE DLL project file.
+          (also changed the library search path)
+
+Wed Jan  3 17:24:11 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.h:
+
+          Mistakenly changed the ace_timezone () method to use
+          timezone () instead of timezone.  Changed back.
+
+Wed Jan  3 16:00:22 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ACE.cpp
+
+          Changed the types of day_of_week_name and month_name in
+          ACE::timestamp to ACE_TCHAR (since that was the data
+          being assigned to it and the type that is later expected).
+          This fixed errors in Win32's Unicode build.
+
+Wed Jan  3 15:44:31 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.i:
+
+          Removed ACE_TIMEZONE since we found another workaround for
+          platforms that define timezone () as a macro.
+
+        * ace/OS.h:
+        * ace/OS.i:
+
+          Moved much of the code from ACE_OS::timezone and
+          ACE_OS::difftime into ace_timezone and ace_difftime.  Since
+          some platforms don't have timezone or difftime, we needed
+          to do something here so those methods aren't used.  Instead
+          of figuring out what larger #if !... should be, it is easier
+          (and less error prone) to just move the code here.
+
+Wed Jan  3 13:10:39 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * apps/JAWS/server/HTTP_Helpers.cpp:
+
+          Added ACE_MT around an ACE_Guard to remove an unused var
+          warning in the single threaded builds.
+
+Wed Jan  3 12:56:13 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Timer_Wheel_T.cpp:
+        * ace/Timer_Wheel_T.h:
+
+          Doug noticed some redundant code in expire while making his
+          change on the 21st.  I checked and he was right, it looks like
+          I was moving around the loop termination conditionals and left
+          some around.  Removed them and also added some better comments
+          and made it more doxygen complient.
+
+Wed Jan  3 12:06:20 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/Refcounted_Auto_Ptr_Test.dsw:
+
+          Projects are listed in tests.dsw, so this is unneeded.
+
+        * tests/tests.dsw:
+
+          Added Refcounted_Auto_Ptr_Test.dsp.
+
+Tue Jan  3 10:30:42 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * docs/msvc_notes.txt:
+
+          Added this file explaining some issues or explanations on how
+          ACE/TAO are set up for use with MSVC.  Mainly I'm thinking of
+          this as a place to put random stuff about ACE and TAO on MSVC.
+
+          Plus I think we need more nifty doxygen documents. ;-)  A tip of
+          the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and
+          Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up
+          questions that led to the dump of info to this file.
+
+        * ACE-INSTALL.html:
+
+          Added a reference to msvc_notes.txt.
+
+Wed Jan  3 09:15:24 2001  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ace/ACE.cpp:
+
+          Replaced these lines
+
+            SYSTEMTIME local;
+            ::GetLocalTime (&local);
+
+          in the timestamp() method.
+          They were removed the last time this file was
+          modified, breaking the Win32 builds.
+
+Wed Jan 03 05:49:11 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.h:
+          The ace_cuserid() helper cannot be defined in Win32
+
+Wed Jan 03 05:42:20 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.h:
+          Remove broken #include of unistd.h, it was a debug statement
+          that sneaked through the commit.
+
+Tue Jan  2 18:33:03 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.h:
+        * ace/OS.i:
+          Workaround platforms that define timezone, difftime or cuserid
+          as macros.  Instead of just dropping support for the ACE_OS::XXX
+          method we create an inline ace_XXX() function, that uses the
+          original macro expansion, then we #undef the offending macro,
+          and use the inline function in the code.
+
+        * ace/config-tru64.h:
+          Enable cuserid() again, with the new workaround it should work
+          without problems.
+          This fix should remove some of the redness in the TRU64_CXX
+          builds.
+
+Tue Jan  2 14:22:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_run_tests.lst:
+          Add the DII version of Param_Test to the nightly builds.
+
+Tue Jan  2 10:25:30 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/Cached_Connect_Strategy_T.cpp: Added the patch provided by
+          Edan Ayal <edan@bandwiz.com> for
+          ACE_Bounded_Cached_Connect_Strategy::find_or_create_svc_handler_i ().
+
+Tue Jan  2 09:03:18 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Asynch_Acceptor.{h,cpp},
+          ace/POSIX_Async_IO.{h,cpp},
+          ace/POSIX_Proactor.{h,cpp},
+          ace/SUN_Proactor.{h,cpp}: Added enhanced versions of ACE_POSIX_Proactor
+          and ACE_SUN_Proactor to fix various problems uncovered and fixed by
+          Alexander Libman <Alibman@baltimore.com>.
+
+        * ace/ACE.{h,cpp}: Fixed the timestamp() method so that it works
+          identically on Win32 and on UNIX.  Also provided a new option
+          that'll make it possible to return a pointer to the beginning of
+          the time portion of "date and time."  Thanks to Michael Searles
+          <msearles@base16.com> for contributing these fixes.
+
+Mon Jan 01 16:35:00 2000  Michael Kircher  <Micahel.Kircher@mchp.siemens.de>
+
+        * tests/Reader_Writer_Test.cpp: Added a #ifdef to check for native
+          RW lock support. If the platform supports native RW locks we should
+          not report a failure on upgrading, because native RW locks do not
+          support upgrading, only our RW lock emulation does this.
+          Thanks to Frank and Doug for pointing out this failure.
+
+Sun Dec 31 14:12:08 2000  Ossama Othman  <ossama@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added TAO's "ForwardRequest" PortableInterceptor test to the
+          list of tests to run.
+
+Sun Dec 31 13:59:02 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * tests/Refcounted_Auto_Ptr_Test.cpp: on DIGITAL_UNIX
+          only, added a call to ACE_OS::exit () at the end of
+          the test so that it will terminate.  [Bug 758]
+
+Sun Dec 31 10:28:43 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * include/makeinclude/platform_osf1_4.0.GNU (LIBS):
+          wrapped /usr/lib/cmplrs/cxx/libcxxstd.a with
+          $(wildcard), so that is ignored on systems on which
+          it doesn't exist, such as Tru64 5.1.
+
+Sun Dec 31 09:23:09 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * include/makeinclude/platform_tru64_cxx.GNU: added
+          support for Tru64 5.1 (DIGITAL_UNIX 0x510).
+
+        * ace/config-tru64.h: added ACE_LACKS_CUSERID with
+          DIGITAL_UNIX >= 0x510, because cuserid () is a macro
+          in Tru64 5.1.
+
+        Thanks to Carlos for tracking down this source of compilation
+        failure.
+
+Sat Dec 30 16:21:49 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/Hash_Map_Manager_T.h:
+        * ace/Map_T.i: Fixed errors in g++ that were introduced while
+          applying the patches.
+
+Sat Dec 30 15:10:00 2000  Chris Gill  <cdgill@cs.wustl.edu>
+
+        * ace/RB_Tree.{cpp, h, i}:
+          tests/RB_Tree_Test.cpp: Fixed a bug in RB_delete_fixup that
+          occurs when the pointer to be fixed up is zero - solution is to
+          pass in a pointer to its parent, and maintain the parent pointer
+          and fixup pointer in tandem during the fixup function.  Also
+          added a few functions to test the red-black invariant(s) at each
+          node of the tree, and added an invariant test call after each
+          bind and unbind in a new stress test in RB_Tree_Test.cpp.
+
+          Thanks to Klaus H. Wolf <hw@cyland.com> for pointing out the
+          problem and for contributing the stress test (which in a
+          slightly modified form is now part of the RB_Tree_Test.cpp code)
+          that reproduced the problem.
+
+Sat Dec 30 11:12:08 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/Hash_Map_Manager_T.h:
+        * ace/Map_T.i:
+        * ace/Message_Block_T.cpp: Added patches provided by J. Russell
+          Noseworthy <rnosewor@objectsciences.com> for SPRO 5.1. The patch
+          to config-sunos-5.5.h has not been applied as it breaks builds
+          on SunCC 5.0.
+
+Fri Dec 29 17:08:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/auto_compile:
+
+          Added a -sendreport option to enable the sending of email at all.
+          Now by default it will not.
+
+Fri Dec 29 16:53:22 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp (main),
+        * performance-tests/TTCP/C/new-ttcp.cpp (main),
+        * tests/Conn_Test.cpp: Incorrect use of %r, which caused
+          problems...  Thanks to Mike Curtis <mccurry@my-deja.com> for
+          pointing this out.
+
+Fri Dec 29 14:21:01 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/MEM_SAP.cpp: Fixed incorrect ACE_RCSID identifier.  Thanks
+          to Jerry Odenwelder <jerryo@atl.fundtech.com> for noticing this.
+
+Thu Dec 28 16:02:51 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/sandbox.cpp:
+          This program executes a child process (and its children), in a
+          new session and process group.  If the process tree does not
+          finish before a given timeout (the first argument) the whole
+          tree is terminated.
+          The program is useful for test scripts and programs,
+          occasionally they hang the whole auto build.
+
+        * bin/auto_compile:
+          Add new options '-sandbox' and '-sandbox_timeout' to support the
+          sandbox program.
+
+Thu Dec 28 16:10:59 2000  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * performance-tests/UDP/udp_test.cpp:
+        * performance-tests/Server_Concurrency/Latency_Stats.h:
+        * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+        * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
+          Fixed compile problems under VxWorks when handling
+          64 bit integers.  Basically, truncated the 64 bit integers
+          to 32 bit integers for operations not supported by
+          ACE_U_LongLong.
+
+Wed Dec 27 15:32:43 2000  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+        * examples/Reactor/WFMO_Reactor/test_network_events.cpp:
+          Added missing ;
+
+Wed Dec 27 11:11:02 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/Map_Manager/test_hash_map_manager.cpp:
+        * examples/Misc/test_trace.cpp:
+        * performance-tests/Misc/test_singleton.h:
+        * performance-tests/Misc/test_singleton.cpp:
+          Fixed problems in single threaded builds, basically I use the
+          ACE_SYNCH_* macros instead of using the class directly.
+
+Tue Dec 26 18:53:06 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * performance-tests/Server_Concurrency/Makefile:
+          The tests make no sense if threads are disabled, so they are not
+          compiled under that configuration.
+
+Tue Dec 26 18:31:08 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/Naming/test_open.cpp:
+          Fixed compilation problems under Sun/CC 4.2, the Log_Msg.h file
+          was not #included
+
+Tue Dec 26 14:45:50 2000  Ossama Othman  <ossama@uci.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added TAO's "Dynamic" and "IORInterceptor" PortableInterceptor
+          tests to the list of tests to run.
+
+Tue Dec 26 11:49:49 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * examples/IPC_SAP/SPIPE_SAP/server.cpp: Fixed a statement not
+          reachable warning on KCC.
+
+Sat Dec 23 18:11:02 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/SString.cpp: Enhanced the implementation so that it works
+          correctly when binary data (i.e., data that may contain NUL
+          characters) is stored in a string.  Thanks to Michael Lindner
+          <mikel@att.net> for reporting this.
+
+Fri Dec 22 15:18:49 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/ace-dll.icc: Added Basic_Stats.{h cpp} to build clean.
+
+Fri Dec 22 14:00:41 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-all.h: On HP-UX 11, when figuring ACE_bad_alloc exception
+          class, account for older compilers that don't define __HP_aCC.
+
+Fri Dec 22 12:56:06 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/ACE.cpp (process_active): Call CloseHandle before return to
+          avoid handle leaks on Win32.  Thanks to Arnaud Compan
+          <compan@ipanematech.com> for the fix.
+
+Fri Dec 22 13:04:58 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * bin/run_all_list.pm: Added the bidirectional test to the list.
+
+Fri Dec 22 12:43:54 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/OS.h: Fixed a typo.
+
+Fri Dec 22 09:12:37 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS.h: ACE_DEFAULT_FILE_PERMS - added FILE_SHARE_DELETE to the
+          bits if building on Win NT4 or greater. Thanks to Nanbor Wang
+          for calling attention to this.
+
+Fri Dec 22 08:06:10 2000  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+        * tests/Refcounted_Auto_Ptr_Test.cpp: Fixed the problem with an
+          undefined ACE_Auto_Basic_Ptr<Scheduler> by adding an explicit
+          template instantiation.  Thanks to Frank A. Hunleth
+          <fhunleth@cs.wustl.edu> for reporting this.
+
+Thu Dec 21 18:12:38 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/ace-dll.icc, ace-lib.icc: Added OS_Errno.(cpp h) to the files
+          list. Thanks to Jerry Odenwelder for pointing out the need for these.
+
+Thu Dec 21 16:45:28 2000  Steve Huston  <shuston@riverace.com>
+
+        * tests/Capabilities_Test.cpp: Added missing \n to a ACE_ERROR
+          statement, and added ACE_DEFAULT_FILE_PERMS to the ACE_OS::open
+          call to create the test file. It used to be 0600, but that was
+          removed to satisfy Win32 which now pays attention to that arg.
+
+Thu Dec 21 05:50:51 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Timer_Wheel_T.cpp (expire): Fixed a mistake where
+          next_earliest_time should have been next_earliest.  Thanks to
+          Keith Brown <kalbrown@ix.netcom.com> for reporting this.
+
+        * examples/IPC_SAP/SOCK_SAP/Makefile.bor: Reenable CPP-inserver-fancy.cpp
+          now that it compiles!  Thanks to Johnny Willemsen
+          <johnny.willemsen@meco.nl> for confirming this.
+
+        * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp (handle_events): Added
+          casts for (SOCKET) when using FD_SET to work around problems
+          with Borland.  Thanks to Johnny Willemsen
+          <johnny.willemsen@meco.nl> for reporting this.
+
+        * ace/Message_Block.h (ACE_Dynamic_Message_Strategy): Fixed a bunch
+          of non-const accessor methods to be const.  Thanks to Johnny
+          Willemsen <johnny.willemsen@meco.nl> for reporting this.
+
+        * examples/Naming/Makefile (BIN2): Added the test_open.cpp file
+          to the Makefile.  Thanks to Johnny Willemsen
+          <johnny.willemsen@meco.nl> for reporting this.
+
+        * docs/tutorials/016/page02.html: Clarify that signal() or
+          broadcast() don't release the mutex.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for pointing this out.
+
+Wed Dec 20 19:44:16 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/Reactor/WFMO_Reactor/test_abandoned.cpp,
+        * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp,
+        * examples/Reactor/WFMO_Reactor/test_network_events.cpp,
+        * examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp,
+        * examples/Reactor/WFMO_Reactor/test_registration.cpp,
+        * examples/Reactor/WFMO_Reactor/test_registry_changes.cpp,
+        * examples/Reactor/WFMO_Reactor/test_talker.cpp,
+        * examples/Reactor/WFMO_Reactor/test_window_messages.cpp:
+
+        * ace/Sock_Connect.cpp: The ACE 5.1.11 implementation of
+          ACE_Sock_Connect::get_ip_interfaces() fails when run on Windows
+          2000 when ACE_HAS_WINSOCK2 = 0.  This is because
+          get_ip_interfaces() checks the registry for the available
+          interfaces and fails when it encounters a new entry in windows
+          2000 named "Device\NDisWanIP".  The patch is to ignore invalid
+          devices and continue checking.  Thanks to Chris Hafey
+          <chris@stentorsoft.com> for contributing this fix.
+
+Wed Dec 20 15:57:32 2000  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/RMCast/RMCast_IO_UDP.cpp
+        * ace/RMCast?RMCast_IO_UDP.h
+        * ace/RMCast/RMCast_IO_UDP.i : cleaned up tabs and trailing ws from
+          last submission...
+
+Wed Dec 20 16:18:49 2000  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/simple_test_proactor.cpp: Removed unused
+          'initial_read_size' variable from file scope.
+
+        * examples/Reactor/Proactor/test_aiosig_ace.cpp (setup_signal_handler):
+        * examples/Reactor/Proactor/post_completions.cpp:
+        * examples/Reactor/Proactor/test_end_event_loop.cpp:
+        * examples/Reactor/Proactor/test_cancel.cpp (Receiver::open):
+          Fixed unused variable warnings for gcc.
+
+Wed Dec 20 15:42:36 2000  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/RMCast/RMCast_IO_UDP.cpp
+        * ace/RMCast?RMCast_IO_UDP.h
+        * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2
+          for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal
+          error at the end of handle_input().  Replacing a couple of lines of
+          code with the private, inline method allocate_and_bind_proxy() gets
+          around the problem.
+
+Wed Dec 20 15:32:44 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/Threads/wfmo.cpp: Move the function calls etc. out of
+          the ACE_ASSERT() macros.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for pointing this out.
+
+Tue Dec 19 15:08:40 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Logging_Strategy.cpp: If ACE_LACKS_IOSTREAM_TOTALLY we'll
+          use a "regular" file.  Thanks to Sangwoo Jin for contributing
+          this fix.
+
+        * ace/Mem_Map.cpp (map_it): In using ACE_Mem_Map, if the
+          ACE_Mam_Map::map's <offset> parameter is set to non-zero and the
+          <len> parameter is set to -1 then the right value to map should
+          be <mapped file size> - offset.  Thanks to Sangwoo Jin for
+          reporting this and suggesting the fix!
+
+        * ace/INET_Addr.{h,i}: Make operator < const.  Thanks to
+          Michael Lindner <mikel@att.net> for reporting this.
+
+Tue Dec 19 18:39:27 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+        * ace/WFMO_Reactor.cpp (simple_dispatch_handler):
+
+          When ACE_HAS_PACE on NT, ACE must use pace_siginfo_t instead
+          of creating and using its own. The ACE version of siginfo_t
+          happens to use constructors and so, the code that uses
+          this ACE siginfor_t instantiates the struct via a constructor.
+          When ACE_HAS_PACE, the pace_siginfo_t cannot be instantiated
+          via constructor.
+
+          My edit just chooses the correct method of instantiation
+          based on ACE_HAS_PACE.
+
+Tue Dec 19 18:21:52 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+        * ace/Thread.h (ACE_Thread):
+
+          Removed the default value on the overriden join (...)
+          function that took three parameters.
+
+Tue Dec 19 14:50:38 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS.h: If on ACE_WIN32, set ACE_DEFAULT_FILE_PERMS to
+          (FILE_SHARE_READ | FILE_SHARE_WRITE), not 0666.
+
+Tue Dec 19 14:40:26 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/Filecache.cpp: Changed definition of R_MASK and W_MASK to
+          0 for ACE_WIN32; used to be for __BORLANDC__. This is related
+          to the change below because the third arg to ACE_OS::open is
+          not ignored any longer for Win32.
+
+        * tests/Capabilities_Test.cpp: On ACE_OS::open, don't supply a
+          <perms> arg - let it default. The file gets deleted at the end of
+          the test and has nothing to be protected. Related to the below
+          change as well.
+
+        * tests/Mem_Map_Test.cpp: Changed all the 0666 args to ACE_OS::open
+          to ACE_DEFAULT_FILE_PERMS.
+
+Tue Dec 19 11:02:41 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS.{h cpp} (open(char), open(wchar)): Changed the <perms>
+          argument to be used in the CreateFile call on Win32. Made the
+          default value of the argument match the old behavior (defaults
+          to FILE_SHARE_READ | FILE_SHARE_WRITE (and FILE_SHARE_DELETE on
+          NT4 and Win2K)). Thanks to Edan Ayal <edana@bandwiz.com> for this
+          suggestion!
+
+Mon Dec 18 20:47:40 2000  Ossama Othman  <ossama@uci.edu>
+
+        * ace/POSIX_Asynch_IO.h:
+
+          Reverted previous change.  It introduced compile-time errors.
+
+Mon Dec 18 19:07:31 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/Asynch_IO.h, ace/POSIX_Asynch_IO.h: Clarified/corrected some
+          comments regarding the write() operation getting its data from
+          the message block's rd_ptr.
+
+Mon Dec 18 11:44:11 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * tests/MEM_Stream_Test.cpp (connect_client): Fixed an unused
+          argument warning on KCC compiler.
+
+Mon Dec 18 11:00:14 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * tests/MEM_Stream_Test.cpp: Fixed problems when threads are not
+          supported and when explicit template instantiation is required.
+
+Sun Dec 17 20:11:08 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * tests/MEM_Stream_Test.cpp:
+        * tests/MEM_Stream_Test.dsp:
+        * tests/Makefile:
+        * tests/Makefile.am:
+        * tests/Makefile.bor:
+        * tests/run_test.lst:
+        * tests/run_tests.bat:
+        * tests/run_tests.lst:
+        * tests/run_tests.psosim:
+        * tests/tests.dsw:
+        * tests/version_tests/MEM_Stream_Test.dsp:
+        * tests/version_tests/version_tests.dsw: Added a new
+          MEM_Stream_Test.
+
+Sun Dec 17 19:32:58 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/Malloc_T.cpp (shared_malloc): After a win32 structural
+          exception occurs, we need to re-execution the expression that
+          causes the exception.  Thanks to Roger Beck
+          <roger_beck@royalsun.com.au> for reporting this.
+
+        * ace/MEM_IO.i (fetch_recv_buf, recv): Differentiate the
+          cases of end of message and errors.
+
+        * ace/Malloc_T.h:
+        * ace/Malloc_T.i: Added a base_addr method to return the base
+          address of the ACE_Malloc so we don't have to depend on MMAP's
+          base_addr method.
+
+        * ace/MEM_SAP.i (set_buf_len,get_buf_len): Changed to computer
+          buffer location using the base_addr method in ACE_Malloc as the
+          one in Memory_Pool only indicates the fixed based addr.
+
+        * ace/MEM_Acceptor.i:
+        * ace/MEM_Acceptor.h: Added a method to set the prefix of MMAP
+          filename.
+
+        * ace/MEM_Acceptor.cpp (ACE_MEM_Acceptor):
+        * ace/MEM_Connector.cpp (ACE_MEM_Connector): Changed to MMAP
+          Options to allow MMAP files to be mapped at any address.
+
+Sun Dec 17 18:42:13 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Refcounted_Auto_Ptr.h: Need to add "ace/Auto_Ptr.h" here to
+          get the definition of ACE_Basic_Auto_Ptr.
+
+        * tests: Added the Refcounted_Auto_Ptr_Test.cpp, which tests
+          the new ACE_Refcounted_Auto_Ptr class.  Thanks to Johnny Tucker
+          <JTucker@infoglide.com> for contributing this.
+
+        * tests/Refcounted_Auto_Ptr_Test.dsp,
+          tests/Refcounted_Auto_Ptr_Test.dsw
+          tests/Refcounted_Auto_Ptr_Test.icc: Added the projects to
+          compile the Refcounted_Auto_Ptr_Test.cpp.
+
+        * tests/Makefile,
+        * tests/run_test.lst,
+        * tests/run_tests.lst: Added the Refcounted_Auto_Ptr_Test.
+
+Sun Dec 17 11:00:47 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * ace/Date_Time.i (update): Fixed a typo.
+
+Sun Dec 17 08:52:04 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * etc/tao_smartproxies.doxygen:
+          This file was left out from a previous commit.
+
+Sat Dec 16 09:36:56 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Date_Time: Added a new method update() to reset the current
+          date/time and also added a new constructor that calls update()
+          to initialize an ACE_Date_Time implicitly, rather than having to
+          pass all the values into the constructor.  Thanks to Jerry
+          Odenwelder <jerryo@atl.fundtech.com> for contributing this.
+
+Fri Dec 15 15:27:02 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+        * bin/make_pretty.pl:
+          The DU/CXX compiler has three levels, 'Error', 'Warning' and
+          'Info:', the latter was being ignored.
+
+Fri Dec 15 14:36:33 2000  Christopher Kohlhoff <chris@kohlhoff.com>
+
+        * include/makeinclude/clean.bor:
+        * include/makeinclude/recurse.bor:
+
+          Added new 'realclean' target to Borland makefiles for
+          removing all generated files (both intermediate and final).
+          Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for
+          suggesting this.
+
+Fri Dec 15 14:32:06 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Log_Msg.h (ACE_Log_Msg): Changed the documentation
+          to reflect the fact that the %a option causes the program to
+          abort() rather than exit().  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for pointing this out.
+
+Fri Dec 15 14:29:44 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/generate_doxygen.pl:
+          Generate documentation for the new TAO_SmartProxies library.
+
+Fri Dec 15 10:22:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/auto_run_tests.pl:
+
+          Included PerlACE::Run_Test instead of ACEUtils and
+          ConfigList.
+
+Fri Dec 15 09:22:05 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/Connection/non_blocking/Makefile:
+          Fixed dependencies between the binaries and the library
+          generated in this directory, otherwise parallel builds can
+          fail.
+
+Thu Dec 14 10:36:45 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/auto_run_tests.lst:
+        * tests/run_test.lst:
+
+          Converted to the new PerlACE::ConfigList style of .lst
+          files (can now say stuff like "Test: MSVC !Borland")
+
+        * bin/auto_run_tests.pl:
+        * bin/auto_compile:
+        * tests/run_test.pl:
+
+          Changed to use PerlACE::ConfigList.
+
+          [Bug 729]
+
+        * bin/ACEutils.pm:
+
+          Made sure it would eat the -Config option so it will not
+          be a problem if old run_test.pl's don't get updated
+          immediately.
+
+        * bin/msvc_auto_compile.pl:
+
+          Added -d flag for debugging (just prints out what would be
+          compiled)
+
+        * bin/fuzz.pl:
+
+          Added a rudimentary run_test.pl out-of-date test.
+
+Thu Dec 14 10:20:49 2000  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_lynxos.GNU
+          Allow users to set the debug option without using
+          'override debug='.  debug=0 now works properly.
+
+Thu Dec 14 06:00:12 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace: Removed makefile-light since it's no longer needed.
+          Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for
+          reporting this.
+
+Wed Dec 13 18:33:19 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * html/README:
+          Add README file explaining why the directory is empty and why
+          the index.html URLs don't work unless you download or generate
+          the Doxygen files.
+
+        * html/index.html:
+          Add entry for the smart proxies library.
+
+Wed Dec 13 18:27:29 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * THANKS:
+          Add 'Pedro Ferreira' to the hall of fame.
+
+Thu Dec 13 18:18:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/PerlACE/ConfigList.pm: (added)
+        * bin/PerlACE/Process.pm: (added)
+        * bin/PerlACE/Process_Unix.pm: (added)
+        * bin/PerlACE/Process_Win32.pm: (added)
+        * bin/PerlACE/Run_Test.pm: (added)
+
+          These are a couple of Perl modules that will be used
+          to simplify current run_test.pl's and the auto_builds
+          and to allow us to run tests on Win32 for configurations
+          that output executables into subdirs (Win32 Release,
+          Win32 Static *, Borland).  The conversion of scripts over
+          to the new style will occur in separate checkins.
+
+          ConfigList provides a more powerful *.lst format for
+          specifying test lists.  Process is a newer version of
+          the old bin/Process.pm that has a different interface
+          and a couple of extra methods for common tasks for
+          our scripts.  And Run_Test.pm will replace the
+          bin/ACEutils.pm and be the main module for our
+          run_test.pl scripts.  It contains some common subroutines
+          and automatically parses some arguments via ARGV.
+
+        * docs/run_test.txt: (added)
+
+          A bit of documentation on how new run_test.pl's will
+          look.
+
+Wed Dec 13 18:15:03 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/CDR_Stream.h:
+          Made some of the adjust() methods public, this is used to
+          optimize TAO's implementations of CORBA::Any.
+
+Wed Dec 13 12:59:49 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/PerlACE/Process_Unix.pm:
+
+          Fixed PerlACE::Process on Unix to have the same interface as
+          the Win32 version.
+
+Tue Dec 12 09:52:00 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * Well, it looks like we finally have a new president in the
+          US, yow!
+
+Tue Dec 12 04:53:17 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Service_Config.{h,i}: Added an inequality operator.
+          Thanks to Mike Curtis <mccurry@my-deja.com> for pointing this
+          out.
+
+        * ace/Service_Config.cpp (process_commandline_directives): Changed
+          a check for error values being -1 to being != 0 since process_directive()
+          can return
+
+          1) a positive number of parse errors
+          2) and -1 on a certain ACE_NEW_RETURN call
+          3) but always zero on success.
+
+          Thanks to Mike Curtis <mccurry@my-deja.com> and
+          Munagala Ramanath <Munagala.Ramanath@PostX.com>
+          for pointing this out.
+
+Tue Dec 12 01:07:39 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Log_Msg.cpp:
+
+          Changed a comment to remove a false warning by fuzz.
+
+Mon Dec 11 15:10:00 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Get_Opt.h:
+          In some platforms 'optind', 'optarg' and 'opterr' are defined as
+          macros, undefine them because we use the same identifiers as
+          variable names.
+
+        * ace/OS.h:
+          If 'timezone' is defined as a macro in the system header files
+          then define ACE_TIMEZONE and #undef timezone.
+          The ACE_OS::timezone() method cannot be compiled otherwise, but
+          unfortunately this forces us to disable support for the method
+          under that sort of platform.
+
+        * ace/OS.h:
+          Do not include sys/shm.h if ACE_LACKS_SYSV_SHMEM is defined,
+          there is no reason to #include the file if we are not using it
+          anyway.
+
+        * ace/ACE.cpp:
+          Check the return value from getrlimit() before accepting its
+          results.
+
+Mon Dec 11 00:50:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ace_wchar.h:
+
+          Created an ACE_ANTI_TCHAR and ACE_TEXT_ANTI_TO_TCHAR.
+          ACE_ANTI_TCHAR has the opposite behavior of ACE_TCHAR.
+
+        * ace/Process.cpp:
+        * ace/Process.h:
+        * ace/Process.i:
+
+          Added wchar_t versions of:
+
+          - ACE_Process_Options::working_directory (wd)
+          - ACE_Process_Options::command_line (format, ...)
+
+        * ace/OS.cpp:
+        * ace/OS.h:
+        * ace/OS.i:
+
+          Added wchar_t versions of:
+
+          - ACE_OS::cond_init () - 2 versions
+          - ACE_OS::mutex_init ()
+          - ACE_OS::thread_mutex_init ()
+          - ACE_OS::event_init ()
+          - ACE_OS::sema_init ()
+
+          On Win32, these should be implemented using the *W version
+          of the APIs.  On other platforms, they call the char version
+          of the same ACE_OS call with a converted string.
+
+        * ace/Log_Msg.h:
+        * ace/Log_Msg.cpp:
+
+          Changed the first parameter to set and conditional_set from
+          being ACE_TCHAR to just char.  We'll assume filenames are
+          always ansi strings (since __FILE__ seems to act this way).
+          There was actually a dangling pointer problem in the
+          conditional_set when ACE_USES_WCHAR was defined before.
+
+          Added an ANTI_TCHAR version of log (priority, format, ...).
+          What this means is now we can use either narrow or wide
+          format strings with Log_Msg, regardless of whether ACE_USES_WCHAR
+          is defined or not.  Hopefully this means we can get rid of a lot
+          of the ACE_TEXT and ACE_LIB_TEXT's in our code.
+
+          Added a couple of more specifiers, %C and %w.  So for characters
+          and strings we have:
+
+          %c : print out an ansi character
+          %C : print out an ansi string
+          %s : print out an ACE_TCHAR * string
+          %w : print out a wide character
+          %W : print out a wide string
+
+          An example, which will also function correctly even when
+          ACE_USES_WCHAR is defined:
+
+          void print (char *a_str, wchar_t *w_str, ACE_TCHAR *t_str)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        "%C %s %W\n",
+                        a_str,
+                        t_str,
+                        w_str));
+          }
+
+          Unfortunately this only really takes care of the string
+          specifiers.  There is still work to be done with the other
+          implicit string specifiers (%p, %N, etc.).
+
+        * ace/RMCast/RMCast_IO_UDP.cpp:
+        * ace/RMCast/RMCast_Reassembly.cpp:
+        * ace/SSL/SSL_Context.cpp:
+        * ace/SSL/SSL_SOCK_Acceptor.cpp:
+        * ace/SSL/SSL_SOCK_Connector.cpp:
+        * ace/SSL/SSL_SOCK_Stream.i:
+
+          Removed unnecessary ACE_TEXT's to see how things go.
+
+        * docs/wchar.txt:
+
+          Updated the documentation.
+
+Fri Dec  8 13:47:58 2000  Jeff Parsons  <parsons@cs.wustl.edu>
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+
+          Added Refcounted_Auto_Ptr.{h,i} to these projects.
+
+Fri Dec  8 10:34:32 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Makefile: Added Refcounted_Auto_Ptr to the list of template
+          files.
+
+        * ace/Auto_Ptr.{h,i}:
+        * ace/Refcounted_Auto_Ptr.{h,i}: Moved the new
+          ACE_Refcounted_Auto_Ptr into a separate file to reduce
+          unnecessarily coupling in ACE.  Thanks to Darrell Brunsch for
+          pointing this out.
+
+Fri Dec  8 09:27:01 2000  Chad Elliott <elliott_c@ociweb.com>
+
+        * include/makeinclude/platform_chorus4.x_g++.GNU:
+
+          Modified to build only static libraries.  Something changed
+          between the time of the port and now, which caused it to try
+          to build shared libraries (which Chorus 4.0 doesn't support).
+
+Fri Dec  8 06:47:12 2000  Christopher Kohlhoff <chris@kohlhoff.com>
+
+        * tests/Makefile.bor:
+
+          Use variable called TARGET_NAME instead of NAME to
+          prevent clash with nightly build scripts.
+
+Thu Dec  7 13:16:23 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * examples/IPC_SAP/SPIPE_SAP/server.cpp:
+
+          Removed PERMS global variable, since it wasn't being
+          used (which KCC noticed).
+
+        * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp:
+
+          When calling ACE_OS::cuserid and passing a NULL pointer, it
+          should be cast to something like char * or wchar_t *.  In
+          this case it should be a char *, so I added a
+          ACE_static_cast for it.
+
+Thu Dec  7 02:31:44 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-WinCE.h:
+
+          Disabled inlining for SH3 Release configuration.  The SH3 compiler
+          has problems with inlined functions (in this case, ACE_OS::dlerror's
+          static variable was staying unresolved).  Thanks to Ricardo Chan
+          <ricchan@nortelnetworks.com> for pointing this out to me.
+
+Thu Dec  7 03:33:49 2000  Marina Spivak  <marina@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added RTCORBA MT test.
+
+Wed Dec  6 19:52:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+
+        * ace/Auto_Ptr.i:
+
+          Added a couple of ACE_INLINEs and an include of Synch_T.h.
+
+Wed Dec 06 20:12:35 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/Containers_T.cpp (operator=): In case the existing array is
+          larger than the rhs (right hand side), we don't have to free and
+          reallocate the existing array.  However, we do need to run the
+          destructor on the array elements that will be replaced.  Hence,
+          I added a call to ACE_DES_ARRAY_NOFREE for the elements being
+          replaced.
+
+          This fixes bug 704.  Thanks to Martin Krumpolec
+          <krumpo@pobox.sk> for reporting the bug and for providing an
+          example illustrating the problem.
+
+Wed Dec  6 14:29:13 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Auto_Ptr.{h,i}: Added a new set of class (ACE_Refcounted_Auto_Ptr_Rep,
+          ACE_Refcounted_Auto_Ptr) that implements support for a reference
+          counted auto_ptr.  Thanks to Johnny Tucker
+          <JTucker@infoglide.com> for contributing this.
+
+        * ace/Managed_Object.h: Added ACE_UNIMPLEMENTED_FUNC macros for
+          copy constructor and assignment operator in class
+          ACE_Cleanup_Adapter.  Thanks to Johnny Willemsen
+          <johnny.willemsen@meco.nl> for reporting this.
+
+        * tests/run_tests.sh: Prevent null or zero-length string test name from being
+          passed into the run() function.  Thanks to Jon Loeliger
+          <jloeliger@chiaro.com> for reporting this.
+
+        * tests/Log_Msg_Test.cpp,
+        * examples/Log_Msg/test_log_msg.cpp (main):
+          Replaced int with u_long to make compilers happy.  Thanks to
+          Mike Curtis <mccurry@my-deja.com> for pointing this out.
+
+Tue Dec  5 11:45:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Acceptor.cpp:
+
+          Added ACE_TEXT to a debug message.
+
+Tue Dec  5 10:07:14 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * performance-tests/Misc/childbirth_time.cpp:
+          Use &function instead of just function, hopefully that will make
+          Sun/CC 5.0 happy.
+
+Tue Dec  5 09:38:22 2000  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+
+          Return "-1" instead of the result of the
+          ACE_SSL_SOCK_Stream::close() method.  The latter may actually,
+          and most likely will return without error.
+
+Tue Dec 05 05:39:39 2000  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * tests/Makefile.bor:
+
+          Implemented 'clean' support in the ACE tests makefile.
+
+Tue Dec 05 02:02:51 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/IPC_SAP.cpp (disable): Reverted this change:
+
+          Tue Nov 21 17:42:36 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+          The change seemed too low level where it might end up effecting
+          more code than was intended.  However, as I discussed with Chris
+          Uzdavinis <chris@atdesk.com>, the correct solution is to
+          specialize the activation of the Svc_Handler rather than its
+          accepting.
+
+Mon Dec 04 23:54:10 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * examples/Reactor/Proactor/test_proactor.cpp:
+
+          - Receiver::open(): Only duplicate the message block when we are
+          faking the result.  Otherwise, initiate_read_stream will create
+          its own message block.
+
+          - Receiver::open(): Delete the fake result.
+
+          - Receiver::handle_read_stream(): When there is no more data to
+          read, release the message block and delete the receiver.
+
+          - Sender::transmit_file(): No need to duplicate the trailer.
+
+        * ace/Proactor.cpp (~ACE_Proactor_Timer_Handler):
+
+          The following was changed:
+
+          this->thr_mgr ()->wait ();
+
+          to:
+
+          this->thr_mgr ()->wait_grp (this->grp_id ());
+
+          since Thread_Manager::wait() if called while the
+          ACE_Object_Manager is shutting down (as a result of program
+          shutdown or ACE::fini), it will not wait for any threads to
+          complete.
+
+          Also, the timer_handler thread was not created detached since
+          Thread_Manager::wait_grp() does not wait on detached threads.
+
+Mon Dec 04 16:32:11 2000  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/SSL_SOCK_Stream.i (recv):
+
+          Shutdown the SSL connection if SSL_read() returns with an
+          SSL_ERROR_ZERO_RETURN OpenSSL error condition.
+          SSL_ERROR_ZERO_RETURN indicates that the peer is shutting down,
+          and that a "close_notify" message SSL message has been issued by
+          the peer.  A "close_notify" message indicates that no further
+          data will be sent through the given connection, so there is no
+          need to keep the connection open.
+
+          Removed SSL_ERROR_WANT_{WRITE,X509_LOOKUP} switch statement
+          cases.  They are apparently not necessary when performing a SSL
+          read.
+
+          (send):
+
+          Removed SSL_ERROR_WANT_{READ,X509_LOOKUP} switch statement
+          cases.  They are apparently not necessary when performing a SSL
+          write.
+
+        * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+
+          Check that the X.509 verification didn't fail.  If the
+          verification failed then do not continue.
+
+        * ace/SSL/SSL_Context.cpp:
+        * ace/SSL/SSL_SOCK_Connector.cpp:
+        * ace/SSL/SSL_SOCK_Stream.cpp:
+
+          Added missing ACE_RCSID macros.
+
+        * ace/SSL/SSL_Context.h:
+        * ace/SSL/SSL_SOCK.h
+        * ace/SSL/SSL_SOCK_Acceptor.h:
+        * ace/SSL/SSL_SOCK_Connector.h:
+        * ace/SSL/SSL_SOCK_Stream.h:
+
+          Doxygenated these headers.
+
+        * ace/SSL/SSL_Context.i:
+        * ace/SSL/SSL_SOCK.cpp:
+
+          Cosmetic updates.
+
+Mon Dec 04 12:45:46 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/High_Res_Timer.cpp: Corrected some problems with Linux on
+          Pentium that were introduced by this:
+          Fri Nov 10 10:42:31 2000  Steve Huston  <shuston@riverace.com>
+
+             * ace/High_Res_Timer.cpp: Replaced all occurrences of
+               "defined (ACE_HAS_PENTIUM)" with "defined (ACE_WIN32)" since
+               there is nothing Pentium-specific any longer in the Win32
+               sections.
+
+          Thanks to David Levine and Carlos O'Ryan for weeding this bug out.
+
+Mon Dec  4 07:39:16 2000  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Service_Configurator/IPC-tests/clients:
+          Added Borland C++ Builder specific makefile.
+
+Sun Dec  3 20:03:16 2000  Ossama Othman  <ossama@uci.edu>
+
+        * examples/Web_Crawler/Command_Processor.cpp:
+
+          Removed duplicate template instantiations.  Thanks to Paul Rubel
+          <prubel@bbn.com> for pointing out this bug, and for providing a
+          fix.
+
+        * THANKS:
+
+          Added Paul to the Hall-of-Fame.
+
+Sun Dec  3 15:23:50 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * performance-tests/Misc/childbirth_time.cpp:
+          Use 'extern "C"' for the thread entry point, this should make
+          Sun/CC 5.0 (and other compilers) happy.
+
+Sun Dec  3 08:50:15 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/OS.i: Fixed a cut and paste error. This was from the BUG#
+          734 in bugzilla. Thanks to Martin Krumpolec <krumpolec@pobox.sk>
+          for reporting this.
+
+Sat Dec  2 05:58:37 2000  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * ace/config-win32-borland.h:
+
+          Automatically define WIN32 macro if we are able to
+          determine that it is the target platform from pre-
+          defined compiler macros.
+
+        * ace/Makefile.bor:
+
+          Added missing template source file for install target.
+
+Sat Dec  2 00:19:38 2000  Marina Spivak  <marina@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added RTCORBA/Explicit_Binding test.
+
+Fri Dec 01 21:17:35 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Thread_Manager.cpp:
+          More ACE_LEGACY_MODE fixes.
+
+Fri Dec  1 13:49:36 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Log_Msg.cpp:
+          Fixed problems on non-legacy Win32 builds.
+
+Fri Dec  1 09:46:15 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Log_Msg.h:
+        * ace/Log_Msg.cpp:
+          The structured exception handler methods should show up on
+          ACE_LEGACY_MODE builds.  Unfortunately, the change from
+          ACE_LATEST_AND_GRATEST to LEGACY_MODE didn't work here because
+          the LATEST_AND_GREATEST macro was misspelled.
+
+Fri Dec  1 09:30:08 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_linux.GNU:
+          Add support for wxWindows under linux.
+
+Fri Dec  1 10:56:42 2000  Jeff Parsons  <parsons@cs.wustl.edu>
+
+        * include/makeinclude/ace_flags.bor:
+
+          Added definitions necessary for the new smart proxies
+          library and its Borland makefile.
+
+Fri Dec 01 09:21:31 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/Reactor.h: Clarified some comments.
+
+Thu Nov 30 22:49:10 2000  pradeep@cs.wustl.edu  <pradeep@cs.wustl.edu>
+
+        * ACE version 5.1.11 released.
+
+Wed Nov 29 23:55:37 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * apps/drwho/server.cpp:
+        * apps/drwho/BS_Client.cpp:
+          Used casts to quiet VxWorks/LynxOS.
+        * bin/auto_run_tests.lst:
+          Commented out this test - its broken.
+
+Wed Nov 29 10:35:26 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp (parse_args):
+          Removed the colon after the "r" in the parse-args list.  Thanks
+          to Mike Curtis <mccurry@my-deja.com> for pointing this out.
+
+        * ace/Method_Request.h: Added ACE_UNIMPLEMENTED_FUNC to the
+          assignment operator and copy constructor of ACE_Method_Request.
+          Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for
+          pointing this out.
+
+Wed Nov 29 09:41:51 2000  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * examples/Reactor/Multicast/*.bor
+          Added Borland C++ Builder specific makefiles. Thanks to
+          Albert Wijna <albert.wijnja@meco.nl> for creating these.
+
+Tue Nov 28 15:39:51 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Print out an error message when the script returns a non-zero
+          code.  The errors where reported by email, but they didn't show
+          up in the make_pretty output.
+
+Tue Nov 28 15:36:10 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/generate_doxygen.pl:
+          Don't generate inline code for releases, it bloats the
+          documentation, and does not make things any clearer.
+
+        * html/index.html:
+          Fixed URLs
+
+        * etc/ace.doxygen:
+        * etc/ace_man.doxygen:
+        * etc/ace_rmcast.doxygen:
+        * etc/ace_ssl.doxygen:
+        * etc/tao_dynamicany.doxygen:
+        * etc/tao_dynamicinterface.doxygen:
+        * etc/tao_esf.doxygen:
+        * etc/tao_implrepo.doxygen:
+        * etc/tao_iormanip.doxygen:
+        * etc/tao_iortable.doxygen:
+        * etc/tao_portableserver.doxygen:
+        * etc/tao_rtevent.doxygen:
+        * etc/tao_strategies.doxygen:
+          Make sure that ACE_THROW_SPEC is properly defined.
+
+        * etc/tao.doxygen:
+          Also fix the relative path to the ace doxygen files.
+
+Tue Nov 28 13:31:47 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * tests/run_test.pl: prefix exec of run_tests.sh with
+          $EXEPREFIX, so that it works without . in the user's
+          PATH.  Thanks to Carlos for pointing this out.
+
+Tue Nov 28 08:09:35 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * tests/run_test.pl: added some more diagnostics to try
+          to figure out why run_tests.sh can't be exec'd on
+          UCI machines.
+
+Mon Nov 27 17:02:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ACE-INSTALL.html:
+          While following up on Johnny Willemsen's
+          <johnny.willemsen@meco.nl> suggestion to make sure I removed all
+          references to .mdp files, I noticed that some of the Win32
+          instructions could use some updating.
+
+Mon Nov 27 17:44:52 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * tests/run_test.pl: if run_tests.sh doesn't exist, print
+          a diagnostic message and continue with the run_test.pl
+          version of the tests.  For unknown reasons, this change:
+          Mon Nov 27 11:58:43 2000  David L. Levine <levine@cs.wustl.edu>
+          doesn't work on the UCI Linux machines, run_tests.sh can't
+          be exec'd.
+
+Mon Nov 27 10:17:58 2000  Ossama Othman  <ossama@uci.edu>
+
+        * docs/tutorials/005/005.dsp:
+
+          Corrected name of output binary.  It should have been
+          `server.exe' not `client.exe'.  Thanks to David Channon
+          <djc@uq.net.au> for reporting this problem.
+
+Mon Nov 27 09:56:09 2000  Ossama Othman  <ossama@uci.edu>
+
+        The following updates are based on feedback from David Channon
+        <djc@uq.net.au>.  Thanks David!
+
+        * docs/tutorials/003/client.cpp:
+        * docs/tutorials/003/page01.html:
+        * docs/tutorials/004/client.cpp:
+        * docs/tutorials/004/page01.html:
+        * docs/tutorials/008/broadcast_client.cpp:
+        * docs/tutorials/008/directed_client.cpp:
+        * docs/tutorials/008/page02.html:
+        * docs/tutorials/008/page03.html:
+        * docs/tutorials/008/page04.html:
+        * docs/tutorials/008/server.cpp:
+        * docs/tutorials/009/broadcast_client.cpp:
+        * docs/tutorials/009/directed_client.cpp:
+        * docs/tutorials/009/page02.html:
+        * docs/tutorials/009/page03.html:
+        * docs/tutorials/009/page04.html:
+        * docs/tutorials/009/server.cpp:
+        * docs/tutorials/019/client.cpp:
+        * docs/tutorials/019/client2.cpp:
+        * docs/tutorials/019/page02.html:
+        * docs/tutorials/019/page03.html:
+        * docs/tutorials/019/page04.html:
+        * docs/tutorials/019/page05.html:
+        * docs/tutorials/019/server.cpp:
+        * docs/tutorials/019/server2.cpp:
+        * docs/tutorials/019/shmem.cpp:
+        * docs/tutorials/020/client.cpp:
+        * docs/tutorials/020/client2.cpp:
+        * docs/tutorials/020/mmap.cpp:
+        * docs/tutorials/020/page02.html:
+        * docs/tutorials/020/page03.html:
+        * docs/tutorials/020/page04.html:
+        * docs/tutorials/020/page05.html:
+        * docs/tutorials/020/server.cpp:
+        * docs/tutorials/020/server2.cpp:
+
+          Include "ace/Log_Msg.h" to pull in the ACE_{DEBUG,ERROR}
+          macros.  The example code in the HTML files was also updated.
+
+        * docs/tutorials/011/message_queue.cpp:
+        * docs/tutorials/011/page02.html:
+
+          Removed unnecessary line of code that NULL terminated a string.
+          It didn't serve any purpose since the string is already
+          terminated.  If it wasn't terminated then that point in the code
+          would never have been reached since the code prior to it assumes
+          that the string is NULL terminated.
+
+Mon Nov 27 11:58:43 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * tests/run_test.pl: on platforms other than Win32, simply
+          exec run_tests.sh.  run_tests.sh properly handles all of
+          the current ACE tests.  [Bug 729]
+
+Mon Nov 27 14:12:09 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Activation_Queue.h: Added ACE_UNIMPLEMENTED_FUNC to the
+          assignment operator and copy constructor of
+          ACE_Activation_Queue.  Thanks to Johnny Willemsen
+          <johnny.willemsen@meco.nl> for pointing this out.
+
+Sun Nov 26 19:07:48 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * examples/Map_Manager/test_hash_map_manager.cpp:
+        * examples/Shared_Malloc/Malloc.cpp:
+        * examples/Shared_Malloc/test_position_independent_malloc.cpp:
+
+          Removed extraneous explicit template instantiation declarations
+          causing "multiply defined" errors on VxWorks and LynxOS.
+
+Sat Nov 25 22:08:46 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * apps/drwho/Makefile:
+          Disabled drwho compilation on Vxworks - it doesn't have
+          protocols/rwhod.h.
+
+Fri Nov 24 16:58:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/IPC_SAP.cpp:
+
+          WSAEventSelect is not available on Windows CE, so the #ifdefs
+          were changed so it calls ioctl on Windows CE also.
+
+Fri Nov 24 15:43:20 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * docs/ACE-categories.html:
+          Fixed URLs to Doxygen documents, I used the absolute URL to our
+          Doxygen site, but in the future we may want to do that
+          configurable.
+
+        * bin/auto_run_tests.lst:
+          Disable the Connection_Purging test in TAO, it never worked and
+          the features are disabled while we continue to improve the
+          Connection Cache.
+
+Fri Nov 24 11:42:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ACE-INSTALL.html:
+
+          Updated sections about Windows CE and MSVC.  CE stuff
+          is documented in CE-status.txt, and removed references to old
+          MSVC 4.2 projects.  Thanks to Johnny Willemsen
+          <johnny.willemsen@meco.nl> for pointing this out.
+
+Fri Nov 24 05:48:26 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Signal.h: Enhanced the documentation to clarify the role of
+          sigkey.  Thanks to Oscar Rodriquez <Oscar.Rodriquez@eln.ericsson.se>
+          for motivating this.
+
+        * ace/SOCK_Connector.h: Updated the documentation to clarify the
+          parameters to the constructors and the connect() method.  Thanks
+          to Pierre Oberson <oberson@nagra-kudelski.ch> for suggesting this.
+
+Thu Nov 23 21:17:16 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * tests/Reactor_Notify_Test.cpp (main): added
+          auto_ptr<ACE_Reactor> so that the global Reactor instance
+          will be destroyed at the termination of main ().  The cleans
+          up memory leaks that we introduced in this change to the test:
+          Tue Oct 24 12:30:47 2000  Steve Huston  <shuston@riverace.com>
+
+Thu Nov 23 18:38:54 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+        * Makefile:
+          Add ACE_wrappers/html to the list of files tagged, even though
+          they are not included in the tar or zip files.
+
+Thu Nov 23 18:13:32 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+          Don't use 'grep -q' because Solaris' grep does not support it.
+
+Thu Nov 23 18:27:52 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+        * Makefile:
+          The ACE-INSTALL file is generated in the staging directory,
+          there is no need to generate it locally too.
+
+Thu Nov 23 17:46:56 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Method_Request: Made the priority() method const.  Thanks
+          to Johnny Willemsen <jwillemsen@remedy.nl>
+
+Thu Nov 23 14:43:40 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * Makefile:
+          Do not include the html directory in the release. The doxygen
+          files are too big for this.
+
+        * ace/config-doxygen.h:
+          Improve doxygen documentation.
+
+        * bin/generate_doxygen.pl:
+          Add options to change the path to find dot and perl on the fly.
+
+        * bin/make_release:
+          Generate the HTML documentation in a separate .tar.gz (or .zip)
+          file.
+
+Wed Nov 22 17:35:55 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added entry for Collocation test. Moved entry for Client
+          Exposed Policy test from the old list file to this one.
+
+Wed Nov 22 09:29:32 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * etc/ace.doxygen:
+
+          Added the docs directory and *.txt files to be looked
+          at by doxygen.
+
+        * docs/CE-status.txt:
+        * docs/wchar.txt:
+
+          Fixed up these files, so they show up correctly in the
+          doxygen html pages.
+
+Tue Nov 21 19:55:49 200 0  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/IPC_SAP.cpp:
+          Casting param1 to SOCKET did the trick. Thanks Doug!
+
+Tue Nov 21 19:21:10 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/IPC_SAP.cpp:
+
+          Reverted previous change applied to ACE_IPC_SAP::disable because
+          of compile error.
+
+Tue Nov 21 18:54:14 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * apps/drwho/CM_Client.cpp:
+
+          Explicitly cast Comm_Manager::sokfd_ to int in calls to
+          ACE_OS::recvfrom and ACE_OS::closesocket to quiet LynxOS.
+
+Tue Nov 21 17:42:36 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/IPC_SAP.cpp:
+
+          Modified ACE_IPC_SAP::disable to call ::WSAEventSelect on Win32.
+          Thanks to Chris Uzdavinis <chris@atdesk.com> for contributing
+          these changes.
+
+Tue Nov 21 11:00:14 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/run_test.lst:
+
+          Borland shouldn't be running ACE_Init_Test.
+
+Tue Nov 21 10:15:15 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS_String.inl:
+
+          Changed ::towlower to towlower since it can be a macro.
+
+Tue Nov 21 09:57:53 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/Reactor_Exceptions_Test.cpp:
+
+          Code style fix.
+
+        * tests/run_test.lst:
+
+          New_Fail_Test just eats up memory when run, and it only tests
+          the behavior of new.  Not really something we need to run
+          everynight (and as David Levine reports, using up all the
+          memory can cause problems in other processes on the nightly
+          build machines).  Commented out the New_Fail_Test.
+
+        * tests/run_test.pl:
+
+          Fixed to clean up some of the backing_store_* files in the
+          tests directory after running the tests.
+
+        * bin/ACEutils.pm:
+
+          Added the ability to pick -ExeSubDir <dir> from the command
+          line to alter $EXEPREFIX.  This should allow us to start
+          running tests with different configurations (ie. Win32 Release)
+          and on Borland.
+
+Tue Nov 21 07:24:54 2000  Chris Kohlhoff  <chris@kohlhoff.com>
+
+        * ace/SSL/Makefile.bor:
+        * include/makeinclude/build_dll.bor:
+        * include/makeinclude/build_exe.bor:
+        * include/makeinclude/build_lib.bor:
+
+          Prevent SSL libraries from being built unless SSL_ROOT is defined.
+
+        * include/makeinclude/build_example.bor:
+
+          Add missing libraries required for statically linking TAO examples.
+
+Mon Nov 20 21:52:57 2000  Ossama Othman  <ossama@uci.edu>
+
+        * ace/Makefile.am:
+
+          Added more missing files to the source lists.
+
+Mon Nov 20 19:16:12 2000  Ossama Othman  <ossama@uci.edu>
+
+        * ace/OS.i (mutex_init):
+
+          Fixed an unused argument warning that was showing up in
+          ACE+Autoconf builds.
+
+        * ace/Makefile.am (libACE_Utils_la_SOURCES):
+
+          Updated "Init.cpp" to "Init_ACE.cpp."  For some reason this
+          file wasn't updated when the name change was made.
+
+          (libACE_Utils_la_SOURCES):
+
+          Moved `Sock_Connect.cpp' to this list of sources.  Similar to
+          the above change, this files wasn't updated when the
+          corresponding to changes was made to the classical Makefile.
+
+Mon Nov 20 15:00:26 2000  Marina Spivak  <marina@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added RTCORBA/Private_Connection, updated options for other
+          RTCORBA tests.
+
+Sun Nov 19 15:26:56 2000  Ossama Othman  <ossama@uci.edu>
+
+        * ace/SSL/sslconf.h
+          (ACE_DEFAULT_SSL_CERT_FILE, ACE_DEFAULT_SSL_CERT_DIR):
+
+          On Win32, do not use UNIX-specific directories in certificate
+          paths.
+
+Sun Nov 19 10:37:48 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+          Add the new files to the MSVC projects.
+
+        * ace/Dynamic_Service_Base.h:
+          Add missing file.
+
+        * ace/Dynamic_Service_Base.cpp:
+          Removed template-like protections, this is a regular class.
+
+        * ace/Dynamic_Service.i:
+        * ace/Dynamic_Service.cpp:
+          Cosmetic fixes.
+
+Sun Nov 19 08:05:08 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/Makefile:
+          Updated.
+
+        * ace/Dynamic_Service.cpp:
+        * ace/Dynamic_Service.h:
+        * ace/Dynamic_Service_Base.cpp:
+        * ace/Dynamic_Service_Base.h:
+          Not all methods in Dynamic_Service were based on the SERVICE
+          types. Moved those to the base class 'Dynamic_Service_Base' and
+          the Dynamic_Service inherits from the base class.
+
+Sat Nov 18 15:39:49 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp:
+          Fixed a mistake in the "usage" string.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for pointing this out.
+
+Sat Nov 18 11:35:53 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/OS_Test.cpp:
+
+          Changed the signature of main to use ACE_TCHAR.  Although
+          I don't consider this the "right" way of doing this, it
+          will make the builds happy with ACE_USES_WCHAR until we
+          implement something better.
+
+Sat Nov 18 09:58:17 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Basic_Types.h:
+        * ace/OS_Log_Msg_Attributes.h:
+        * ace/config-all.h:
+          Under LynxOS we must #include stdarg.h before stdio.h.
+          Thanks to David for letting us know about this.
+
+Fri Nov 17 14:24:42 2000 Darrell Brunsch <brunsch@uci.edu>
+
+        * include/makeinclude/clean.bor:
+
+          Added the removal of *Cli.cpp, *Ser.cpp, etc. files which
+          is the output style of the TAO Param_Test.
+
+        * tests/Reactor_Exceptions_Test.cpp:
+
+          Put the handler in its own scope so it must be cleaned up
+          before the reactor.  For whatever reason, it wasn't happening
+          in the right order on MSVC before.
+
+          Also changed the exception error to a debug message, since
+          it really doesn't seem an error (we explicitly cause one).
+
+Fri Nov 17 11:22:08 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_sunos5_kcc.GNU:
+          Same fix as for platform_linux_kcc.GNU.
+          A little more detail has surfaced: apparently under this
+          compiler we attempted to link the static run-time and system
+          libraries if static_libs_only=1 was set.  Not only this would be
+          unique (in that we don't do this for other compilers), but it
+          fails when only one directory is compiled with
+          static_libs_only=1, hile only the dynamic version of ACE (or any
+          other of our libraries) is compiled.
+          IMHO it is better to make it consistent with all the other
+          platforms, and leave the extra optimization of using static
+          system libraries for a future makefile option.
+
+        * include/makeinclude/platform_linux_kcc.GNU:
+          Remove obsolete comment
+
+Fri Nov 17 03:37:37 2000  Marina Spivak  <marina@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added RTCORBA/Banded_Connections test.
+
+Fri Nov 17 01:16:25 2000  Ossama Othman  <ossama@uci.edu>
+
+        * include/makeinclude/wrapper_macros.GNU (ssl):
+
+          Removed definition of the ACE_HAS_SSL macro.  It is no longer
+          used.
+
+Thu Nov 16 16:14:03 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * Makefile:
+        * html/doxygen.css:
+        * html/index.html:
+          New html directory.  People normally don't expect html documents
+          to show up under the man directory.
+
+        * configure.in:
+        * bin/bootstrap:
+        * man/Makefile.am:
+        * man/html/Makefile.am:
+          Remove the man/html directory.
+
+        * bin/make_release:
+          Insert code to generate the man pages index.
+
+        * docs/ACE-categories.html:
+          Change references to man/html so they point to the new doxygen
+          generated files.
+
+        * bin/README.html:
+        * bin/class2hxxcxx:
+        * bin/class2hxxcxxsingle:
+        * bin/class2info:
+        * bin/class2info.awk:
+        * bin/class2man:
+        * bin/class2mml:
+        * bin/class2src:
+        * bin/classinfo.ps:
+        * bin/generate_html_windex:
+        * bin/generate_man_pages:
+        * bin/hiding.fmt:
+        * bin/html-windex:
+        * bin/info2doc.awk:
+        * bin/info2doc.fmt:
+        * bin/info2head:
+        * bin/info2head.fmt:
+        * bin/info2headsrc:
+        * bin/info2man:
+        * bin/info2mml:
+        * bin/info2src:
+        * bin/info2src.awk:
+        * bin/man2html:
+        * bin/man2html1.awk:
+        * bin/man2html2.awk:
+        * bin/vendor.fmt:
+          Remove old scripts used in man page and html document
+          generation. We do everything with doxygen now.
+
+Thu Nov 16 17:55:18 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * apps/JAWS/clients/Blobby/Blob.{h,cpp}:
+        * apps/JAWS/clients/Blobby/Blob_handler.{h,cpp}:
+        * apps/drwho/Rwho_DB_Manager.h:
+        * apps/drwho/Multicast_Manager.{.h,cpp}:
+        * apps/drwho/Options.{h,cpp}:
+          Follow const correctness to make suncc5 happy.
+
+        * examples/IOStream/server/iostream_server.h
+          Use ACE_HAS_TEMPLATE_TYPEDEFS rather than ACE_HAS_TYPENAME_KEYWORD
+          Thanks to Steve Huston <shuston@riverace.com> for the fix.
+
+Thu Nov 16 15:31:20 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_linux_kcc.GNU:
+          Builds with static libraries under Linux/KCC were failing due to
+          some magical -Bstatic options in the configuration file.  When
+          the options are removed the problem went away.
+
+Thu Nov 16 15:31:20 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_linux_kcc.GNU:
+          Builds with static libraries under Linux/KCC were failing due to
+          some magical -Bstatic options in the configuration file.  When
+          the options are removed the problem went away.
+
+Thu Nov 16 15:09:25 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/TkReactor_Test.cpp:
+          Fixed 'char*' vs. 'const char *' conflict.
+
+Wed Nov 15 14:23:54 2000  Ossama Othman  <ossama@uci.edu>
+
+        * configure.in:
+
+          Fixed bug in the auto_ptr / C++ std namespace test where the
+          template argument for the auto_ptr being instantiated was
+          a non-existent type.
+          Reported by Kevin Marhsall <KCMarshall@att.net>
+
+        * THANKS:
+
+          Added Kevin to the hall of fame list.
+
+Wed Nov 15 10:19:45 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/Threads/thread_specific.cpp:
+          Fixed warning under linux
+
+Wed Nov 15 08:32:58 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * apps/JAWS/server/Makefile:
+        * performance-tests/Misc/Makefile:
+          Change dependencies to ensure that the libraries are created
+          before we attempt to link the binaries, otherwise the
+          compilation fails with parallel builds.
+
+Tue Nov 14 17:55:52 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * Makefile:
+          PACE is disabled by default, unless pace=1 is set in the command
+          line or the platform_macros.GNU file.
+
+Tue Nov 14 19:36:47 2000  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/test_siosig_ace.cpp: Don't log
+          the read/written file using ACE_DEBUG - it will usually overflow
+          the ACE_Log_Record max message length and do bad things.
+
+Tue Nov 14 19:19:16 2000  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/simple_test_proactor.cpp: Don't log
+          the read/written file using ACE_DEBUG - it will usually overflow
+          the ACE_Log_Record max message length and do bad things.
+          Thanks to John Buckman <john@lyris.com> for reporting this.
+
+Tue Nov 14 18:43:51 2000  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/test_proactor3.cpp: Replace use of
+          list<Sender *> with Sender * [] so it builds without inifintely
+          complicated explicit instantiations on gcc. KISS ;-)
+
+Tue Nov 14 17:43:26 2000  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/Proactor/test_aiocb_ace.cpp: Fixed to work
+          correctly if one of the aio ops completes, but not the other,
+          during a pass through the Test_Aio::do_aio loop. Thanks to
+          John Buckman <john@lyris.com> for reporting this.
+
+Tue Nov 14 14:19:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Log_Record.cpp:
+
+          In ACE_Log_Record::print, changed the call to ACE_OS::fprintf
+          to use ACE_TEXT("%s") as the second argument instead of just
+          "%s".  This should make logging under ACE_USES_UNICODE readable.
+          Thanks to James Buck <jim@nowsol.com> and Nick Pratt
+          <npratt@microstrategy.com> for both reporting this problem and
+          submitting patches.
+
+Tue Nov 14 09:19:16 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/Threads/thread_specific.cpp:
+          Simply use %u to print an ACE_hthread_t.  This is what we seem
+          to be doing in other places in the code.  However, this seems to
+          be non-portable, the code in ACE_Log_Msg to print the thread ID
+          is a lot more complicated.
+
+Mon Nov 13 15:13:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Object_Manager.cpp:
+
+          Protected the assert dialog box disable with _MSC_VER
+          since it is only for MSVC.
+
+Mon Nov 13 03:46:21 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * docs/CE-status.txt:
+        * docs/wchar.txt: (added)
+
+          Updated documentation == good thing.
+
+Mon Nov 13 03:39:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32-borland.h:
+
+          It looks like Borland also uses _wcsdup, so added the
+          ACE_WCSDUP_EQUIVALENT here.
+
+Mon Nov 13 01:07:36 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS_String.cpp:
+        * ace/config-win32-borland.h:
+        * ace/config-win32-msvc.h:
+
+          Christopher Kohlhoff <chris@kohlhoff.com> mentioned to me
+          that Borland did have a wcsdup, but it was named differently
+          than the _wcsdup in MSVC.  I took his suggestion and added
+          a ACE_WCSDUP_EQUIVALENT for MSVC's version and enabled
+          wcsdup for Borland's config.
+
+Mon Nov 13 00:36:29 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Obstack.cpp:
+        * ace/Obstack.h:
+
+          Nanbor mentioned to me the other day that the interfaces to
+          this class probably should remain as char *.  After looking
+          at it, I agreed and changed it to that.  But since Svc_Conf
+          uses this class in such a way that it is passing wchar_t
+          strings to it when ACE_USES_WCHAR is defined, I also added
+          a wchar_t version of copy to make things happy.
+
+Sun Nov 12 17:00:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ace_ce.dsw: (removed)
+        * ace/ace_dll_ce.dsp: (removed)
+        * ace/ace.vcw: (added)
+        * ace/ace_dll.vcp: (added)
+        * ace/ace_os_dll.vcp: (added)
+
+          Removed the old Windows CE project files, and replaced
+          them with ones created by the eMbedded Visual C++ from
+          MS.
+
+        * ace/OS_Errno.cpp: (added)
+        * ace/OS_Errno.h: (added)
+        * ace/OS_Errno.inl: (added)
+        * ace/config-all.h:
+        * ace/OS.cpp:
+        * ace/OS.h:
+        * ace/OS.i:
+
+          Moved the Errno stuff from ACE_OS to a separate class,
+          since it needed to be in its own layer for Windows CE.
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+        * ace/Makefile:
+        * ace/Makefile.am:
+        * ace/Makefile.bor:
+
+          Added OS_Errno.* files.
+
+        * ace/ACE.cpp:
+        * ace/Sock_Connect.cpp:
+
+          Moved get_reg_value () to Sock_Connect since that is where
+          it is being used.
+
+        * ace/ARGV.cpp:
+        * ace/OS.cpp:
+        * ace/OS.h:
+        * ace/OS.i:
+
+          Added ACE_LACKS_ENV for platforms (like Windows CE) which
+          doesn't have an environment.  Maybe in the future this can
+          be emulated, for now, we do nothing.
+
+        * ace/Base_Thread_Adapter.h:
+        * ace/OS.h:
+
+          Replace ACE_Export with ACE_OS_Export.
+
+        * ace/Base_Thread_Adapter.inl:
+        * ace/Thread_Adapter.inl:
+
+          Moved some of the ACE_OS_Thread_Descriptor methods to
+          Base_Thread_Adapter, since they were declared in
+          Base_Thread_Adapter.h.
+
+        * ace/SUN_Proactor.cpp:
+
+          Removed ACE_BUILD_DLL from this file, since it should only
+          be defined in the project file.
+
+        * ace/OS_Dirent.h:
+
+          Added ACE_WINCE to the #if block around some of the includes.
+
+        * ace/OS_Memory.h:
+        * ace/OS_Dirent.inl:
+        * ace/OS_String.inl:
+        * ace/OS.h:
+
+          Added /**/ to the #includes of pace, since they seem to
+          totally confuse EVC's automatic dependency generation.
+
+        * ace/OS_String.cpp:
+        * ace/OS_String.h:
+        * ace/OS_String.inl:
+
+          Added strerror.  On machines without it, just returns
+          "Unknown Error" all the time.
+
+          Added strspn_emulation, strpbrk_emulation, strtol_emulation,
+          and strtoul_emulation.
+
+          New compile time defines:
+          - ACE_LACKS_STERROR
+          - ACE_LACKS_STRPBRK
+          - ACE_LACKS_STRSPN
+          - ACE_LACKS_STRTOL
+          - ACE_LACKS_STRTOUL
+          - ACE_LACKS_STRTOD
+
+        * ace/Log_Msg.cpp:
+
+          Since there is now strerror in ACE, removed the !ACE_HAS_WINCE
+          blocks and replaced them with direct calls to ACE_OS_String's
+          version.
+
+        * ace/config-win32.h:
+
+          Changed check for #include-ing config-wince.h to be based on
+          _WIN32_WCE because this definition has been automatically added
+          to the default projects by the misc WinCE editors.
+
+        * ace/Service_Config.i:
+
+          The char versions of the following fuctions (which are defined
+          only under WinCE) were recursive and would fail miserably if
+          ever used.  I added ACE_CHAR_TO_TCHAR to resolve the infinate
+          recursion.
+          - ACE_Service_Config::initialize ()
+          - ACE_Service_Config::resume ()
+          - ACE_Service_Config::suspend ()
+          - ACE_Service_Config::remove ()
+
+        * ace/config-win32-msvc.h:
+
+          We were defining ACE_HAS_GNU_CSTRING_H.  I doubt that MSVC has
+          GNU's cstring.h, so I removed it.
+
+        * ace/OS.cpp:
+        * ace/OS.h:
+        * ace/OS.i:
+
+          Added ACE_LACKS_CUSERID and ACE_LACKS_CHDIR.
+
+          Added writev and readv emulation methods to ACE_OS, since they
+          were just being defined as global functions.  This is more
+          consistent with what we are doing elsewhere.
+
+          Added ACE_LACKS_SYS_NERR emulation.
+
+        * ace/config-WinCE.h:
+
+          Added all the necessary defined to get ACE compiling for Windows
+          CE 3.0.  As for previous versions, they do not currently compile,
+          although that could change in the future
+
+Sun Nov 12 12:29:31 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Cache_Map_Manager_T.h:
+        * ace/Codeset_IBM1047.h:
+        * ace/Date_Time.h:
+        * ace/Dump_T.h:
+        * ace/Flag_Manip.h:
+        * ace/Hash_Cache_Map_Manager_T.h:
+        * ace/LSOCK_Acceptor.h:
+        * ace/Memory_Pool.h:
+        * ace/QoS_Decorator.h:
+        * ace/SV_Semaphore_Complex.h:
+        * ace/Strategies_T.h:
+        * ace/Synch_Options.h:
+        * ace/Time_Request_Reply.h:
+        * ace/Timer_Wheel_T.h:
+        * ace/WIN32_Proactor.h:
+        * ace/ace_wchar.h:
+
+          Fixed @file comments.
+
+Sat Nov 11 18:55:04 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * ace/Profile_Timer.cpp:
+          Included Log_Msg.h to fix compile error.
+
+Fri Nov 10 19:41:38 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Added a check for the @file comments used by doxygen.
+          They must be the same as the actual filename, or doxygen will
+          not pick up the comments for that file.
+
+Fri Nov 10 20:26:01 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Profile_Timer.cpp: Replaced ACE_OS::perror() with
+          ACE_ERROR macros so that the output can be redirected to the
+          same place that the ACE logging output is configured to go.
+          Thanks to Jeff Greif <jgreif@befree.com> for reporting this.
+
+Fri Nov 10 17:15:42 2000  Darrell Brunsch  <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Made the output look a little closer to MSVC's.
+
+Fri Nov 10 17:08:52 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * etc/tao_strategies.doxygen:
+          New doxygen configuration file for the TAO_Strategies library.
+
+        * bin/generate_doxygen.pl:
+          Add tao_strategies.doxygen to the list.
+
+        * etc/ace_man.doxygen:
+          Generate man pages in the man directory instead of doxygen_man.
+
+Fri Nov 10 12:58:53 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/generate_doxygen.pl:
+        * etc/tao_implrepo.doxygen:
+
+          New Implementation Repository documentation.
+
+Fri Nov 10 12:53:28 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Format test output so make_pretty.pl can recognize where each
+          test starts.
+
+        * etc/ace_rmcast.doxygen:
+        * etc/ace_ssl.doxygen:
+        * etc/tao.doxygen:
+        * etc/tao_dynamicany.doxygen:
+        * etc/tao_dynamicinterface.doxygen:
+        * etc/tao_esf.doxygen:
+        * etc/tao_iormanip.doxygen:
+        * etc/tao_iortable.doxygen:
+        * etc/tao_portableserver.doxygen:
+        * etc/tao_rtevent.doxygen:
+          Don't define the macros explicitly, use the config-doxygen.h
+          file.
+          Must define ACE_RCSID and ACE_UNDEFINED_FUNC properly, so
+          doxygen does not get confused.
+
+Fri Nov 10 14:26:41 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/config-sunos5.6.h: The AIO definitions were missing the #if
+          !defined guards that are present in the solaris 2.7 config
+          header.  Thanks to Alex Hornby <alex@anvil.co.uk> for reporting
+          this.
+
+Fri Nov 10 11:44:15 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/RMCast/Send_File/Receiver.cpp:
+          Fixed errors in Tru64/DUCXX builds.
+
+Fri Nov 10 10:42:31 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS.i (ACE_OS::gethrtime): Removed the ACE_HAS_PENTIUM check
+          from the #if defined (ACE_WIN32) line surrounding the use of
+          QueryPerformanceCounter - it works fine on 486 also, per
+          Bernd Annamaier <bernd.annamaier@de.adtranz.com>. Thanks to
+          Bernd for testing this out.
+
+        * ace/High_Res_Timer.cpp: Replaced all occurrences of
+          "defined (ACE_HAS_PENTIUM)" with "defined (ACE_WIN32)" since there
+          is nothing Pentium-specific any longer in the Win32 sections.
+
+        * THANKS: Added Bernd Annamier to the Hall of Fame.
+
+Fri Nov 10 12:28:42 2000  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * examples/log_msg/makefile.bor:
+        * examples/map_manager/makefile.bor:
+        * examples/makefile.bor:
+        * performance-tests/makefile.bor:
+        * performance-tests/Server_Concurrency/makefile.bor:
+          New Borland makefiles for ACE
+
+Thu Nov  9 18:39:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-sunos5.5.h:
+
+          Added ACE_LACKS_MEMORY_H for SunCC 5, since it seems there is
+          a bad interaction between memory.h and string.h on that config.
+
+Thu Nov  9 17:47:37 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp:
+          Antoher missing Log_Msg.h
+
+        * examples/Threads/thread_specific.cpp:
+          Tru64 does not like the convertion from ACE_hthread_t to
+          unsigned long.  I'm trying with a reinterpret_cast, but I don't
+          have much hope for it.
+
+        * examples/Service_Configurator/IPC-tests/server/Makefile:
+        * examples/Service_Configurator/Misc/Makefile:
+        * examples/Timer_Queue/Makefile:
+        * apps/Gateway/Gateway/Makefile:
+        * apps/Gateway/Peer/Makefile:
+          Avoid problems where the library is linked twice, once for the
+          required dependency in parallel builds an another for the LDLIBS
+          flag.
+
+        * etc/ace.doxygen:
+        * etc/ace_man.doxygen:
+          Use a separate file to generate man pages.  We don't want to
+          document .cpp files or include code in man pages, but that looks
+          great in HTML documents.
+
+        * etc/tao.doxygen:
+        * etc/tao_dynamicany.doxygen:
+        * etc/tao_dynamicinterface.doxygen:
+        * etc/tao_esf.doxygen:
+        * etc/tao_iormanip.doxygen:
+        * etc/tao_iortable.doxygen:
+        * etc/tao_portableserver.doxygen:
+        * etc/tao_rtevent.doxygen:
+          Update the replacement path to some of the tag files, the
+          generated documents did not get the right cross references.
+
+        * bin/make_pretty.pl:
+          Add yet another linker error.
+
+        * bin/generate_doxygen.pl:
+          Parse the man page generation code to create its output path too.
+
+Thu Nov  9 15:10:28 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/make_pretty.pl:
+          In the HTML we replace < with &lt; and > with &gt; otherwise the
+          output for templates makes no sense.
+
+Thu Nov  9 12:11:52 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/Makefile (UTILS_FILES):
+          Modified the Makefile to help when building subsetted shared
+          libraries. Specifically, moved Addr, INET_Addr, and Sock_Connect
+          into the Sockets component.  That removes the dependancy of the
+          Utilities and Sockets components on the non-socket IPC component.
+
+       Committing on behalf of Phil Mesnier <mesnier_p@ociweb.com>
+
+Thu Nov  9 10:38:33 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/Makefile:
+          ACE_HAS_GNUG_PRE_2_8 should be used only after
+          wrapper_macros.GNU is included.
+
+Thu Nov  9 10:26:01 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/make_pretty.pl:
+          Add yet another link error message.
+
+Thu Nov  9 08:51:04 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/rules.local.GNU:
+          It seems like I cannot get the rules to create the .obj and
+          .shobj directories right.  This last iteration seems to be
+          happier, it works fine with parallel builds, it works fine for
+          static and shared libraries, it does not recompile everything
+          just because the .obj or .shobj directories changed, it creates
+          the Templates.DB file when needed.
+          The only problem that I'm aware off is that it can potentially
+          produce a warning on parallel builds: two separate rules can try
+          to create the .obj directory simultaneously, adding a dependency
+          to have only one rule do it results in full-recompilations when
+          a .obj directory is modified for whatever reason.
+          I'm using ACE_NUL_STDERR to avoid such warnings, and it seems to
+          work correctly.
+
+Thu Nov  9 10:14:06 2000  Jeff Parsons  <parsons@cs.wustl.edu>
+
+        * include/makeinclude/ace_flags.bor:
+
+          Added the line
+
+          TAO_DYNAMICINTERFACE_LIB =
+            $(CORE_BINDIR)\TAO_DynamicInterface$(LIB_DECORATOR).lib
+
+          that I had overlooked when doing the BCB makefile changes
+          related to the DynamicInterface library. Thanks to
+          Johnny Willemsen <Johnny.Willemsen@meco.nl> for sending
+          in the patch.
+
+
+Wed Nov  8 16:11:11 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Membership_Test.cpp:
+          Remove unused variables
+
+        * bin/make_pretty.pl:
+          Add regular expression to detect more linker errors.
+
+Wed Nov  8 14:10:20 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/client.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/server.cpp:
+        * examples/RMCast/Send_File/Sender.cpp:
+        * examples/Reactor/Misc/test_event_handler_t.cpp:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h:
+          We must explicitly #include "ace/Log_Msg.h", unfortunately the
+          errors were only detected on platforms that do not define
+          ACE_TEMPLATES_REQUIRE_SOURCE.
+
+        * include/makeinclude/rules.local.GNU:
+          More fine tuning, the Templates.DB directory must be created by
+          the Makefile because SunCC 4.2 generates a warning if it is not
+          present.
+
+Wed Nov  8 14:40:25 2000  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/config-all.h
+
+          Fix a build problem on HP-UX 11.00 with aCC A.03.25.  The macro
+          used to determine the use of the std namespace changed from
+          RWSTD_NO_NAMESPACE to _NAMESPACE_STD.  NOTE: I did preserve the
+          check for RWSTD_NO_NAMESPACE with aCC versions less than A.03.25.
+
+Wed Nov  8 10:27:00 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/generate_doxygen.pl:
+          Automates the invocation of doxygen. It modifies the doxygen
+          templates in $ACE_ROOT/etc and creates the right directory
+          hierarchy to receive the files.
+
+        * ace/config-doxygen.h:
+          Configuration file used to generate the doxygen files.
+          Notice that this is not a valid configuration for any platform,
+          for example, it enables both the Win32 and the POSIX AIO calls.
+
+        * etc/ace.doxygen:
+        * etc/ace_rmcast.doxygen:
+        * etc/ace_ssl.doxygen:
+        * etc/tao.doxygen:
+        * etc/tao_dynamicany.doxygen:
+        * etc/tao_dynamicinterface.doxygen:
+        * etc/tao_esf.doxygen:
+        * etc/tao_iormanip.doxygen:
+        * etc/tao_iortable.doxygen:
+        * etc/tao_portableserver.doxygen:
+        * etc/tao_rtevent.doxygen:
+          Minor mods to make the generate_doxygen.pl job easier.
+
+Wed Nov  8 09:02:10 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * apps/Gateway/Gateway/Makefile:
+        * apps/Gateway/Peer/Makefile:
+        * examples/Timer_Queue/Makefile:
+        * examples/Service_Configurator/IPC-tests/server/Makefile:
+        * examples/Service_Configurator/Misc/Makefile:
+          When generating a library and a binary that uses it in the same
+          Makefile we must add explicit dependency between them, otherwise
+          parallel builds can fail.
+
+        * apps/JAWS/server/HTTP_Helpers.cpp:
+        * examples/IPC_SAP/FILE_SAP/client.cpp:
+        * examples/Naming/test_multiple_contexts.cpp:
+        * examples/Threads/thread_specific.cpp:
+        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp:
+          Fixed warnings about mismatches between printf-like strings and
+          their arguments.
+
+Wed Nov  8 02:57:15 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * Local_Name_Space.cpp:
+        * Local_Name_Space.h:
+
+          Conversion between ACE_WString and ACE_NS_String depended on
+          ACE_WString storing two byte char's (because it was using
+          fast_rep ())  Changed to ushort_rep (), but this required
+          ACE_NS_String to clean up the string once it is done.  Added
+          a destructor and a flag to ACE_NS_String for this purpose.
+
+Tue Nov  7 11:47:42 2000 Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/Cached_Accept_Conn_Test.cpp:
+        * tests/Cached_Conn_Test.cpp:
+        * tests/Collection_Test.cpp:
+
+          Protected some of the explicit template instantiations with #if's
+          to make sure we don't get duplicate ones with ACE_INT32 == int
+          (since ACE_HANDLE and DATA are also int in some configurations).
+
+Tue Nov  7 09:04:15 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/RMCast/RMCast.h:
+          Undefine macro MT_DATA if defined already.
+
+Tue Nov  7 09:00:08 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          By default build everything under ACE_wrappers and
+          ACE_wrappers/TAO, we used to build just a subset of ACE.
+          We need to provide full coverage because this script is
+          replacing all nightly builds, if auto_compile does not test it,
+          nothing will.
+
+        * bin/show_log_dir.pl:
+          The script was removing the second and third most recent logs
+          from the list, this used to be required to remove the brief and
+          html files, but now we filter those earlier on the script.
+
+Mon Nov  6 16:23:56 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+        * tests/RMCast/RMCast_Retransmission_Test.cpp:
+          Fixed warnings reported by DU/CXX
+
+Sun Nov  5 17:23:55 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * etc/ace.doxygen:
+        * etc/ace_rmcast.doxygen:
+        * etc/ace_ssl.doxygen:
+        * etc/tao.doxygen:
+        * etc/tao_dynamicany.doxygen:
+        * etc/tao_dynamicinterface.doxygen:
+        * etc/tao_esf.doxygen:
+        * etc/tao_iormanip.doxygen:
+        * etc/tao_iortable.doxygen:
+        * etc/tao_portableserver.doxygen:
+        * etc/tao_rtevent.doxygen:
+          Commit doxygen templates, I'm still writing the script to use
+          them effectively.
+
+Sun Nov  5 14:37:13 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Make log files world readable, under Solaris they are created
+          with 600 mode by default.
+
+Sun Nov  5 14:05:13 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/create_vt_dsps.pl:
+        * tests/version_tests/Atomic_Op_Test.dsp:
+        * tests/version_tests/Auto_IncDec_Test.dsp:
+        * tests/version_tests/Barrier_Test.dsp:
+        * tests/version_tests/Basic_Types_Test.dsp:
+        * tests/version_tests/Buffer_Stream_Test.dsp:
+        * tests/version_tests/CDR_Array_Test.dsp:
+        * tests/version_tests/CDR_File_Test.dsp:
+        * tests/version_tests/CDR_Test.dsp:
+        * tests/version_tests/Cache_Map_Manager_Test.dsp:
+        * tests/version_tests/Cached_Accept_Conn_Test.dsp:
+        * tests/version_tests/Cached_Conn_Test.dsp:
+        * tests/version_tests/Capabilities_Test.dsp:
+        * tests/version_tests/Collection_Test.dsp:
+        * tests/version_tests/Conn_Test.dsp:
+        * tests/version_tests/DLL_Test.dsp:
+        * tests/version_tests/DLList_Test.dsp:
+        * tests/version_tests/Dynamic_Priority_Test.dsp:
+        * tests/version_tests/Enum_Interfaces_Test.dsp:
+        * tests/version_tests/Env_Value_Test.dsp:
+        * tests/version_tests/Future_Set_Test.dsp:
+        * tests/version_tests/Future_Test.dsp:
+        * tests/version_tests/Handle_Set_Test.dsp:
+        * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp:
+        * tests/version_tests/Hash_Map_Manager_Test.dsp:
+        * tests/version_tests/High_Res_Timer_Test.dsp:
+        * tests/version_tests/IOStream_Test.dsp:
+        * tests/version_tests/Lazy_Map_Manager_Test.dsp:
+        * tests/version_tests/MM_Shared_Memory_Test.dsp:
+        * tests/version_tests/MT_Reactor_Timer_Test.dsp:
+        * tests/version_tests/MT_SOCK_Test.dsp:
+        * tests/version_tests/Malloc_Test.dsp:
+        * tests/version_tests/Map_Manager_Test.dsp:
+        * tests/version_tests/Map_Test.dsp:
+        * tests/version_tests/Mem_Map_Test.dsp:
+        * tests/version_tests/Message_Block_Test.dsp:
+        * tests/version_tests/Message_Queue_Notifications_Test.dsp:
+        * tests/version_tests/Message_Queue_Test.dsp:
+        * tests/version_tests/Naming_Test.dsp:
+        * tests/version_tests/New_Fail_Test.dsp:
+        * tests/version_tests/Notify_Performance_Test.dsp:
+        * tests/version_tests/OS_Test.dsp:
+        * tests/version_tests/Object_Manager_Test.dsp:
+        * tests/version_tests/OrdMultiSet_Test.dsp:
+        * tests/version_tests/Pipe_Test.dsp:
+        * tests/version_tests/Priority_Buffer_Test.dsp:
+        * tests/version_tests/Priority_Reactor_Test.dsp:
+        * tests/version_tests/Priority_Task_Test.dsp:
+        * tests/version_tests/Process_Manager_Test.dsp:
+        * tests/version_tests/Process_Mutex_Test.dsp:
+        * tests/version_tests/Process_Strategy_Test.dsp:
+        * tests/version_tests/RB_Tree_Test.dsp:
+        * tests/version_tests/Reactor_Exceptions_Test.dsp:
+        * tests/version_tests/Reactor_Notify_Test.dsp:
+        * tests/version_tests/Reactor_Performance_Test.dsp:
+        * tests/version_tests/Reactor_Timer_Test.dsp:
+        * tests/version_tests/Reactors_Test.dsp:
+        * tests/version_tests/Reader_Writer_Test.dsp:
+        * tests/version_tests/Recursive_Mutex_Test.dsp:
+        * tests/version_tests/Reverse_Lock_Test.dsp:
+        * tests/version_tests/SOCK_Connector_Test.dsp:
+        * tests/version_tests/SOCK_Send_Recv_Test.dsp:
+        * tests/version_tests/SOCK_Test.dsp:
+        * tests/version_tests/SPIPE_Test.dsp:
+        * tests/version_tests/SString_Test.dsp:
+        * tests/version_tests/SV_Shared_Memory_Test.dsp:
+        * tests/version_tests/Semaphore_Test.dsp:
+        * tests/version_tests/Service_Config_Test.dsp:
+        * tests/version_tests/Sigset_Ops_Test.dsp:
+        * tests/version_tests/Simple_Message_Block_Test.dsp:
+        * tests/version_tests/Svc_Handler_Test.dsp:
+        * tests/version_tests/TSS_Test.dsp:
+        * tests/version_tests/Task_Test.dsp:
+        * tests/version_tests/Thread_Manager_Test.dsp:
+        * tests/version_tests/Thread_Mutex_Test.dsp:
+        * tests/version_tests/Thread_Pool_Reactor_Test.dsp:
+        * tests/version_tests/Thread_Pool_Test.dsp:
+        * tests/version_tests/Time_Service_Test.dsp:
+        * tests/version_tests/Time_Value_Test.dsp:
+        * tests/version_tests/Timeprobe_Test.dsp:
+        * tests/version_tests/Timer_Queue_Test.dsp:
+        * tests/version_tests/Tokens_Test.dsp:
+        * tests/version_tests/UPIPE_SAP_Test.dsp:
+        * tests/version_tests/Upgradable_RW_Test.dsp:
+        * tests/version_tests/version_tests.dsw:
+
+          Updated to use the new ACE_AS_STATIC_LIBS macro.
+
+        * ace/Sample_History.cpp:
+        * ace/SSL/SSL_Context.cpp:
+        * ace/SSL/SSL_SOCK_Stream.i:
+
+          Fixed miscellaneous ACE_USES_UNICODE problems with ACE_LIB_TEXT.
+
+Sat Nov  4 19:33:39 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          Fixed the mail message, the path to the CGI script was garbled.
+
+        * include/makeinclude/rules.local.GNU:
+          My last fixed did not work for static builds, the SOLINK rules
+          got in the way.  It works correctly for both static and shared
+          builds now.
+
+Sat Nov  4 18:19:46 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/RMCast/RMCast_IO_UDP.cpp:
+        * ace/RMCast/RMCast_Reassembly.cpp:
+        * tests/Reactor_Notify_Test.cpp:
+          Add missing template instantiations, they only showed up in
+          builds with disabled inlining.
+
+Sat Nov  4 17:05:08 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/auto_compile:
+          New revision of the script.  It can copy log files directly to
+          the destination directory, and it also runs the make_pretty
+          script to generate both the HTML and HTML summary of the log.
+
+        * bin/show_log_dir.pl:
+          Corrections to the document and more fixes to make it Apache
+          friendly.
+
+        * include/makeinclude/rules.local.GNU:
+          Add special target to force the creation of the .shobj and .obj
+          directories, even with parallel builds.  The faster our
+          computers get the more often we get failures due to this
+          problem.
+
+Sat Nov  4 14:53:39 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * bin/make_pretty.pl:
+          This is a modified version of Darrell's script to beautify our
+          auto_compile logs.  This version works better with Unix builds
+          and is going to be invoked by bin/auto_compile to generate
+          summary logs.
+
+        * bin/show_log_dir.pl:
+          A CGI script to present all the logs for a particular builds in
+          a single page.  It is a modified version of Darrell's script,
+          but this time it works better on Unix web servers.
+
+Fri Nov  3 17:22:10 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/config-sunos5.5.h: Backed of changes given by Russ
+          Noseworthy through bug id #710. This was breaking SunCC5.0
+          builds.
+
+Fri Nov  3 09:41:20 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Membership_Test.cpp:
+          Fixed warning about variables possibly uninitialized before
+          their first use.  In fact the variables are initialized before
+          their first use, but the code flow is too complex for the
+          compiler to figure that out.
+
+Fri Nov  3 09:34:39 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Makefile:
+        * tests/Makefile:
+        * examples/Makefile:
+          Disable the RMCast builds for old versions of g++
+
+Thu Nov  2 12:11:43 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Name_Request_Reply.h:
+        * ace/Timer_Hash_T.h:
+        * ace/Map_Manager.h:
+        * ace/Log_Record.h:
+          Minor adjustments to make doxygen happier.
+
+Thu Nov  2 11:57:37 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Makefile:
+        * tests/Makefile:
+        * examples/Makefile:
+          Enable the RMCast library, tests and examples by default.
+
+Wed Nov  1 17:24:59 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+        * tests/RMCast/Makefile.bor:
+          Added Makefile, thanks to Christopher Kohlhoff
+          <chris@kohlhoff.com> and Johnny.Willemsen <Johnny.Willemsen@meco.nl>
+          for contributing.
+
+Wed Nov  1 14:11:48 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/*.h:
+          Change all the header files to generate better docs with
+          Doxygen.  Thanks to Darrell for his wonderful script to automate
+          this process.
+
+Tue Oct 31 19:01:19 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * netsvcs/lib/Client_Logging_Handler.cpp (handle_input): Added
+          a comment explaining why we don't go to heroic lengths to recv()
+          all the data if it fails after the second recv().  Thanks to
+          Steve Sivier <Steven.Sivier@Eng.Sun.COM> for motivating this.
+
+Tue Oct 31 14:21:11 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * bin/check_build_logs: sort the output file names, so
+          that guajira's cxx build shows up first (locally).
+          Limit total number of lines to 2000 to keep below
+          majordomo's size limit.
+
+Tue Oct 31 10:54:42 2000 Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Process.i:
+
+          Changed the CREATE_UNICODE_ENVIRONMENT section to be only
+          in ACE_WIN32 environments.
+
+Tue Oct 31 11:35:31 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/config-sunos5.5.h:
+        * ace/Log_Msg.cpp: Added patches provided by Russ. Bugzilla id 710.
+
+Tue Oct 31 08:14:33 2000  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * wrapper_macros.GNU:
+
+          Set defaults for exceptions, rtti, and fast to all be zero
+          (0),i.e., off.  Henceforth, if you're creating a new port and
+          you want exceptions to be on, you must explicitly have
+          "exceptions=1" in your platform_*.GNU file.
+
+        * platform_irix6.x_common.GNU:
+
+          Added an "exceptions=1" directive per the comment above.
+
+Mon Oct 30 18:56:33 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.cpp:
+        * ace/OS.h:
+        * ace/OS.i:
+
+          Changed several of the socket calls to use char instead
+          of ACE_TCHAR, seeing that no OS supports anything but char.
+          But I am keeping the ACE_TCHAR or dual char/wchar_t
+          interfaces on classes higher up the stream.
+
+          Methods changed are:
+
+          - gethostbyaddr
+          - gethostbyname
+          - gethostbyname2
+          - gethostbyaddr_r
+          - gethostbyname_r
+          - getprotobyname
+          - getprotobyname_r
+          - getservbyname
+          - getservbyname_r
+          - inet_addr
+          - inet_ntoa
+          - inet_aton
+          - inet_ntop
+          - inet_pton
+
+          This should take care of a couple of things.  First we don't
+          have to worry about returning a wchar_t * static buffer
+          instead of a char * static buffer from something like
+          inet_ntoa and this should remove some slowdowns reported from
+          gethostbyname.  Thanks to Nick Pratt <npratt@microstrategy.com>
+          for reporting both of these.
+
+        * ace/INET_Addr.cpp:
+        * ace/INET_Addr.h:
+        * ace/INET_Addr.i:
+
+          Fixed references to interface changes and added dual
+          char/wchar_t interfaces to replace some ACE_TCHAR ones.
+
+        * ace/MEM_Addr.cpp:
+        * ace/MEM_Addr.h:
+        * ace/MEM_Addr.i:
+
+          Changed get_host_name and get_host_name to return char *
+
+        * ace/SOCK_Dgram_Mcast.cpp:
+        * ace/SOCK_Dgram_Mcast_QoS.cpp:
+
+          Fixed all the references to the interface changes.
+
+        * ace/Object_Manager.cpp:
+
+          Added ERROR to the output for AV's and Unhandled Exceptions.
+
+Mon Oct 30 18:51:40 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * examples/IPC_SAP/SSL_SAP/SSL-client.dsp:
+        * examples/IPC_SAP/SSL_SAP/SSL-server.dsp:
+
+          Removed hardcoded OpenSSL include directories.
+
+        * ace/ssl/SSL_Context.cpp:
+        * ace/ssl/SSL_Context.h:
+        * ace/ssl/SSL_SOCK.cpp:
+        * ace/ssl/SSL_SOCK_Acceptor.cpp:
+        * ace/ssl/SSL_SOCK_Acceptor.h:
+        * ace/ssl/SSL_SOCK_Connector.cpp:
+        * ace/ssl/SSL_SOCK_Connector.h:
+        * ace/ssl/SSL_SOCK_Connector.i:
+        * ace/ssl/SSL_SOCK_Stream.cpp:
+        * ace/ssl/SSL_SOCK_Stream.h:
+        * ace/ssl/SSL_SOCK_Stream.i:
+
+          Removed the ACE_HAS_SSL #ifdefs, since ACE_SSL is a
+          separate library, so it isn't really needed.
+
+Mon Oct 30 16:34:33 2000  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * include/makeinclude/platform_vxworks5.x_g++.GNU:
+
+        More exceptions/fast/rtti canonicalization fixes.  Thanks again,
+        Carlos.
+
+Mon Oct 30 11:56:13 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Makefile.am:
+        * ace/Makefile.bor:
+          Add missing files to the Borland and Automake makefiles.
+
+Mon Oct 30 11:38:07 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+        * ace/Basic_Stats.cpp:
+        * ace/Basic_Stats.inl:
+        * ace/Sample_History.cpp:
+        * ace/Stats.cpp:
+          Fixed problems on platforms that lack 64-bit integers.
+
+Mon Oct 30 11:10:26 2000  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * include/makeinclude/platform_linux.GNU:
+        * include/makeinclude/platform_chorus_ghs.GNU:
+
+        The change to canonicalize the values used for
+        exceptions/fast/rtti caused the default for "exceptions" on these
+        two platforms to change from exceptions off to exceptions on.
+        There may be others, but without access to the compiler itself
+        it's hard to tell what the default behavior is for the compiler
+        and thus set the value for exceptions/rtti/fast accordingly.
+
+        Thanks to Carlos O'Ryan <coryan@uci.edu> for pointing this out.
+
+Mon Oct 30 00:57:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/OS_Test.cpp:
+
+          Was a bit overzealous on a previous [] to * change,
+          so switched one back to [] to remove a segfault
+          with the strncmp section.
+
+Sun Oct 29 23:46:54 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ace_wchar.h:
+
+          Removed the definitions for LPTSTR and LPCTSTR. They
+          will need to be defined outside of ace or in config.h
+          to be made available on other platforms.  Here is a
+          sample block which can be added to a non-Win32 config.h:
+
+          typedef char *LPSTR;
+          typedef const char *LPCSTR;
+          typedef wchar_t *LPWSTR;
+          typedef const wchar_t *LPCWSTR;
+
+          #if defined (UNICODE)
+          typedef const wchar_t *LPCTSTR;
+          typedef wchar_t *LPTSTR;
+          typedef wchar_t TCHAR;
+          #define __TEXT(literal) L##literal
+          #else
+          typedef const char *LPCTSTR;
+          typedef char *LPTSTR;
+          typedef char TCHAR;
+          #define __TEXT(literal) literal
+          #endif
+
+          #define TEXT(literal) __TEXT(literal)
+
+        * ace/config-vxworks5.x.h:
+
+          Added ACE_LACKS_WCSDUP.
+
+Sun Oct 29 01:59:11 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/doxygen-convert-h.pl: (added)
+
+          New script to convert old header files to new doxygen
+          style commented files.  Works well, but some things
+          do throw it for a loop, be sure to check output before
+          checking in.
+
+Sat Oct 28 15:02:40 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Stats.h:
+          Cosmetic fixes to make doxygen happier.
+
+Fri Oct 27 17:21:56 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/OS_Test.cpp:
+
+          Darrell learned how to use strtok_r properly.  'nuff said.
+
+Fri Oct 27 17:04:02 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/OS_Test.cpp:
+
+          Changed the arrays ([]) to array pointers (*) since the
+          pointer arithmatic I do doesn't seem to work with the
+          arrays.
+
+Fri Oct 27 15:45:57 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+          Add the new files to the MSVC projects.
+
+Fri Oct 27 15:02:56 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Makefile:
+        * ace/Makefile.am:
+        * ace/Makefile.bor:
+        * ace/Sample_History.h:
+        * ace/Sample_History.inl:
+        * ace/Sample_History.cpp:
+          Add new class to keep a full history of all the samples in a
+          performance test.
+
+        * ace/Basic_Stats.h:
+        * ace/Basic_Stats.inl:
+        * ace/Basic_Stats.cpp:
+        * ace/Stats.h:
+        * ace/Stats.cpp:
+          Refactor code to compute minimum, maximum, average and jitter
+          into its own class.  It used to be part of ACE_Througthput_Stats
+
+        * performance-tests/TCP/Makefile:
+        * performance-tests/TCP/tcp_test.cpp:
+          Use the new ACE_Sample_History class.
+
+Fri Oct 27 12:04:17 2000  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * platform_chorus.GNU:
+        * platform_chorus4.x_g++.GNU:
+        * platform_chorus_ghs.GNU:
+        * platform_cray.GNU:
+        * platform_hpux_kcc.GNU:
+        * platform_linux_cxx.GNU:
+        * platform_osf1_4.0.GNU:
+        * platform_sunos5_ghs.GNU:
+        * platform_sunos5_kcc.GNU:
+        * platform_sunos5_sunc++.GNU:
+        * platform_vxworks5.x_diab.GNU:
+        * platform_vxworks5.x_g++.GNU:
+        * wrapper_macros.GNU:
+
+          Changed the way that 'rtti', 'exceptions', and 'fast' makeflags
+          get processed in wrapper_macros.GNU.  There was a discrepancy
+          between the "command line" value and the "platform_macros file"
+          value each needed in order to turn the feature off, e.g., zero
+          on the command line and "null" in the file.  After
+          investigation, the discrepancy seemed to be without reason, so
+          I've canonicalized them.  You can now put "exceptions=0" on
+          either the command line OR in the platform_macros.GNU file.
+
+Fri Oct 27 10:51:26 2000  Steve Huston  <shuston@riverace.com>
+
+        * tests/Reactor_Notify_Test.cpp: Moved definition of 'int status'
+          outside the auto_ptr-scoping block.
+
+Fri Oct 27 02:06:29 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+        * ace/OS.cpp:
+        * ace/OS.i:
+
+          Fixed some warnings due to int ace_result_ declared for NT.
+
+Thu Oct 26 22:18:42 2000  Alex Arulanthu <Alex.Arulanthu@sylantro.com>
+
+        * ace/Log_Msg.h:
+        * ace/Log_Msg.cpp:
+        * ace/Service_Config.h:
+        * ace/Service_Config.cpp:
+        * ace/Service_Config.i:
+
+          Setting the right default values for process and thread level
+          priority masks. I had already talk to Steve H about this
+          change. I just forgot to get this in.
+
+Thu Oct 26 14:04:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS.h:
+
+          Reverted Doug's change which defined ACE_MAX_USERID to
+          L_cuserid on all platforms.  It ended up that this
+          is only valid on Windows when _POSIX_ is defined.
+
+Thu Oct 26 11:20:43 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/RMCast/RMCast_IO_UDP.cpp:
+        * ace/RMCast/RMCast_Reassembly.cpp:
+        * tests/CDR_Array_Test.cpp:
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Membership_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+        * tests/RMCast/RMCast_Reordering_Test.cpp:
+        * tests/RMCast/RMCast_Retransmission_Test.cpp:
+        * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp:
+
+          The usual additions of ACE_TEXT to make ACE_USES_WCHAR builds
+          happy.
+
+Thu Oct 26 12:19:45 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Memory_Pool.cpp (unmap): Fixed a bug that was preventing
+          the handle from being closed.  Thanks to Ivan Murphy and Dieter
+          Quehl for reporting this.
+
+Thu Oct 26 10:56:36 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS.i (ACE_OS::rename): Added && (ACE_HAS_WINNT4 == 1) to the
+          defined (ACE_HAS_WINNT4) to avoid this code section on Win95/98.
+
+Thu Oct 26 07:39:22 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+          ace/OS.h: Added a new macro called ACE_MAX_USERID that is 32 on
+          Win32 and L_cuserid on other platforms.
+
+        * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp,
+          examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp,
+          examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp,
+          examples/Service_Configurator/IPC-tests/server/Handle_R_Stream:
+          Fixed the calls to cuserid() so they don't pass in 0, but
+          instead pass in a buffer of size ACE_MAX_USERID.  This fixes a
+          problem that occurs on WinNT.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for pointing this out.
+
+        * tests/Reactor_Notify_Test.cpp: Fixed an unused args warning
+          and also added the use of auto_ptr to ensure that dynamic memory
+          is deleted no matter what return path is taken.
+
+Thu Oct 26 04:00:00 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+        * ace/OS.h:
+        * ace/OS.i:
+        * ace/OS.cpp:
+        * ace/OS_Dirent.inl:
+          Fixing more ACE_HAS_PACE over NT. Most fixes just skip the
+          PACE call. NT doesn't implement much of posix and so
+          many ACE calls will skip pace until PACE/WINNT emulates
+          more posix functionality.
+
+Wed Oct 25 20:38:33 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/SSL/ACE_SSL.dsp:
+
+          Removed the include/lib directories put here.  Instead
+          we rely on the fact that OpenSSL should be in
+          DevStudio's global include and library directories.
+
+Wed Oct 25 13:20:24 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * tests/Purgable_Map_Manager_Test: Removed this deprecated test.
+          The following files were effected:
+
+          - Makefile.am
+          - icc.bat
+          - t.icc
+
+          These files were removed:
+
+          - Purgable_Map_Manager_Test.cpp
+          - Purgable_Map_Manager_Test.icc
+
+Wed Oct 25 11:24:42 2000  Darrell Brunsch  <brunsch@uci.edu>
+
+        * ace/adapter/README:  (removed)
+        * ace/adapter/ace/ACE.h:  (removed)
+        * ace/adapter/ace/ARGV.h:  (removed)
+        * ace/adapter/ace/ATM_Addr.h:  (removed)
+        * ace/adapter/ace/Arg_Shifter.h:  (removed)
+        * ace/adapter/ace/Capabilities.h:  (removed)
+        * ace/adapter/ace/DEV_Addr.h:  (removed)
+        * ace/adapter/ace/DLL.h:  (removed)
+        * ace/adapter/ace/Dirent.h:  (removed)
+        * ace/adapter/ace/Dynamic_Service.h:  (removed)
+        * ace/adapter/ace/FIFO.h:  (removed)
+        * ace/adapter/ace/FIFO_Recv.h:  (removed)
+        * ace/adapter/ace/FIFO_Recv_Msg.h:  (removed)
+        * ace/adapter/ace/FIFO_Send.h:  (removed)
+        * ace/adapter/ace/FIFO_Send_Msg.h:  (removed)
+        * ace/adapter/ace/FILE_Addr.h:  (removed)
+        * ace/adapter/ace/Functor.h:  (removed)
+        * ace/adapter/ace/High_Res_Timer.h:  (removed)
+        * ace/adapter/ace/INET_Addr.h:  (removed)
+        * ace/adapter/ace/MEM_Addr.h:  (removed)
+        * ace/adapter/ace/Malloc_T.h:  (removed)
+        * ace/adapter/ace/Memory_Pool.h:  (removed)
+        * ace/adapter/ace/OS.h:  (removed)
+        * ace/adapter/ace/OS_Dirent.h:  (removed)
+        * ace/adapter/ace/OS_String.h:  (removed)
+        * ace/adapter/ace/SOCK_Dgram_Bcast.h:  (removed)
+        * ace/adapter/ace/SOCK_Dgram_Mcast.h:  (removed)
+        * ace/adapter/ace/SOCK_Dgram_Mcast_QoS.h:  (removed)
+        * ace/adapter/ace/SPIPE_Addr.h:  (removed)
+        * ace/adapter/ace/Service_Config.h:  (removed)
+        * ace/adapter/ace/Service_Object.h:  (removed)
+        * ace/adapter/ace/Stats.h:  (removed)
+        * ace/adapter/ace/System_Time.h:  (removed)
+        * ace/adapter/ace/Task_T.h:  (removed)
+        * ace/adapter/ace/Trace.h:  (removed)
+
+          The adapter classes were removed since they were
+          not ready for prime time and their main purpose was
+          invalidated.  If need be, they can be brought back in
+          the future.
+
+Wed Oct 25 12:26:25 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+        * ace/RMCast/RMCast_UDP_Reliable_Sender.cpp:
+          Yet another missing #include
+
+Wed Oct 25 09:50:48 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/RMCast/RMCast_IO_UDP.h:
+        * ace/RMCast/RMCast_IO_UDP.cpp:
+        * ace/RMCast/RMCast_UDP_Reliable_Receiver.h:
+        * ace/RMCast/RMCast_UDP_Reliable_Receiver.i:
+        * ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp:
+        * ace/RMCast/RMCast_UDP_Reliable_Sender.h:
+        * ace/RMCast/RMCast_UDP_Reliable_Sender.i:
+        * examples/RMCast/Send_File/Makefile:
+        * examples/RMCast/Send_File/Sender.cpp:
+        * examples/RMCast/Send_File/Receiver.cpp:
+          Change several open() methods to init() because the base class
+          already has a virtual open() method, but with a different
+          signature, some compilers generate warnings when this happens.
+          Add #include required in platforms that do not define
+          ACE_TEMPLATES_REQUIRE_SOURCE
+
+Wed Oct 25 09:32:10 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Object_Manager.cpp:
+
+          Changed to only use the CRT_ERROR disabling under
+          ACE_DISABLE_WIN32_ERROR_WINDOWS when _DEBUG is defined,
+          since crtdbg.h is only included by ACE when _DEBUG is
+          defined.
+
+Wed Oct 25 10:51:26 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/Select_Reactor_Base.cpp (purge_pending_notifications): Added
+          ACE_UNUSED_ARG (eh) for the non-ACE_HAS_REACTOR_NOTIFICATION_QUEUE
+          case to quiet g++'s unused argument warning.
+
+Tue Oct 24 23:14:55 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS_String.cpp:
+        * ace/config-win32-borland.h:
+
+          Added ACE_LACKS_WCSDUP to do something similar to
+          ACE_HAS_STRDUP_EMULATION.  Added this to Borland's config,
+
+          Also fixed several warnings in OS_String's emulation
+          functions that show up with g++.
+
+        * ace/Object_Manager.cpp:
+
+          Added code in the Object Manager to disable some of the
+          error windows that pops up in Win32 apps.  If
+          ACE_DISABLE_WIN32_ERROR_WINDOWS is defined, then
+          ACE_ASSERT's and Access Violations will not pop up
+          error box's anymore.  This was mainly added for auto
+          build purposes.
+
+        * ace/Select_Reactor_Base.cpp:
+
+          Changed ACE_TEXT's to ACE_LIB_TEXT.
+
+        * ace/WFMO_Reactor.cpp:
+
+          In ACE_WFMO_Reactor_Notify::purge_pending_notifications
+          there was an instance of this type of code:
+
+          for (size_t index = 0; index < ....)
+          ...
+          for (index = 0; index ....)
+
+          On Borland, the index is scoped within the for loop, so
+          the second use of it produces an error.  I moved the
+          declaration outside of the loop to fix this.
+
+Tue Oct 24 23:40:33 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * tests/SString_Test.cpp (main): Added tests for string
+          assignments.
+
+Tue Oct 24 19:30:16 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/Select_Reactor_Base.cpp (purge_pending_notifications): Correct
+          erroneous use of 'index' as a variable when it's also a function.
+
+Tue Oct 24 13:54:49 2000  Ossama Othman  <ossama@uci.edu>
+
+        * ace/Makefile (TEMPLATE_FILES):
+
+          Added missing Test_and_Set source file to the list.
+
+        * ace/Makefile.am (libACE_Utils_la_SOURCES, HEADER_FILES,
+          INLINE_FILES, TEMPLATE_FILES):
+
+          Updated these lists of sources with the newly added sources.
+
+Tue Oct 24 12:30:47 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/Reactor.h (ACE_Reactor):
+        * ace/Reactor_Impl.h (ACE_Reactor_Notify and ACE_Reactor_Impl):
+        * ace/Select_Reactor_Base.h (ACE_Select_Reactor_Notify and
+          ACE_Select_Reactor_Impl):
+        * ace/WFMO_Reactor.h (ACE_WFMO_Reactor_Notify and ACE_WFMO_Reactor):
+          Added new function, purge_pending_notifications (ACE_Event_Handler *)
+
+        * ace/Reactor.i (ACE_Reactor):
+        * ace/Select_Reactor_Base.i (ACE_Select_Reactor_Impl):
+          Added implementation of purge_pending_notifications that forwards
+          the call on to the proper implementation/handler object.
+
+        * ace/Select_Reactor_Base.cpp (ACE_Select_Reactor_Notify): Added
+          implementation of purge_pending_notifications. Works when
+          ACE_HAS_REACTOR_NOTIFICATION_QUEUE is defined. Else it does
+          ACE_NOTSUP_RETURN.
+
+        * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor, ACE_WFMO_Reactor_Notify):
+          Added implementation of purge_pending_notifications.
+
+        Thanks to Edan Ayal <edana@bandwiz.com> for supplying the code for
+        this new feature.
+
+        * ace/Reactor.i (notify): Set the event handler's reactor pointer if
+          it doesn't already have one. Enables the event handler to purge
+          its notifications upon destruction.
+
+        * ace/Event_Handler.cpp (~ACE_Event_Handler): Call reactor's
+          purge_pending_notifications function to avoid delivering notifies
+          to a deleted handler.
+
+        * tests/Reactor_Notify_Test.cpp: Added the run_notify_purge_test
+          function to exercise the above new purge_pending_notifications.
+
+Tue Oct 24 12:05:42 2000  Darrell Brunsch  <brunsch@uci.edu>
+
+        * ace/OS_String.inl:
+
+          Removed an extra } after an #endif that was producing
+          warnings on OSF.
+
+Tue Oct 24 09:27:04 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/Test_and_Set.cpp:
+          Removed the repeated inclusion of the header file.
+          Thanks to Darrell.
+
+Tue Oct 24 03:24:42 2000  Darrell Brunsch  <brunsch@uci.edu>
+
+        * ace/Basic_Types.h:
+        * ace/config-win32-common.h:
+
+          Moved the code that defines ACE_SIZEOF_WCHAR to the config file,
+          so it is easier to add it to other platforms.
+
+        * ace/config-linux-common.h:
+
+          Added ACE_SIZEOF_WCHAR, ACE_LACKS_ITOW, ACE_LACKS_WCSICMP, and
+          ACE_LACKS_WCSNICMP definitions.
+
+        * ace/Synch.h:
+
+          Moved the ACE_LEGACY_MODE includes further down in the file.  It
+          was producing errors the way it was, since Test_and_Set needed
+          the Guard classes defined before it was included.
+
+Mon Oct 23 15:31:52 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Malloc_Allocator.cpp:
+          Yet another calloc() method that was declared but not defined.
+
+Mon Oct 23 11:37:06 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/Init_ACE.cpp:
+          Removed the semicolon at the end of ACE_RCSID.
+
+Mon Oct 23 11:20:53 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Malloc_T.i:
+          Add missing function, now things actually link.
+
+Mon Oct 23 10:02:36 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Malloc_T.h:
+          Add missing prototype, now the code actually compiles.
+
+Mon Oct 23 10:59:21 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/OS_String.cpp: Fixed a compile error in gcc 2.95.2.
+
+        * ace/Cached_Connect_Strategy_T.h
+        * ace/Cached_Connect_Strategy_T.cpp: Added fixes provided by Edan
+          Ayal <edana@bandwiz.com>.
+
+Mon Oct 23 08:37:49 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Malloc_T.{h,cpp}
+        * ace/Malloc_Base.h,
+        * ace/Malloc_Allocator.{h,cpp}: Added a new calloc() method that
+          has the same (default) signature as the one in the C/C++
+          standard library.  Thanks to Shourya Sarcar
+          <Shourya.Sarcar@geind.ge.com> for reporting this.
+
+        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp (handle_input):
+          Fixed a mistake where we were calling release() via a NULL
+          pointer!  Thanks to Pedro Brandao <pbrandao@inescn.pt> for
+          reporting this.
+
+Sun Oct 22 18:01:34 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS_String.cpp:
+
+          strtok_r_emulation wasn't protected by #if !defined
+          (ACE_HAS_REENTRANT_FUNCTIONS).
+
+Sun Oct 22 17:30:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ACE.i:
+
+          wcslen was used directly here, changed it to
+          ACE_OS_String::strlen.
+
+        * ace/ace_wchar.inl:
+
+          Moved around some of the inline functions to
+          remove warnings.
+
+        * ace/config-vxworks5.x.h:
+
+          Added all the ACE_LACKE_WCS* that VxWorks needs.
+
+Sun Oct 22 17:22:32 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/OS_Test.cpp:
+
+          Borland complained about memchr (NULL, ...), since
+          it couldn't figure out whether to use the void * or
+          const void* verison of ACE_OS_String::memchr.
+          Added an explicit cast to help out.
+
+Sun Oct 22 17:09:26 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/MT_SOCK_Test.cpp:
+
+          Missed an ACE_ALPHABET in a previous checkin.
+
+          And based on this part of the description in the file:
+
+          "Note that most of the connections will fail since
+           we're overrunning the size of the listen queue for
+           the acceptor-mode socket."
+
+          I changed the connection_failed ACE_ERROR_RETURN to an
+          ACE_DEBUG and return. Now it will not show up as an error
+          via run_test.pl.
+
+Sun Oct 22 16:32:24 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/OS_String.cpp:
+        * ace/OS_String.h:
+        * ace/OS_String.inl:
+        * ace/config-linux-common.h:
+
+          Renamed ACE_HAS_SAFE_WCSTOK to ACE_LACKS_WCSTOK to be
+          consistent with the rest of the ACE_LACKS_WCS* macros.
+
+          Fixed a signature for wcsncmp_emulation, as it was taking
+          in const wchar_t as the first arg instead of const
+          wchar_t *.
+
+          Added wcscspn_emulation and an implementation for
+          wcsncmp_emulation.
+
+Sun Oct 22 15:35:38 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Makefile.bor:
+
+          Changed ACE_Sock_Connect.obj to Sock_Connect.obj, since
+          it appears that it has been renamed.
+
+Sun Oct 22 15:07:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ace_dll.dsp:
+
+          While playing with doxygen, I found some old .h files listed
+          in the project but no longer existed.  Removed these.
+
+        * ace/OS_String.cpp:
+        * ace/OS_String.h:
+        * ace/OS_String.inl:
+
+          Added quite a few emulation macros for wcs* functions that
+          often do not exist on platforms.  Since these wcs* functions
+          just play with wchar_t's, they are not difficult to put in.
+          Some, such as to_upper and strtod/l/ul are more difficult,
+          so they are not present on platforms without support for
+          them.
+
+          Also updated the docs to doxygen style.  Someday I'll get
+          around to writing a script to do this...
+
+        * ace/config-win32-borland.h:
+        * ace/config-win32-msvc.h:
+
+          Added a couple of macros:
+          - ACE_HAS_STRCASECMP_EQUIVALENT
+          - ACE_HAS_STRNCASECMP_EQUIVALENT
+          - ACE_ITOA_EQUIVALENT
+
+          These are used to specify different names for functions
+          that differ in names across different compilers.
+
+        * tests/OS_Test.cpp:
+
+          Added tests to test OS_String methods so I can make sure
+          the emulations work.
+
+        * tests/Buffer_Stream_Test.cpp:
+        * tests/Conn_Test.cpp:
+        * tests/MM_Shared_Memory_Test.cpp:
+        * tests/Mem_Map_Test.cpp:
+        * tests/Priority_Buffer_Test.cpp:
+        * tests/Priority_Reactor_Test.cpp:
+        * tests/Reactor_Performance_Test.cpp:
+        * tests/SOCK_Test.cpp:
+        * tests/SPIPE_Test.cpp:
+        * tests/test_config.h:
+
+          In order to get the test_config.h to work when a project
+          has more than one .cpp file that includes it (and some
+          compilers give warnings about a static char[]) I moved
+          ACE_ALPHABET into the tests that need it.  Also I changed
+          it to a static const char[] in places that allowed it.
+
+          So it could be possible to move it back to test_config.h
+          now that it can be static const char[], but I'm not 100%
+          sure that will keep all compilers from complaining.
+
+        * tests/run_test.lst:
+
+          Added OS_Test to the list of tests run.
+
+Sun Oct 22 17:11:16 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * ace/Malloc_T.h: Added a default value of sizeof (T) to the
+          malloc() method of class ACE_Cached_Allocator.  Thanks to
+          Shourya Sarcar <Shourya.Sarcar@geind.ge.com> for reporting this.
+
+Sun Oct 22 10:08:31 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Makefile.bor:
+          Update file names for the ACE_ components.
+
+Sun Oct 22 08:57:33 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * tests/test_config.h: implemented these changes to remove
+          g++ warnings introduced by:
+
+          Thu Oct 19 13:17:41 2000  Darrell Brunsch <brunsch@uci.edu>
+
+          1) Moved ace_file_stream typedef to end of file.
+          2) Moved inline definition of ACE_Test_Output::output_file ()
+             to before first use.
+          3) Removed static qualifier from ACE_ALPHABET.
+
+Sat Oct 21 12:52:58 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * Makefile*:
+          Update dependencies.
+
+Fri Oct 20 20:46:37 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS.i (chdir): Added !defined (AIX) to the !defined (ACE_WIN32)
+          && defined (<Visual Age C++>) to get it to build clean on AIX.
+
+        * ace/ace-dll.icc: Added Base_Thread_Adapter, Thread_Adapter,
+          Flag_Manip, Handle_Ops, Init_ACE, Lib_Find, Sock_Connect,
+          OS_Log_Msg_Attributes, Malloc_Allocator, PI_Malloc,
+          Thread_Exit, Log_Msg_IPC, OS_Thread_Adapter, Log_Msg_Backend,
+          Thread_Control (h and cpp).
+
+        * ace/Handle_Ops.cpp:
+        * ace/PI_Malloc.cpp: Corrected ACE_RCSID args.
+
+Fri Oct 20 16:38:55 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+          Update MSVC projects
+
+Fri Oct 20 16:23:40 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/ACE.h:
+          Modified to include the renamed files.
+
+Fri Oct 20 14:13:43 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/Sock_Connect.i:
+        * ace/Sock_Connect.h:
+        * ace/Sock_Connect.cpp:
+
+        * ace/Lib_Find.i:
+        * ace/Lib_Find.h:
+        * ace/Lib_Find.cpp:
+
+        * ace/Init_ACE.i:
+        * ace/Init_ACE.h:
+        * ace/Init_ACE.cpp:
+
+        * ace/Handle_Ops.i:
+        * ace/Handle_Ops.h:
+        * ace/Handle_Ops.cpp:
+
+        * ace/Flag_Manip.i:
+        * ace/Flag_Manip.h:
+        * ace/Flag_Manip.cpp:
+          Renamed the recently added ACE_* files as above to follow
+          the naming convention.
+
+        * ace/IPC_SAP.h:
+        * ace/IO_SAP.h:
+        * ace/FILE_Connector.cpp:
+        * ace/FILE_Addr.h:
+          Changed the include files to reflect the above change.
+
+        * ace/Makefile:
+          Added the new files and updated dependencies.
+
+Fri Oct 20 11:40:31 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/Makefile:
+          Updated dependencies.
+
+Fri Oct 20 02:52:17 2000  Marina Spivak  <marina@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added RTCORBA Server_Declared test.
+
+Thu Oct 19 18:02:54 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/OS_Log_Msg_Attributes.h :
+          Modified u_long to 'unsigned long' as the compiler was
+          complaining.
+
+Thu Oct 19 13:52:49 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Malloc_Allocator.cpp:
+        * ace/Naming_Context.cpp:
+        * ace/PI_Malloc.cpp:
+
+          Needed to change some ACE_TEXT's to ACE_LIB_TEXT.
+
+        * ace/OS.h:
+        * ace/OS_Log_Msg_Attributes.h:
+
+          Moved the definition of ACE_OSTREAM_TYPE from OS.h to
+          OS_Log_Msg_Attributes.h, since some include paths in
+          ACE_LEGACY_MODE needed it there.
+
+Thu Oct 19 13:17:41 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/run_test.pl:
+
+          Changed the method used to detect errors in a log file.  Since
+          the log contains the log message type (such as LM_ERROR),
+          I changed the detection to look for this.
+
+        * tests/ACE_Init_Test.cpp:
+
+          Added ACE_START_TEST and ACE_END_TEST so the run_test.pl
+          script won't think ACE_Init_Test failed.
+
+        * tests/test_config.h:
+
+          With the way ACE_ALPHABET and some functions were defined,
+          they would cause duplicate symbols if test_config.h was
+          included in more than one object file.  Changed them so
+          the symbols are static to the file.
+
+        * tests/Reactors_Test.cpp:
+
+          When the reactor was shutting down, it was returning a
+          information message with ACE_ERROR_RETURN.  Since it really
+          wasn't an error condition, changed this to a ACE_DEBUG
+          and return 0.
+
+        * tests/SOCK_Send_Recv_Test.cpp:
+
+          The test was checking errno without checking a return value.
+          As a result, it was getting an out-of-date errno and
+          incorrectly interpreted that as an error.  Fixed.
+
+Thu Oct 19 12:12:00 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/ACE_Lib_Find.h:
+
+          Added missing static specifier for the wchar version of
+          strrepl.
+
+Thu Oct 19 12:03:41 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * apps/JAWS2/HTTPU/HTTPU.DSP:
+        * apps/JAWS2/JAWS/jaws.dsp:
+
+          These two projects were placing their DLL's in the wrong
+          directory.
+
+Thu Oct 19 14:23:52 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/ace-dll.icc: Removed extraneous ',' from Win32 section.
+
+Thu Oct 19 12:08:45 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/Cached_Connect_Strategy_T.cpp: Fixed compile errors with old
+          g++.
+
+Thu Oct 19 09:56:44 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Basic_Types.h:
+          Must #include stdio.h for platforms that lack 'long long'
+
+Thu Oct 19 09:50:30 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Log_Msg.cpp:
+          Fixed problems during TSS cleanup, the ipc_backend_ object was
+          used after being destroyed. Apparently this only happens on some
+          platforms, but fortunately David's build detected the bug.
+
+Thu Oct 19 09:07:47 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/RMCast/RMCast_Copy_On_Write.h:
+          Fixed problem in 'friend' declaration, most compilers let it go
+          through, but not the newer gcc snapshots.  Thanks to Craig
+          Rodrigues <crodrigu@bbn.com> for providing this patch.
+
+Wed Oct 18 15:44:14 2000  Luther J Baker  <luther@cs.wustl.edu>
+
+        * OS.h:
+        * OS.i:
+        * OS.cpp:
+
+          Modifications to sem_open debugging ACE_HAS_PACE over NT.
+
+Wed Oct 18 09:45:12 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * ace/Cached_Connect_Strategy_T.h :
+        * ace/Cached_Connect_Strategy_T.cpp: Added some fixes provided by
+          Edan Ayal <edana@bandwiz.com>.
+
+Tue Oct 17 23:35:33 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * Don't use ACE_TSS_EMULATION by default with LynxOS 3.1.0
+          because it's not necessary, according to
+          Jessie Ragsdale <jessie.ragsdale@latuslw.com>, and breaks
+          split=1.  Jessie was able to create upo to 118 natvie TSS keys,
+          so the 3-key limit of LynxOS 3.0.0 has been removed in 3.1.0.
+          [Bug 701]
+
+Tue Oct 17 00:21:41 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h,
+          examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i,
+          examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h,
+          examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i,
+          examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h,
+          examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i,
+          examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h,
+          examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i,
+          examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h,
+          examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i:
+          Changed *::get_handle(), *::handle_input(), and
+          *::handle_close() to use ACE_HANDLE and ACE_INVALID_HANDLE
+          instead of int and -1.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for pointing this out.
+
+Mon Oct 16 14:05:13 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * ACE-INSTALL.html: removed spurious 3D characters from
+          VxWorks section.
+
+Mon Oct 16 11:17:08 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Makefile.am:
+          Fixed misnamed file.
+
+Mon Oct 16 11:07:34 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Log_Msg.cpp:
+          Fixed memory leak, or rather, make sure that the default Log_Msg
+          IPC backend is destroyed when the Log_Msg class is closed.
+
+        * ace/Object_Manager.cpp:
+          Fixed typo in #endif, the final comment was not really a
+          comment.
+
+Sun Oct 15 19:14:13 2000  Marina Spivak  <marina@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+          Excluded tests/RTCORBA/Client_Propagated from running in
+          Exceptions build since it's a linux build.
+
+Sat Oct 14 15:04:16 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.h:
+        * ace/Naming_Context.h:
+          Static services must be exported from the library, so they
+          require the right export directives.
+          Added a new ACE_STATIC_SVC_DECLARE_EXPORT() macro for that
+          purpose and use it for the Naming_Context.
+
+Sat Oct 14 09:55:43 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Makefile.bor:
+          Fixed typo in file name.
+
+Sat Oct 14 03:32:54 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/ACE_Flag_Manip.h:
+        * ace/Service_Templates.h:
+          Added a missing header file.
+
+Fri Oct 13 22:40:27 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+          Add new files to the project.
+
+        * ace/Log_Msg.cpp:
+          Fixed typo in management of structured exception handling
+          callbacks.
+
+Fri Oct 13 21:49:54 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Makefile:
+        * ace/Makefile.am:
+        * ace/Makefile.bor:
+          Add the new Log_Msg files to the Makefiles.
+
+        * ace/ACE_Lib_Find.cpp:
+          Add ACE_RCSID macro
+
+        * ace/config-all.h:
+        * ace/OS_Log_Msg_Attributes.h:
+        * ace/OS_Log_Msg_Attributes.inl:
+        * ace/OS_Log_Msg_Attributes.cpp:
+        * ace/Base_Thread_Adapter.h:
+        * ace/Base_Thread_Adapter.cpp:
+          We pre-allocate the Log_Msg attributes in the Thread_Adapter, to
+          minimize memory allocations during thread creation.
+
+        * ace/Log_Msg_Callback.h:
+        * ace/Log_Msg_Callback.cpp:
+          Move the Log_Msg callback interface to its own file.
+
+        * ace/Log_Msg_Backend.h:
+        * ace/Log_Msg_Backend.cpp:
+          Define the interface for Log_Msg backend strategies.
+
+        * ace/Log_Msg_IPC.h:
+        * ace/Log_Msg_IPC.cpp:
+          Implement a Log_Msg backend based on IPC.
+          The intention is to decouple Log_Msg from IPC components, thus
+          Log_Msg only uses the abstract class ACE_Log_Msg_Backend.
+          In the future we could implement other backends, such as logging
+          to syslog or the NT event log directly.
+          We need to use a dynamically loaded factory to complete the
+          decoupling, but that would take a little more effort.
+
+        * ace/Log_Msg.h:
+        * ace/Log_Msg.cpp:
+          Use the attributes directly.
+          Use the new Log_Msg_Backend classes.
+
+        * tests/Log_Msg_Test.cpp:
+        * examples/Log_Msg/test_callback.cpp:
+          #include Log_Msg_Callback.h, the file is not included unless
+          ACE_LEGACY_MODE is set.
+
+        * tests/Malloc_Test.cpp:
+          Add missing #include
+
+        * examples/Shared_Malloc/test_position_independent_malloc.h:
+        * examples/Shared_Malloc/test_position_independent_malloc.cpp:
+          Reordered #includes to make them more standard.
+
+Fri Oct 13 22:34:59 2000  Marina Spivak  <marina@cs.wustl.edu>
+
+        * bin/auto_run_tests.lst:
+
+          Added new TAO/tests/RTCORBA/Client_Protocol test to the list.
+          Removed TAO/tests/Endpoint_Per_Priority because
+          TAO::Client_Priority_Policy is now disabled in builds by
+          default. Enabled TAO/tests/RTCORBA/Server_Protocol for linux
+          builds (it was disabled for some reason).
+
+Fri Oct 13 19:12:31 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/Malloc_T.h: Added #include "ace/Malloc.h" because the definition
+          of ACE_Control_Block is needed, and it's in Malloc.h.
+
+Fri Oct 13 18:47:51 2000  Steve Huston  <shuston@riverace.com>
+
+        * ace/Caching_Strategies_T.cpp:
+        * ace/Dynamic_Service.cpp:
+        * ace/Timer_Hash_T.cpp:
+        * ace/Timer_Wheel_T.cpp:
+        * netsvcs/lib/Log_Message_Receiver.cpp: Added #include "ace/Log_Msg.h"
+          else IBM C++ can't compile the template at instantiation time.
+
+        * tests/Process_Strategy_Test.h: Added #include "ace/File_Lock.h" to
+          see ACE_File_Lock, so IBM C++ can compile the templates.
+
+Fri Oct 13 18:43:24 2000  Steve Huston  <shuston@riverace.com>
+
+        * tests/MM_Shared_Memory_Test.cpp: Changed SYNCHRONIZER ctor for
+          ACE_SV_Semaphore_Simple case to specify
+          ACE_SV_Semaphore_Simple::ACE_CREATE, not ACE_SV_Semaphore_Complex::
+          ACE_CREATE. Else it got compile failures on Solaris, Sun CC,
+          in PACE build (why in just PACE build? Dunno...)
+
+Fri Oct 13 13:57:40 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/Process_Manager.h :
+        * ace/Process_Manager.cpp :
+
+        * ace/Service_Config.h :
+        * ace/Service_Config.cpp:
+
+          Removed dependency of Service_Config on Process_Manager by
+          registering the Process_Manager singleton with the
+          Object_Manager when it is instantiated. This way we need not call
+          ACE_Process_Manager::close_singleton () in Service_Config
+          implementation.
+
+Mon Oct  9 10:34:18 2000  Ossama Othman  <ossama@uci.edu>
+
+        * configure.in:
+
+          Corrected comments regarding the ACE_HAS_STREAM_PIPES run-time
+          test.
+
+Fri Oct 13 11:41:29 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/Makefile.bor (OBJFILES):
+        * ace/Makefile.am (libACE_Utils_la_SOURCES):
+          Updated to include the new files.
+
+        * examples/Shared_Malloc/test_position_independent_malloc.cpp:
+          Included a header file.
+
+Fri Oct 13 11:43:56 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * ACE-INSTALL.html: updated supported platforms list.
+
+Fri Oct 13 11:39:54 2000  David L. Levine <levine@cs.wustl.edu>
+
+        * ACE-INSTALL.html: added Jaffar Shaikh's <Jaffar_Shaikh@Mitel.COM>
+          notes for building for VxWorks target on NT host.
+
+Fri Oct 13 06:26:18 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+        * examples/RMCast/Send_File:
+          Added makefiles for Send_File multicast example.
+
+        * include/makeinclude/build_dll.bor:
+        * include/makeinclude/build_exe.bor:
+        * include/makeinclude/build_lib.bor:
+          Added support for compilation of C source files.
+
+        * include/makeinclude/ace_flags.bor:
+          Added IORManip and FaultTolerance libraries for TAO.
+
+          Thanks to Christopher Kohlhoff for providing these fixes.
+
+Thu Oct 12 23:33:21 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/Synch.h:
+        * ace/Synch_T.h:
+        * ace/Test_and_Set.cpp:
+          Fixed order of includes to compile under gcc.
+
+Thu Oct 12 22:58:13 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/ACE_Lib_Find.h:
+        * ace/ACE_Lib_Find.cpp:
+        * ace/ACE.cpp:
+          Move the wchar version of strrepl and strsplit_r to the
+          ACE_Lib_Find class, the other versions where there already.
+
+        * ace/FILE_IO.h:
+        * ace/FILE_Connector.cpp:
+          Add missing #include in FILE_IO.h that is used in FILE_IO.i
+
+        * ace/Test_and_Set.h:
+        * ace/Test_and_Set.cpp:
+          Fixed the guards for the .cpp file. Add the #include for
+          platforms that requires template source visible, and add the
+          #pragma implementation for (really) old g++ versions.
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+          Move Test_and_Set.cpp to the "Template Files" folder, and
+          disable compilation for it.
+
+Thu Oct 12 23:09:17 2000  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * ace/OS.i:
+          Added a !defined (__Lynx__) check for ACE_HAS_PACE in the
+          ACE_OS::mmap function. ACE does some special things for Lynx
+          for mmap since Lynx's mmap is deficient. Probably should
+          move this fix from ACE to PACE at some point.
+
+Thu Oct 12 19:38:00 2000  Ossama Othman  <ossama@uci.edu>
+
+        * ace/ace_dll.dsp:
+        * ace/ace_lib.dsp:
+
+          Added new files introduced by Priyanka's footprint reduction
+          effort.
+
+Thu Oct 12 18:19:46 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+        * ace/Makefile:
+          Made the corresponding changes.
+
+        * ace/System_Time.cpp:
+        * ace/UPIPE_Connector.cpp :
+        * ace/Timer_Queue_T.h :
+        * ace/Task.cpp :
+        * ace/POSIX_Asynch_IO.cpp:
+        * ace/OS.h:
+        * ace/Memory_Pool.cpp:
+        * ace/MEM_SAP.h:
+        * ace/MEM_Acceptor.cpp:
+        * ace/Logging_Strategy.cpp:
+        * ace/FIFO.h:
+        * ace/DLL.cpp:
+        * ace/IO_SAP.h:
+        * ace/Malloc_T.h :
+          Cosmetic changes. Ex: Change the included header files to the
+          new header files and similar changes.
+
+        * ace/Naming_Context.h:
+        * ace/Naming_Context.cpp:
+        * ace/Object_Manager.cpp:
+
+          Removed the dependency of Object_Manager on Naming_Context.
+
+        * ace/Test_and_Set.h:
+        * ace/Test_and_Set.cpp:
+        * ace/Test_and_Set.i:
+
+          Moved the class Test_and_Set from Synch_T to here. This helped
+          remove the dependency on Event_Handler.
+
+        * ace/Service_Templates.h:
+        * ace/Service_Templates.cpp:
+
+          Moved the template instantiations from Service_Config.cpp and
+          Service_Types.cpp since these templates were not needed by the
+          respective files.
+
+        * ace/Malloc_Allocator.h :
+        * ace/Malloc_Allocator.cpp:
+        * ace/Malloc_Allocator.i :
+
+        * ace/PI_Malloc.h  :
+        * ace/PI_Malloc.cpp:
+        * ace/PI_Malloc.i  :
+
+        * ace/Malloc.h   :
+        * ace/Malloc.cpp :
+        * ace/Malloc.i   :
+
+          Moved the ACE_PI_Control_Block, ACE_New_Allocator and
+          ACE_Static_Allocator_Base classes to new files: PI_Malloc and
+          Malloc_Allocator.
+
+          This move helps in reduction in size of Malloc.i since the
+          template instantiations which were included only for
+          ACE_PI_Control_Block are now moved to the new file: PI_Malloc.
+          In addition, is the effect of clear and minimized dependencies.
+
+        * ace/ACE.h   :
+        * ace/ACE.cpp :
+        * ace/ACE.i   :
+
+          Moved several functions in ACE to new classes to minimize the
+          dependencies on and by ACE. Each of the following files
+          have the listed functions.
+
+        * ace/Malloc_Instantiations.cpp:
+          Moved the template instantiations to this file.
+
+        * ace/ACE_Sock_Connect.h   :
+        * ace/ACE_Sock_Connect.cpp :
+        * ace/ACE_Sock_Connect.i   :
+
+          Has the socket connection establishment function calls :
+          bind_port, get_bcast_addr, get_ip_interfaces, count_interfaces
+          and get_handle.
+
+          Helps remove the dependency on INET_Addr.
+
+        * ace/ACE_Handle_Ops.h:
+        * ace/ACE_Handle_Ops.cpp:
+        * ace/ACE_Handle_Ops.i:
+
+          Has the <handle_timed_open> operation on handles.
+          Helps remove the dependency of FILE_Connector, SPIPE_COnenctor,
+          UPIPE_Conenctpr and DEV_Connector on ACE.
+
+        * ace/ACE_Lib_Find.h   :
+        * ace/ACE_Lib_Find.cpp :
+        * ace/ACE_Lib_Find.i   :
+
+          Includes all the functions to search and open shared
+          libraries and realted functions :
+          ldfind, ldopen, ldname, get_temp_dir, open_temp_file,
+          strrepl, strsplit_r.
+
+          Removes the dependency of DLL, Logging_Strategy and FILE_Addr on
+          ACE. Effects few other classes too but doesnt remove the
+          dependency on ACE for those classes.
+
+        * ace/ACE_Flag_Manip.h  :
+        * ace/ACE_Flag_Manip.cpp:
+        * ace/ACE_Flag_Manip.i  :
+
+          The Flag Manipulation functions:
+          set_flags (), clr_flags () and get_flags ().
+
+          Removes the dependency of IO_SAP and IPC_SAP on ACE.
+
+        * ace/ACE_Init.h  :
+        * ace/ACE_Init.cpp:
+        * ace/ACE_Init.i  :
+
+          The init () and fini () functions which are used
+          for the initialization and shutting down of ACE.
+
+          Removes dependency on Object_Manager.
+
+Thu Oct 12 15:41:46 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/rules.bin.GNU:
+          List the LDFLAGS before the name of the program, this seems to
+          work better for some of our sponsors.
+
+Thu Oct 12 15:40:51 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * ace/OS.cpp (ACE_OS_GUARD):
+          Use explicit names for the OS guards, otherwise the SGI compiler
+          (7.30 + several patches) crashes.  Thanks to Philip Miller
+          <pwmiller@sarnoff.com> for reporting the problem and providing
+          the patch.
+
+Thu Oct 12 12:15:23 2000  Angelo  <corsaro@cs.wustl.edu>
+
+        * ACE version 5.1.10 released.
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 66ba33d02ed..8af242724c9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -11,10 +11,10 @@
  */
 //=============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 // = AVStreams calls this class when data shows up from a sender.
 class Receiver_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
index 878bbe54a79..2de9e19a586 100755
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -17,14 +16,11 @@ $status = 0;
 $nsior = PerlACE::LocalFile ("ns.ior");
 $outfile = PerlACE::LocalFile ("output");
 
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
-
 unlink $nsior;
 
 $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
 $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior");
-$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f $input");
+$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior");
 
 print STDERR "Starting Naming Service\n";
 
@@ -32,7 +28,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -66,6 +62,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $output, $input;
+unlink $output;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index 22483881f89..0be17acd796 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -10,10 +10,10 @@
  */
 //=============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 // = Defines application specific sender stream endpoint.
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 55c1b9ddf46..19f72b8060a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -245,11 +245,6 @@ Client::init (int argc,char **argv)
     {
       ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
     }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "ERROR: file %s could not be opened\n",
-                                   this->filename_), -1);
-    }
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index 20bdbda0205..eab3bf37497 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -7,12 +7,12 @@
 #include "ace/Get_Opt.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/Strategies/advanced_resource.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
 
 class FTP_Client_Callback
   :public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
index 9552c5f8c89..1f9ae20a47d 100755
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -17,16 +16,14 @@ $status = 0;
 $nsior = PerlACE::LocalFile ("ns.ior");
 $test1 = PerlACE::LocalFile ("test1");
 $test2 = PerlACE::LocalFile ("test2");
-
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
+$makefile = PerlACE::LocalFile ("Makefile");
 
 unlink $nsior, $test1, $test2;
 
 $NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
 $SV1 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test1");
 $SV2 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test2");
-$CL  = new PerlACE::Process ("ftp", "-ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -f $input");
+$CL  = new PerlACE::Process ("ftp", "-ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -f $makefile");
 
 print STDERR "Starting Naming Service\n";
 
@@ -34,7 +31,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 15) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -80,6 +77,6 @@ if ($nserver != 0) {
     $status = 1;
 }
 
-unlink $nsior, $test1, $test2, $input;
+unlink $nsior, $test1, $test2;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
index 1aec3d351c7..6d0b3a697c9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
@@ -3,14 +3,14 @@
 
 #include "ace/Get_Opt.h"
 #include "tao/Strategies/advanced_resource.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class FTP_Server_StreamEndPoint
   :public TAO_Server_StreamEndPoint
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
index 08d558dc82b..18ff8ec8671 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
@@ -6,12 +6,12 @@
 
 #include "ace/Get_Opt.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Flows_T.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
 
 class FTP_Client_Callback;
 class FTP_Client_Producer
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
index bbc47d41b8a..c168a476ea7 100755
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -17,16 +16,14 @@ $status = 0;
 $nsior = PerlACE::LocalFile ("ns.ior");
 $test1 = PerlACE::LocalFile ("test1");
 $test2 = PerlACE::LocalFile ("test2");
-
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
+$makefile = PerlACE::LocalFile ("Makefile");
 
 unlink $nsior, $test1, $test2;
 
 $NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
 $SV1 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test1");
 $SV2 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test2");
-$CL  = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $input");
+$CL  = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $makefile");
 
 print STDERR "Starting Naming Service\n";
 
@@ -34,7 +31,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -80,6 +77,6 @@ if ($nserver != 0) {
     $status = 1;
 }
 
-unlink $nsior, $test1, $test2, $input;
+unlink $nsior, $test1, $test2;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index b292ff910e5..ac21c891ced 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -2,13 +2,13 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Flows_T.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class FTP_Server_Callback
   :public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/input b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/input
new file mode 100644
index 00000000000..b6579cec283
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/input
@@ -0,0 +1,995 @@
+#----------------------------------------------------------------------------
+#	input,v 1.1 2001/03/27 11:41:00 irfan Exp
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SERVER_OBJS = server.o
+CLIENT_OBJS = ftp.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = ftp server
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = server ftp
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.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/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index f5fb5efa767..8bc7686cf71 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -18,11 +18,11 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 class Receiver_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
index c04de62dfd6..6d63232651b 100755
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib $ENV{"ACE_ROOT"}.'/bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -17,14 +16,11 @@ $status = 0;
 $nsior = PerlACE::LocalFile ("ns.ior");
 $outfile = PerlACE::LocalFile ("output");
 
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
-
 unlink $nsior;
 
 $NS = new PerlACE::Process ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", "-o $nsior");
 $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -f output");
-$CL = new PerlACE::Process ("sender", "-ORBDebugLevel 2 -ORBInitRef NameService=file://$nsior -f $input -r 2");
+$CL = new PerlACE::Process ("sender", "-ORBDebugLevel 2 -ORBInitRef NameService=file://$nsior -f input -r 2");
 
 print STDERR "Starting Naming Service\n";
 
@@ -66,6 +62,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $output, $input;
+unlink $output;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index d37c46f21b9..f4f8b4716c2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 typedef ACE_Unbounded_Set<TAO_AV_Protocol_Object*> ProtocolObject_Set;
 typedef ACE_Unbounded_Set_Iterator<TAO_AV_Protocol_Object*> ProtocolObject_SetItor;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 50e7a20e39b..772016bf4f8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -22,11 +22,11 @@
 #define TAO_AV_FTP_H
 
 #include "ace/Get_Opt.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 
 class FTP_Client_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
index 87223c84b1a..6822ea67bf3 100755
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -15,17 +14,15 @@ $sleeptime = 2;
 $status = 0;
 
 $nsior = PerlACE::LocalFile ("ns.ior");
+$makefile = PerlACE::LocalFile ("Makefile");
 
 $debug = 0;
 
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
-
 unlink $nsior;
 
-for ($i = 0; $i <= $#ARGV; $i++)
+for ($i = 0; $i <= $#ARGV; $i++) 
 {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") 
     {
         print STDERR "\nusage:  run_test\n";
 
@@ -44,12 +41,12 @@ for ($i = 0; $i <= $#ARGV; $i++)
 
 	exit;
     }
-    elsif ($ARGV[$i] eq "-p")
+    elsif ($ARGV[$i] eq "-p") 
     {
 	@protocols = split (',', $ARGV[$i + 1]);
 	$i++;
     }
-    elsif ($ARGV[$i] eq "-d")
+    elsif ($ARGV[$i] eq "-d") 
     {
 	$debug = $ARGV[$i + 1];
 	$i++;
@@ -62,10 +59,10 @@ print STDERR "Starting Naming Service\n";
 
 $NS->Spawn ();
 
-if (PerlACE::waitforfile_timed ($nsior, 100) == -1)
+if (PerlACE::waitforfile_timed ($nsior, 100) == -1) 
 {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -83,26 +80,26 @@ for $protocol (@protocols)
     }
 
     $SV = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -f ".$output_file);
-    $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $input");
-
+    $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $makefile");
+    
     print STDERR "Using ".$protocol."\n";
     print STDERR "Starting Receiver\n";
-
+    
     $SV->Spawn ();
-
+    
     sleep $sleeptime;
-
+    
     print STDERR "Starting Sender\n";
-
+    
     $sender = $CL->SpawnWaitKill (200);
-
+    
     if ($sender != 0) {
 	print STDERR "ERROR: sender returned $sender\n";
 	$status = 1;
     }
-
+    
     $receiver = $SV->TerminateWaitKill (200);
-
+    
     if ($receiver != 0) {
 	print STDERR "ERROR: receiver returned $receiver\n";
 	$status = 1;
@@ -117,6 +114,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $output, $input;
+unlink $output;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index c1c6776efe2..146d1e9486c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -16,10 +16,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 
 class FTP_Server_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index 4faa8c72ae8..2fcda3f1f64 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -1,5 +1,5 @@
 #include "TimeStamp.h"
-#include "orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
 #include "ace/High_Res_Timer.h"
 
 // $Id$
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
index c19b488104f..e860731f0ad 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
@@ -2,7 +2,7 @@
 #define TIMESTAMP_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 #include "ace/Dynamic_Service.h"
 #include "export.h"
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/input b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/input
new file mode 100644
index 00000000000..b6579cec283
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/input
@@ -0,0 +1,995 @@
+#----------------------------------------------------------------------------
+#	input,v 1.1 2001/03/27 11:41:00 irfan Exp
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SERVER_OBJS = server.o
+CLIENT_OBJS = ftp.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = ftp server
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = server ftp
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.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/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 39c4ac3b39e..2ab749b7c70 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class Receiver_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
index c04de62dfd6..6d63232651b 100755
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib $ENV{"ACE_ROOT"}.'/bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -17,14 +16,11 @@ $status = 0;
 $nsior = PerlACE::LocalFile ("ns.ior");
 $outfile = PerlACE::LocalFile ("output");
 
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
-
 unlink $nsior;
 
 $NS = new PerlACE::Process ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", "-o $nsior");
 $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -f output");
-$CL = new PerlACE::Process ("sender", "-ORBDebugLevel 2 -ORBInitRef NameService=file://$nsior -f $input -r 2");
+$CL = new PerlACE::Process ("sender", "-ORBDebugLevel 2 -ORBInitRef NameService=file://$nsior -f input -r 2");
 
 print STDERR "Starting Naming Service\n";
 
@@ -66,6 +62,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $output, $input;
+unlink $output;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index 20e9dc6ef50..3324e95747f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index 2ad409534ab..66dc44f0ef8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -2,7 +2,7 @@
 
 #include "distributer.h"
 #include "ace/Get_Opt.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 typedef ACE_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index 8b9f74cdf07..6baa0c53584 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/input b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/input
new file mode 100644
index 00000000000..f220a0b638f
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/input
@@ -0,0 +1,9541 @@
+#----------------------------------------------------------------------------
+#	$Id$
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SENDER_OBJS = sender.o
+DISTRIBUTER_OBJS = distributer.o
+RECEIVER_OBJS = receiver.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = sender distributer receiver
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = sender distributer receiver
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+
+.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+
+.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+#----------------------------------------------------------------------------
+#	$Id$
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SENDER_OBJS = sender.o
+DISTRIBUTER_OBJS = distributer.o
+RECEIVER_OBJS = receiver.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = sender distributer receiver
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = sender distributer receiver
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+
+.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+
+.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+#----------------------------------------------------------------------------
+#	$Id$
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SENDER_OBJS = sender.o
+DISTRIBUTER_OBJS = distributer.o
+RECEIVER_OBJS = receiver.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = sender distributer receiver
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = sender distributer receiver
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+
+.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+
+.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+#----------------------------------------------------------------------------
+#	$Id$
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SENDER_OBJS = sender.o
+DISTRIBUTER_OBJS = distributer.o
+RECEIVER_OBJS = receiver.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = sender distributer receiver
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = sender distributer receiver
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+
+.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+
+.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+#----------------------------------------------------------------------------
+#	$Id$
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SENDER_OBJS = sender.o
+DISTRIBUTER_OBJS = distributer.o
+RECEIVER_OBJS = receiver.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = sender distributer receiver
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = sender distributer receiver
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+
+.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+
+.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+#----------------------------------------------------------------------------
+#	$Id$
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SENDER_OBJS = sender.o
+DISTRIBUTER_OBJS = distributer.o
+RECEIVER_OBJS = receiver.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = sender distributer receiver
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = sender distributer receiver
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+
+.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+
+.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+#----------------------------------------------------------------------------
+#	$Id$
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SENDER_OBJS = sender.o
+DISTRIBUTER_OBJS = distributer.o
+RECEIVER_OBJS = receiver.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = sender distributer receiver
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = sender distributer receiver
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+
+.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+
+.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index a08f222d24d..73d30316424 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 class Receiver_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
index 955ef15c05d..b44101b5e19 100755
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -16,14 +15,12 @@ $status = 0;
 
 $nsior = PerlACE::LocalFile ("ns.ior");
 $testfile = PerlACE::LocalFile ("test");
-
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
+$makefile = PerlACE::LocalFile ("input");
 
 unlink $nsior;
 
 $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
-$SV = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f $input");
+$SV = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f $makefile");
 $RE = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -f $testfile");
 $DI = new PerlACE::Process ("distributer", "-ORBInitRef NameService=file://$nsior");
 
@@ -33,7 +30,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -81,6 +78,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $testfile, $input;
+unlink $testfile;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index a5e40f9134e..5fbcc6818ec 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/input b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/input
new file mode 100644
index 00000000000..7b215c80b28
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/input
@@ -0,0 +1,995 @@
+#----------------------------------------------------------------------------
+#	$Id: input,v 1.1 2001/03/09 18:57:30 irfan Exp $
+#
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SERVER_OBJS = server.o
+CLIENT_OBJS = ftp.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = ftp server
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = server ftp
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.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 \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(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/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/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/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.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/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_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 \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.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_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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(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/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 718b2deac25..e2694e1be03 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 #include "Receiver_Stats.h"
 
 class Receiver_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
index d8bde72c0f5..5dd90188fa6 100755
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -19,14 +18,11 @@ $outfile = PerlACE::LocalFile ("output");
 
 $debug = 0;
 
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
-
 unlink $nsior;
 
-for ($i = 0; $i <= $#ARGV; $i++)
+for ($i = 0; $i <= $#ARGV; $i++) 
 {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") 
     {
         print STDERR "\nusage:  run_test\n";
 
@@ -45,12 +41,12 @@ for ($i = 0; $i <= $#ARGV; $i++)
 
 	exit;
     }
-    elsif ($ARGV[$i] eq "-p")
+    elsif ($ARGV[$i] eq "-p") 
     {
 	@protocols = split (',', $ARGV[$i + 1]);
 	$i++;
     }
-    elsif ($ARGV[$i] eq "-d")
+    elsif ($ARGV[$i] eq "-d") 
     {
 	$debug = $ARGV[$i + 1];
 	$i++;
@@ -63,10 +59,10 @@ print STDERR "Starting Naming Service\n";
 
 $NS->Spawn ();
 
-if (PerlACE::waitforfile_timed ($nsior, 100) == -1)
+if (PerlACE::waitforfile_timed ($nsior, 100) == -1) 
 {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -83,26 +79,26 @@ for $protocol (@protocols)
     }
 
     $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -f ".$output_file);
-    $CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $input");
-
+    $CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol);
+    
     print STDERR "Using ".$protocol."\n";
     print STDERR "Starting Receiver\n";
-
+    
     $SV->Spawn ();
-
+    
     sleep $sleeptime;
-
+    
     print STDERR "Starting Sender\n";
-
+    
     $sender = $CL->SpawnWaitKill (200);
-
+    
     if ($sender != 0) {
 	print STDERR "ERROR: sender returned $sender\n";
 	$status = 1;
     }
-
+    
     $receiver = $SV->TerminateWaitKill (200);
-
+    
     if ($receiver != 0) {
 	print STDERR "ERROR: receiver returned $receiver\n";
 	$status = 1;
@@ -117,6 +113,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $output, $input;
+unlink $output;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index 32cbf2856c9..c89e0c9d1eb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input
index 6abeb8554f4..b71b9f74fab 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input
@@ -1,68 +1,70 @@
 #----------------------------------------------------------------------------
+#	$Id$
 #
-# $Id$
+#	Top-level Makefile for Pluggable testing of AVStreams of TAO.
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
 
-LDLIBS = -lRTCORBA_Common -lTAO_Strategies -lTAO_PortableServer -lTAO
+SERVER_OBJS = server.o
+CLIENT_OBJS = ftp.o
 
-BIN_UNCHECKED = server client
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-CLIENT_OBJS = 	client.o
-SERVER_OBJS = 	server.o
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
 
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-SRC=$(CLIENT_OBJS:.o=.cpp) $(SERVER_OBJS:.o=.cpp)
-CPPFLAGS += -I../Common
+FILES = ftp server
+DEFS    = $(addsuffix .h,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
+
+BIN2 = server ftp
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # AV
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
-
-ifeq ($(rt_corba),1)
-  ifeq ($(minimum_corba),0)
-    BIN=$(BIN_UNCHECKED)
-  endif # minimum_corba
-endif # rt_corba
-
 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
-#----------------------------------------------------------------------------
 
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+            -I$(TAO_ROOT)
 
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+#	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-realclean: clean
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+#    $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/client.o .obj/client.o .obj/client.o .obj/client.o: client.cpp ../Common/testC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -71,13 +73,6 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
@@ -88,6 +83,8 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
@@ -101,6 +98,12 @@ realclean: clean
  $(ACE_ROOT)/ace/Sock_Connect.h \
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
@@ -134,6 +137,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
@@ -141,11 +149,6 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
@@ -158,33 +161,14 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -192,42 +176,75 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.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/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
@@ -236,48 +253,26 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
- ../Common/rtcorba_common_export.h ../Common/testC.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TAOC.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/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/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(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/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_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -293,17 +288,157 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
  $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -323,19 +458,79 @@ realclean: clean
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Stats.h \
  $(ACE_ROOT)/ace/Basic_Stats.h \
  $(ACE_ROOT)/ace/Basic_Stats.inl \
- $(ACE_ROOT)/ace/Stats.i \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
+ $(ACE_ROOT)/ace/Stats.i
 
-.obj/server.o .obj/server.o .obj/server.o .obj/server.o: server.cpp ../Common/test_i.h ../Common/testS.h \
- ../Common/testC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -344,13 +539,6 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
@@ -361,6 +549,8 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.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/Flag_Manip.h \
@@ -374,6 +564,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Sock_Connect.h \
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
@@ -407,6 +604,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.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/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
@@ -414,11 +616,6 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
@@ -431,33 +628,21 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -465,42 +650,78 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/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 \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
@@ -509,59 +730,24 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
- ../Common/rtcorba_common_export.h ../Common/testC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- ../Common/testS_T.h ../Common/testS_T.i ../Common/testS_T.cpp \
- ../Common/testS.i ../Common/test_i.i \
- $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.h \
- $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
- $(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/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(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/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_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -577,17 +763,149 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
  $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.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/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/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -607,10 +925,71 @@ realclean: clean
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 91af15eaa33..31291ac620d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 
 class Receiver_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
index d8bde72c0f5..5dd90188fa6 100755
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -19,14 +18,11 @@ $outfile = PerlACE::LocalFile ("output");
 
 $debug = 0;
 
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
-
 unlink $nsior;
 
-for ($i = 0; $i <= $#ARGV; $i++)
+for ($i = 0; $i <= $#ARGV; $i++) 
 {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") 
     {
         print STDERR "\nusage:  run_test\n";
 
@@ -45,12 +41,12 @@ for ($i = 0; $i <= $#ARGV; $i++)
 
 	exit;
     }
-    elsif ($ARGV[$i] eq "-p")
+    elsif ($ARGV[$i] eq "-p") 
     {
 	@protocols = split (',', $ARGV[$i + 1]);
 	$i++;
     }
-    elsif ($ARGV[$i] eq "-d")
+    elsif ($ARGV[$i] eq "-d") 
     {
 	$debug = $ARGV[$i + 1];
 	$i++;
@@ -63,10 +59,10 @@ print STDERR "Starting Naming Service\n";
 
 $NS->Spawn ();
 
-if (PerlACE::waitforfile_timed ($nsior, 100) == -1)
+if (PerlACE::waitforfile_timed ($nsior, 100) == -1) 
 {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -83,26 +79,26 @@ for $protocol (@protocols)
     }
 
     $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -f ".$output_file);
-    $CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $input");
-
+    $CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol);
+    
     print STDERR "Using ".$protocol."\n";
     print STDERR "Starting Receiver\n";
-
+    
     $SV->Spawn ();
-
+    
     sleep $sleeptime;
-
+    
     print STDERR "Starting Sender\n";
-
+    
     $sender = $CL->SpawnWaitKill (200);
-
+    
     if ($sender != 0) {
 	print STDERR "ERROR: sender returned $sender\n";
 	$status = 1;
     }
-
+    
     $receiver = $SV->TerminateWaitKill (200);
-
+    
     if ($receiver != 0) {
 	print STDERR "ERROR: receiver returned $receiver\n";
 	$status = 1;
@@ -117,6 +113,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $output, $input;
+unlink $output;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index a314624ed28..6d92b5776d2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
index 99300dbb59d..750a79f00ef 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
@@ -1,10 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(Bug_1630_testclient ) : taoexe, minimum_corba {
+project(Bug_1630_testclient ) : taoexe {
    exename = testclient
    libs += TAO_IFR_Client
    libpaths += $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao $(ACE_ROOT)/ace
+   avoids += minimum_corba
 
    IDL_Files {
    }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h
index a81df69daa0..5c945b65f10 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h
@@ -24,8 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "CC_tests.h"
 #include "CC_naming_service.h"
 #include "CC_command.h"
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index fe4a1467fe1..e502874a740 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -20,8 +20,7 @@
 #include "CC_naming_service.h"
 #include "ace/ACE.h"
 #include "ace/Process.h"
-#include "ace/Log_Msg.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h
index 735d38d7c21..9992d80c6f7 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 
 #ifndef _CC_COMMAND_H_
 #define _CC_COMMAND_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index 8a67df0eb67..2b161c63d94 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -30,7 +30,7 @@
 
 #include "CC_command.h"
 #include "ace/ACE.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 #include "ace/OS_NS_stdio.h"
 
 void ace_cc_yyerror (const char* s);
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index d12cb0d1e94..fe0f28fef32 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -19,7 +19,6 @@
 
 #include "CC_naming_service.h"
 #include "ace/OS_NS_string.h"
-#include "ace/Log_Msg.h"
 
 ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 597a9696840..3dfbcff8b44 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 #ifndef _CC_NAMING_SERVICE_H_
 #define _CC_NAMING_SERVICE_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 8559173030b..baf8c02bdda 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -20,7 +20,6 @@
 #include "CC_test_utils.h"
 #include "CC_naming_service.h"
 #include "ace/OS.h"
-#include "ace/Log_Msg.h"
 
 ACE_RCSID(Concurrency, CC_test_utils, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
index 4c1a643f863..95a4605d582 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 
 #ifndef _CC_TEST_UTILS_H_
 #define _CC_TEST_UTILS_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 01af67d07b7..d4e132a0617 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -19,8 +19,6 @@
 
 #include "CC_tests.h"
 #include "ace/OS.h"
-#include "ace/Log_Msg.h"
-
 ACE_RCSID(Concurrency, CC_tests, "$Id$")
 
 CC_Test::CC_Test (CC_naming_service *ns)
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
index 9f0083fd2ad..7417c23235d 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-#include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "CC_naming_service.h"
 
 #ifndef _CC_TESTS_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp b/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp
index ecddc658428..3c8d0dcdd5f 100644
--- a/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp
@@ -5,7 +5,7 @@
 // The contents of this file REALLY should be generated by the IDL
 // compiler, but that functionality isn't available yet.
 
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 
 ACE_RCSID(Concurrency, tmplinst, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 4c3faefd58f..7b6b3cb0345 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -3,9 +3,9 @@
 #include "Counting_Supplier.h"
 #include "Counting_Consumer.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 
 ACE_RCSID (CEC_Tests, 
            Disconnect, 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index cb87203f303..a31c7a75652 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -4,8 +4,8 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 
 ACE_RCSID (CEC_Tests, 
            MT_Disconnect, 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 06a263e9178..a6e077c91cc 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -18,7 +18,7 @@
 #define CEC_MT_DISCONNECT_H
 
 #include "ace/Task.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index abaa9184f9b..ce3a0ee4b2d 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -2,8 +2,8 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (CEC_Tests_Basic,
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 3ff9f720233..a0ebb93aef3 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -2,8 +2,8 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (CEC_Tests_Basic,
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 0c5aea70a2f..d74044224ce 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "Random.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index 450fe418668..d40b29ab84a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -17,8 +17,8 @@
 #ifndef EC_RANDOM_H
 #define EC_RANDOM_H
 
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index eee8e47f1a3..2a63a37184c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -2,8 +2,8 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 
 ACE_RCSID( CEC_Tests_Basic, 
            Shutdown, 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
index 2065860ebb8..d4105cbe2a9 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, messaging, taoserver, event_serv, naming, svc_utils, iortable {
+project : orbsvcsexe, messaging, taoserver, event, naming, svc_utils, iortable {
   after    += CosEvent_Test_Lib
   libs     += CECTests
   includes += ../lib
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
index f3c8fe6d235..ccca6133222 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosEvent Test Lib): orbsvcslib, event_skel, naming, svc_utils, iortable, portableserver {
+project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver {
   sharedname   = CECTests
   dynamicflags = CEC_TEST_BUILD_DLL
   Header_Files {
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index d3ec2cbbb33..fbcc070662d 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -23,8 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 #include "ace/Task.h"
 
 class CEC_Test_Export CEC_Counting_Consumer : public POA_CosEventComm::PushConsumer
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 5f557db27ee..c33b963a13e 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -23,8 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 #include "ace/Task.h"
 
 class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSupplier
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index a84b5e24821..6e3a7cb607a 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -3,10 +3,10 @@
 #include "ECM_Consumer.h"
 #include "ECM_Data.h"
 
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 1d0adde39fd..5b266e18c7b 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -17,8 +17,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/OS_NS_time.h"
 
 class Driver;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 1ef30218a5f..de6f6b043e3 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -8,10 +8,10 @@
 
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ECM_Supplier.h"
 #include "ECM_Data.h"
 #include "ace/OS_NS_errno.h"
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 10b3adb9270..1aa98e8bea8 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -17,7 +17,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
 
 class ECMS_Driver;
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
index 232f63a5071..d0be5f4851c 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
@@ -5,7 +5,7 @@
 #define ADDRSERVER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 
 class AddrServer : public POA_RtecUDPAdmin::AddrServer
 {
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 23e8b6b0e2a..b43c33fd181 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -2,8 +2,8 @@
 // Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
 
 #include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 ACE_RCSID(EC_MT_Mcast,
           Consumer,
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index 1e1d9fdaa17..415b4b19eea 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -4,8 +4,8 @@
 #ifndef CONSUMER_H
 #define CONSUMER_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 6fbed6275f2..67512d83d65 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -4,13 +4,13 @@
 #include "Consumer.h"
 #include "Supplier.h"
 #include "AddrServer.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/ECG_Mcast_EH.h"
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index 851d74512e0..38ee3a1f8f5 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -2,8 +2,8 @@
 // Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
 
 #include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 ACE_RCSID(EC_MT_Mcast,
           Supplier,
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index 8f9f50f2a87..b2618c5d810 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -4,8 +4,8 @@
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 2746a69f222..16d1cab1b1f 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -2,12 +2,12 @@
 
 #include "EC_Mcast.h"
 
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index a1044cb15aa..c7e4d93e777 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -53,15 +53,15 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/High_Res_Timer.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/Event/EC_UDP_Admin.h"
-#include "orbsvcs/Event/ECG_Mcast_EH.h"
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
 
 class ECM_Driver;
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 08196317846..1f2e5c7c3a4 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -6,14 +6,14 @@
 #include "Scheduler_Runtime2.h"
 #include "Scheduler_Runtime_Dynamic.h" /* infos_3 */
 
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Runtime_Scheduler.h"
-#include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 4bf7784e0cd..e3491190859 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -23,11 +23,11 @@
 
 #include "ace/High_Res_Timer.h"
 #include "ace/Condition_Thread_Mutex.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/Event/EC_Gateway_Sched.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 class Test_ECG;
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
index a6de5dd6f1d..d5e25a0cafa 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
@@ -2,7 +2,7 @@
 // before editing the file please consider generating it again
 // $Id$
 
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 
 static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_1[] = {
 { "Reactor_Task-25000.us", 1, 0, 0, 0, 250000,
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
index 44b87de3f80..3e89bc2e87b 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
@@ -2,7 +2,7 @@
 // before editing the file please consider generating it again
 // $Id$
 
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 
 static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_2[] = {
 { "Reactor_Task-25000.us", 1, 0, 0, 0, 250000,
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
index 86089e80ff4..44a0458b555 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
@@ -2,7 +2,7 @@
 // before editing the file please consider generating it again
 // $Id$
 
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 
 static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_3[] = {
   { "Reactor_Task-25000.us",          1,          0,          0,          0,     250000, (RtecScheduler::Criticality_t) 4, (RtecScheduler::Importance_t) 0,          0,          1,         59,       1022,          0, (RtecScheduler::Info_Type_t) 0 , (RtecScheduler::RT_Info_Enabled_Type_t) RtecScheduler::RT_INFO_ENABLED },
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 1c262087f3e..548da9e2e8b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -2,9 +2,9 @@
 
 #include "ECT_Consumer.h"
 
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 6a086b38087..e5c69dd1ad5 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -19,9 +19,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Task.h"
 #include "ace/OS_NS_time.h"
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 5c4ef131935..366639f8332 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -2,10 +2,10 @@
 
 #include "ECT_Consumer_Driver.h"
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 4af70e0f7a8..ba33ea4adef 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -20,8 +20,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ECT_Consumer.h"
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Task.h"
 #include "ace/High_Res_Timer.h"
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 4e687d7a67b..4012a5b8130 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -2,9 +2,9 @@
 
 #include "ECT_Supplier.h"
 
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 17fbcb8ce02..ee5dcf255d2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -18,9 +18,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
 #include "ace/Task.h"
 
 class Test_Supplier : public ACE_Task<ACE_SYNCH>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index cf4ff7d1d1b..082b1bfa826 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -2,10 +2,10 @@
 
 #include "ECT_Supplier_Driver.h"
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index e51f0f73551..e295690f6e5 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -19,7 +19,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/High_Res_Timer.h"
-#include "orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
 #include "ECT_Driver.h"
 #include "ECT_Supplier.h"
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 9d5395e9569..21fe2ee77e3 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -2,16 +2,16 @@
 
 #include "ECT_Throughput.h"
 
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Runtime_Scheduler.h"
-#include "orbsvcs/Event/Event_Channel.h"
-#include "orbsvcs/Event/Module_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index d7e4362d17c..308906f4f86 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -5,10 +5,10 @@
 
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 ACE_RCSID (EC_Tests,
            Atomic_Reconnect,
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
index 6aafd6e9dce..93b84af5c2d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
@@ -14,7 +14,7 @@
 #define EC_ATOMIC_RECONNECT_H
 
 #include "Counting_Consumer.h"
-#include "orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 9ea02908ff1..4e085a1df56 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -3,7 +3,7 @@
 #include "BCast.h"
 #include "Consumer.h"
 #include "Supplier.h"
-#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h"
 #include "tao/ORB_Core.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 8cbcfa4c368..5ec95b193a8 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -14,7 +14,7 @@
 #define EC_BCAST_H
 
 #include "Driver.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 
 class ACE_INET_Addr;
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 784bb9e422f..2e9c750ccf5 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -3,10 +3,10 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 ACE_RCSID (EC_Tests, 
            Bitmask, 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 5a021eb4e08..5beec0820a2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -2,10 +2,10 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 ACE_RCSID (EC_Tests, 
            Complex, 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index cdc7369cbac..0962fd2b630 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -5,10 +5,10 @@
 
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 ACE_RCSID (EC_Tests,
            Control,
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h
index 2df1cb7e3ea..ac641891b4b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.h
@@ -14,7 +14,7 @@
 #define EC_CONTROL_H
 
 #include "Counting_Consumer.h"
-#include "orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 22af3ce4a99..425e6b97eca 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -3,10 +3,10 @@
 #include "Counting_Supplier.h"
 #include "Counting_Consumer.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 ACE_RCSID (EC_Tests, 
            Disconnect, 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index 39c750d1a4d..d908603bb20 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -2,11 +2,11 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
 
 ACE_RCSID (EC_Tests, 
            Gateway, 
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 51d2bd3c3fb..f2349ee5a21 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -4,10 +4,10 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 ACE_RCSID (EC_Tests, 
            MT_Disconnect, 
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
index 06855260d66..03e058934e1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
@@ -14,7 +14,7 @@
 #define EC_MT_DISCONNECT_H
 
 #include "ace/Task.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index 83fbdf77e04..44a50a10b13 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -3,10 +3,10 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 ACE_RCSID (EC_Tests, 
            Negation, 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index afb1653bab4..58253b839bd 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -3,8 +3,8 @@
 #include "Observer.h"
 #include "Consumer.h"
 #include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index bb788c01258..13ae141293c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -14,7 +14,7 @@
 #define EC_OBSERVER_H
 
 #include "Driver.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index b9397f997ed..f7bb82adc85 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
 #include "Random.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index 22fd387192b..727806f0be0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -13,8 +13,8 @@
 #ifndef EC_RANDOM_H
 #define EC_RANDOM_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 #include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 7bb4b36492f..ba63f91ba2d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -3,7 +3,7 @@
 #include "Reconnect.h"
 #include "Consumer.h"
 #include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index aa7906a0cd9..79fbf4580fe 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -3,10 +3,10 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 ACE_RCSID (EC_Tests, 
            Timeout, 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index af77cc9fcbd..868ff9b95f2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -2,10 +2,10 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 ACE_RCSID (EC_Tests, 
            Wildcard, 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index 5fe05170a84..33207f3d371 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "EC_Wrapper.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Auto_Ptr.h"
 
 EC_Wrapper::EC_Wrapper (void)
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index a8421c9334e..22b1f7a328e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -4,8 +4,8 @@
 #ifndef EC_WRAPPER_H
 #define EC_WRAPPER_H
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
 #include "ECMcastTests_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 667ac9e8efb..8c33c404bb5 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 #include "Gateway_EC.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
 #include "ace/Get_Opt.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h
index bc1faae8c3b..f4471a4eaa6 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #define A_EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1
 #define B_EVENT_TYPE A_EVENT_TYPE+1
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index d04907a35f1..ffdb42a1858 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
 #include "Constants.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 class EC_Consumer:
   public POA_RtecEventComm::PushConsumer,
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
index ab13f1a28ef..37d8edcaa0d 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 #include "Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Log_Msg.h"
 
 void
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h
index 45bca620bf2..f5093028608 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #define EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1
 #define SOURCE_ID ACE_ES_EVENT_SOURCE_ANY+1
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
index d7d0b4f1973..069a9d8701d 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 #include "Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Log_Msg.h"
 
 void
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h
index 6a6919f964d..2e5814a3957 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #define HEARTBEAT ACE_ES_EVENT_UNDEFINED+1
 #define SOURCE_ID ACE_ES_EVENT_SOURCE_ANY+1
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index fabc0999002..1ef97c20ec3 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -2,13 +2,13 @@
 
 #include "Constants.h"
 
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index afb5e07dc4d..1860291e40d 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -3,7 +3,7 @@
 #include "Connect.h"
 #include "Consumer.h"
 #include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_strings.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index 1d78d070ce7..b1f33edb93b 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -3,8 +3,8 @@
 #include "Inversion.h"
 #include "Consumer.h"
 #include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 #include "ace/Sched_Params.h"
 #include "ace/Arg_Shifter.h"
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 23c11650fd9..7d0a54f78c6 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Latency.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #include "tao/Messaging/Messaging.h"
 #include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 3b6880e36b5..365e21bcf2c 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -17,8 +17,8 @@
 #ifndef EC_LATENCY_H
 #define EC_LATENCY_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 875bbf1803d..0b79f385e8a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
 
 #include "tao/Messaging/Messaging.h"
 #include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index 67c7ce2277f..31ae3910a5d 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -3,7 +3,7 @@
 #include "Throughput.h"
 #include "Consumer.h"
 #include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Get_Opt.h"
 
 ACE_RCSID (EC_Tests_Performance, 
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 50a090f74c5..3be234ab90f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "Consumer.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index 439b95f9747..ce3c6678d39 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/OS_NS_time.h"
 
 /**
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index 06878cb4b9f..482a9afc68e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 /**
  * @class EC_Counting_Consumer
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 4b63fcae605..712c6a15215 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Counting_Supplier.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (EC_Tests, 
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index cc76b3a6e91..da4b7f67172 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Channel_Clients.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Task.h"
 
 /**
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index e80efa46881..a359c8a570e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -4,10 +4,10 @@
 #include "Consumer.h"
 #include "Supplier.h"
 
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
 
 #include "tao/ORB_Constants.h"
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index c902b4a7052..b6165e14ab4 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 
 #include "ace/Stats.h"
 #include "ace/Task.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index a644d926bb6..97a49df7d5d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index 065a20a15aa..9f4b5820fb1 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Task.h"
 #include "ace/OS_NS_time.h"
 
diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
index b23e08cf1ae..7416446bbe6 100644
--- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
@@ -13,7 +13,7 @@
 //=============================================================================
 
 #include "tao/Utils/Server_Main.h"
-#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
index 6ce793d80df..9b9fbca1e5b 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc
+++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
@@ -1,7 +1,8 @@
 // $Id$
 
-project(*Server): taoserver, fault_tolerance, orbsvcsexe, minimum_corba {
+project(*Server): taoserver, fault_tolerance, orbsvcsexe{
   exename = ft_replica
+  avoids += minimum_corba
   Source_Files {
     FT_Replica.cpp
     FT_TestReplica_i.cpp
@@ -34,8 +35,9 @@ project(*Server): taoserver, fault_tolerance, orbsvcsexe, minimum_corba {
   }
 }
 
-project(*Client): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
+project(*Client): taoclient, fault_tolerance, orbsvcsexe {
   exename = ft_client
+  avoids += minimum_corba
   includes += $(TAO_ROOT)
   after += *Server
   Source_Files {
@@ -45,8 +47,9 @@ project(*Client): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
   }
 }
 
-project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, minimum_corba {
+project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe {
   exename = ft_notifier
+  avoids += minimum_corba
   Source_Files {
     FTAPP_Notifier_Main.cpp
     StubFaultNotifier.cpp
@@ -59,7 +62,7 @@ project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, minimum_co
   }
 }
 
-project(*Analyzer): taoclient, fault_tolerance, notification_skel, orbsvcsexe {
+project(*Analyzer): taoclient, fault_tolerance, orbsvcsexe {
   exename = ft_analyzer
 
   Source_Files {
@@ -76,8 +79,9 @@ project(*Analyzer): taoclient, fault_tolerance, notification_skel, orbsvcsexe {
   }
 }
 
-project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, minimum_corba {
+project(*FaultConsumer): taoserver, fault_tolerance, orbsvcsexe {
   exename = ft_fault_consumer
+  avoids += minimum_corba
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
   Source_Files {
@@ -92,8 +96,9 @@ project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcse
   }
 }
 
-project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
+project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe {
   exename = ft_registry
+  avoids += minimum_corba
 
   Source_Files {
     FTAPP_FactoryRegistry_Main.cpp
@@ -109,8 +114,9 @@ project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, minimum_corba
   }
 }
 
-project(*Creator): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
+project(*Creator): taoclient, fault_tolerance, orbsvcsexe {
   exename = ft_create
+  avoids += minimum_corba
 
   Source_Files {
     FT_Creator.cpp
@@ -125,8 +131,9 @@ project(*Creator): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
   }
 }
 
-project(*RMController): taoclient, fault_tolerance, orbsvcsexe, minimum_corba {
+project(*RMController): taoclient, fault_tolerance, orbsvcsexe {
   exename = replmgr_controller
+  avoids += minimum_corba
   Source_Files {
     FT_ReplicationManagerController.cpp
   }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index db1f0cd28a2..29e711b4ac1 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -15,7 +15,7 @@
 #include "FT_Creator.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
-#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h>
 
 #include <ace/Get_Opt.h>
 #include <ace/OS_NS_stdio.h>
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 1c10cfed7aa..bfe9a4790e1 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -14,10 +14,10 @@
 #include "FT_TestReplica_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/PortableGroup/PG_Property_Set.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h"
 
 // Use this macro at the beginning of CORBA methods
 // to aid in debugging.
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index a2bc85e5f80..0db1f6d948c 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -30,7 +30,7 @@ class  FT_ReplicaFactory_i;
 #include <ace/Vector_T.h>
 #include "FT_TestReplicaS.h"
 #include <ace/Thread_Manager.h>
-#include <orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
 
 /////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 0af57a70274..57f2789169d 100755
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/FT_ReplicationManagerC.h"
+#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h"
 #include <ace/Get_Opt.h>
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl
index b9d41ed7429..7df01cb3cfc 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl
@@ -14,7 +14,7 @@
 #ifndef FT_TESTREPLICA_IDL
 #define FT_TESTREPLICA_IDL
 
-#include "orbsvcs/FT_Replica.idl"
+#include "orbsvcs/orbsvcs/FT_Replica.idl"
 
 module FT_TEST
 {
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 66e48bc950c..b60de378ad5 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -4,7 +4,7 @@
 
 #include "ReplicationManagerFaultConsumerAdapter.h"
 #include "ace/Get_Opt.h"
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index 0d0833f7755..b06a41469cb 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -10,8 +10,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h>
-#include <orbsvcs/FT_NotifierC.h>
-#include <orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
 #include <ace/Vector_T.h>
 
 /////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 2ed7b7baca0..f2bec9e8df6 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -5,7 +5,7 @@
 #include "StubBatchConsumer.h"
 #include "ace/Get_Opt.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 
 StubBatchConsumer::StubBatchConsumer ()
   : quit_(0)
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index d81d9fa061c..d7183f6c7f0 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -10,8 +10,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include <orbsvcs/CosNotifyChannelAdminS.h>
-#include <orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/orbsvcs/CosNotifyChannelAdminS.h>
+#include <orbsvcs/orbsvcs/FT_NotifierC.h>
 
 //////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index f66171dec1a..cbcb441ae9e 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -5,7 +5,7 @@
 #include "StubFaultAnalyzer.h"
 #include "ace/Get_Opt.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 7da34e52cba..d617e9c4845 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -12,8 +12,8 @@
 
 #include "StubFaultConsumer.h"
 #include "StubBatchConsumer.h"
-#include <orbsvcs/FT_NotifierC.h>
-#include <orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
 
 #include "ace/Vector_T.h"
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 33c4491e7f1..016f086f327 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -5,7 +5,7 @@
 #include "StubFaultConsumer.h"
 #include "ace/Get_Opt.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 
 StubFaultConsumer::StubFaultConsumer ()
   : quit_(0)
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 374b2e7b588..630bad0d6e9 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -10,8 +10,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include <orbsvcs/FT_NotifierC.h>
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include <orbsvcs/orbsvcs/FT_NotifierC.h>
 
 //////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 47b2453d95e..64f1adf3bb5 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -6,7 +6,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index b939dbdf74b..32e738a8b92 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -11,8 +11,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 #include  /**/ <ace/pre.h>
 
-#include <orbsvcs/FT_NotifierS.h>
-#include <orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/orbsvcs/FT_NotifierS.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
 #include <ace/Vector_T.h>
 
 //////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 3939bb548ac..b82140602e6 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -14,9 +14,9 @@
 
 #include "TAO_Object_Group_Creator.h"
 #include <ace/OS_NS_stdio.h>
-#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
-#include <orbsvcs/FT_FaultDetectorFactoryC.h>
-#include <orbsvcs/PortableGroup/PG_Operators.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Operators.h>
 
 #include <ace/Get_Opt.h>
 
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index 5bf6c6aae58..f987d0b45ac 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -20,8 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include <orbsvcs/FT_ReplicationManagerC.h>
-#include <orbsvcs/PortableGroupC.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/orbsvcs/PortableGroupC.h>
 #include <ace/SString.h>
 #include <ace/Vector_T.h>
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
index 8dc4ef24e24..ed0d52a13c5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
@@ -3,7 +3,7 @@
 
 project(*Server): taoserver, orbsvcsexe, iormanip, ftorb, messaging{
   requires += interceptors
-  idlflags += -DCORBA3 -I$(TAO_ROOT)
+  idlflags += -Gv -DCORBA3 -I$(TAO_ROOT)
 
   Source_Files {
     test_i.cpp
@@ -17,7 +17,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, ftorb, messaging{
 
 project(*Client): taoclient, orbsvcsexe, iormanip, ftorb {
   requires += interceptors
-  idlflags += -DCORBA3 -I$(TAO_ROOT)
+  idlflags += -Gv -DCORBA3 -I$(TAO_ROOT)
 
   Source_Files {
     testC.cpp
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 4c9d10a1936..53b36402947 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 #include "Server_Request_Interceptor.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
 #include "testS.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 82ac5cdec4b..800f6eacbfa 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
 
 ACE_RCSID (Group_Ref_Manip,
            client,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index ee1bd7e9d0e..5d959174ed5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -10,9 +10,9 @@
 #include "Server_Request_Interceptor.h"
 #include "tao/IORManipulation/IORManipulation.h"
 #include "tao/ORBInitializer_Registry.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 
 ACE_RCSID (ForwardRequest,
            server,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 543da3eff4f..3cb915df554 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -6,8 +6,8 @@
 #include "ace/Read_Buffer.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 72014970c1d..9d85a48410e 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -18,8 +18,8 @@
 //=========================================================================
 
 #include "tao/ORB.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 
 ACE_RCSID(IOGRManipluation,
           IOGRTest,
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index bb03eff19a1..0d5a1bd90e0 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_sys_time.h"
 #include "PushConsumer.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include <stdio.h>
 
 ACE_RCSID (FtRtEvent,
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
index 11c5601a36e..330cb279194 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
@@ -12,7 +12,7 @@
 #ifndef PUSHCONSUMERIMPL_H
 #define PUSHCONSUMERIMPL_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
 
 class PushConsumer_impl :
 public virtual POA_RtecEventComm::PushConsumer
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 8c1b1757ecf..cb16b1b042f 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 #include "PushSupplier.h"
 #include "ace/Reactor.h"
 #include "ace/Select_Reactor.h"
 #include "tao/MProfile.h"
 #include "tao/Stub.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
 
 ACE_RCSID (FtRtEvent,
            PushSupplier,
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
index b286fd96926..1307b2d27b7 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -12,8 +12,8 @@
 #ifndef PUSHSUPPLIER_H
 #define PUSHSUPPLIER_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Event_Handler.h"
 #include "ace/Task.h"
 #include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 8fabe5d60d4..52afdd7fddb 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -1,18 +1,18 @@
 // $Id$
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
 #include "PushConsumer.h"
 #include "ace/Get_Opt.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
-#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
 
 /// include this file to statically linked with FT ORB
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
 /// include this file to statically linked with Transaction Depth
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
 ACE_RCSID (FtRtEvent,
            PushConsumer,
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index bd0b1bf3238..d2383d84e9c 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -1,16 +1,16 @@
 // $Id$
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
 #include "PushSupplier.h"
 #include "ace/Get_Opt.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
-#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
 
 /// include this file to statically linked with FT ORB
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
 /// include this file to statically linked with Transaction Depth
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
 ACE_RCSID (FtRtEvent,
            supplier,
diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
index ae73b4ba0d3..0949799b83d 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
+++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, iortable, svc_utils {
+project(*server): namingexe {
   Source_Files {
     server_i.cpp
     MCast_Server_i.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, iortable, svc_utils {
   }
 }
 
-project(*client): namingexe, iortable, svc_utils {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index be8c6ab97c8..829cb75d232 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -9,17 +9,18 @@ int main (int argc, char *argv[])
     {
       Server_i svr_i;
 
-      const int init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int init_result;
+
+      init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (init_result != 0)
         return 1;
 
     }
-  ACE_CATCHANY
+  ACE_CATCH (CORBA::SystemException, ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CORBA exception raised in server!");
+            ACE_PRINT_EXCEPTION (ex, "CORBA exception raised in server!");
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index 35844172cac..40a13661091 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -5,7 +5,7 @@
 #ifndef SERVER_I_H
 #define SERVER_I_H
 
-#include "orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
 
 class Server_i
 {
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
index 037a604d364..2fe7ca7d7e6 100755
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
@@ -13,17 +13,13 @@ use PerlACE::Run_Test;
 
 $imr_ior = PerlACE::LocalFile ("imr.ior");
 $name_ior = PerlACE::LocalFile ("name.ior");
-$activator_ior = PerlACE::LocalFile("activator.ior");
 
 $IMR = new PerlACE::Process ("../../../ImplRepo_Service/ImplRepo_Service");
-$ACTIVATOR = new PerlACE::Process("../../../ImplRepo_Service/ImR_Activator");
 $NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service");
-$TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr");
+$TAO_IMR = new PerlACE::Process ("../../../ImplRepo_Service/tao_imr");
 
 $TEST = new PerlACE::Process ("test");
 
-$imr_init_ref = "-ORBInitRef ImplRepoService=file://$imr_ior";
-
 ################################################################################
 
 $errors = 0;
@@ -34,32 +30,22 @@ unlink $name_ior;
 ################################################################################
 ## Start the implementation Repository
 
-$IMR->Arguments ("-o $imr_ior -d 1");
+$IMR->Arguments ("-o $imr_ior -d 0");
 $IMR->Spawn ();
 
-if (PerlACE::waitforfile_timed ($imr_ior, 10) == -1) {
+if (PerlACE::waitforfile_timed ($imr_ior, 5) == -1) {
     print STDERR "ERROR: waiting for $imr_ior\n";
     $IMR->Kill ();
     exit 1;
 }
 
-$ACTIVATOR->Arguments("-d 1 -o $activator_ior $imr_init_ref");
-$ACTIVATOR->Spawn();
-
-if (PerlACE::waitforfile_timed ($activator_ior, 10) == -1) {
-    print STDERR "ERROR: waiting for $activator_ior\n";
-    $IMR->Kill ();
-    $ACTIVATOR->Kill();
-    exit 1;
-}
-
 ################################################################################
 ## Register the NameService
 
-$TAO_IMR->Arguments("$imr_init_ref"
+$TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_ior"
                     . " add NameService "
                     ." -c \"" . $NS->Executable ()
-                       ." $imr_init_ref"
+                       ." -ORBInitRef ImplRepoService=file://$imr_ior"
                        ." -ORBUseIMR 1 .\"");
 
 $taoimr = $TAO_IMR->SpawnWaitKill (60);
@@ -72,7 +58,8 @@ if ($taoimr != 0) {
 ################################################################################
 ## Create IOR for NameService
 
-$TAO_IMR->Arguments ("$imr_init_ref ior NameService -f $name_ior");
+$TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$imr_ior"
+                     . " ior NameService -f $name_ior");
 
 
 $taoimr = $TAO_IMR->SpawnWaitKill (60);
@@ -111,13 +98,6 @@ if ($taoimr != 0) {
 ################################################################################
 ## Kill the IMR
 
-$iserver = $ACTIVATOR->TerminateWaitKill (5);
-
-if ($iserver != 0) {
-    print STDERR "ERROR: ImR_Activator returned $iserver\n";
-    ++$errors;
-}
-
 $iserver = $IMR->TerminateWaitKill (5);
 
 if ($iserver != 0) {
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index b885f1b28ed..defc5e21897 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -2,7 +2,7 @@
 // $Id$
 //
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
index 099f5fdad62..d13886d8d87 100755
--- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
@@ -17,7 +17,7 @@ $pfile = PerlACE::LocalFile ("persistence.dat");
 
 $IMR_LOCATOR = new PerlACE::Process ("../../../ImplRepo_Service/ImplRepo_Service");
 $IMR_ACTIVATOR = new PerlACE::Process ("../../../ImplRepo_Service/ImR_Activator");
-$TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr");
+$TAO_IMR = new PerlACE::Process ("../../../ImplRepo_Service/tao_imr");
 
 ################################################################################
 
@@ -57,7 +57,7 @@ if (PerlACE::waitforfile_timed ($imr_activator_ior, 10) == -1) {
 print "===== Adding a server\n";
 
 $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior"
-                  . " add Foo -c foobarbaz");
+		    . " add Foo -c foobarbaz");
 
 $taoimr = $TAO_IMR->SpawnWaitKill (60);
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index ea222c7e56b..d3cf4ddd45f 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -41,7 +41,7 @@ $endpoint = "-ORBEndpoint " . "$protocol" . "://" . "$host" . ":" . $port;
 
 $IMR_LOCATOR = new PerlACE::Process ("../../ImplRepo_Service/ImplRepo_Service");
 $IMR_ACTIVATOR = new PerlACE::Process ("../../ImplRepo_Service/ImR_Activator");
-$TAO_IMR = new PerlACE::Process("$ACE_ROOT/bin/tao_imr");
+$TAO_IMR = new PerlACE::Process("../../ImplRepo_Service/tao_imr");
 
 $A_SVR = new PerlACE::Process (PerlACE::LocalFile ("airplane_server"));
 $A_CLI = new PerlACE::Process (PerlACE::LocalFile ("airplane_client"),
@@ -133,7 +133,7 @@ sub nt_service_test
     my $result = 0;
 
     # Just to show that it's possible, this test uses corbaloc instead of ior file.
-    my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService";
+    my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService"; 
 
     # To avoid having to ensure that they LocalSystem account has the correct path
     # we simply copy the imr executables to the same directory as the DLL's.
@@ -575,7 +575,7 @@ sub persistent_ir_test
         $status = 1;
     }
 
-    return $status;
+    return $status;   
 }
 
 ###############################################################################
@@ -610,7 +610,7 @@ sub both_ir_test
                        . " -ORBUseIMR 1 $refstyle -o $nestea_ior $imr_initref\"");
     $TAO_IMR->SpawnWaitKill (10);
 
-    $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \""
+    $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \"" 
                         . $A_SVR->Executable ()
                        . " -ORBUseIMR 1 $refstyle -o $airplane_ior $imr_initref\"");
     $TAO_IMR->SpawnWaitKill (10);
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
index 3396f7a98fe..2c14a302961 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, ifr_client, minimum_corba {
+project(*server): taoexe, portableserver, ifr_client {
+  avoids  += minimum_corba
 
   Source_Files {
     test_i.cpp
@@ -9,7 +10,8 @@ project(*server): taoexe, portableserver, ifr_client, minimum_corba {
   }
 }
 
-project(*client): taoexe, portableserver, ifr_client, dynamicinterface, minimum_corba {
+project(*client): taoexe, portableserver, ifr_client, dynamicinterface {
+  avoids  += minimum_corba
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
index 6ddd8f3fee1..d6831078350 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
@@ -14,6 +14,22 @@ $ifr_iorfile= "if_repo.ior";
 $svr_iorfile = "iorfile";
 $test_idl = PerlACE::LocalFile ("test.idl");
 
+# find the tao_ifr executable.
+# Its placement is dependent upon the OS and if MPC generated makefiles are used.
+my $exec_extn="";
+if ($^O eq "MSWin32") {
+  $exec_extn=".exe";
+}
+
+$tao_ifr = "../../../../../bin/tao_ifr";
+if (! -e $tao_ifr . $exec_extn ) {
+    $tao_ifr = "../../../IFR_Service/tao_ifr";
+    if (! -e $tao_ifr . $exec_extn ) {
+        print STDERR "ERROR: tao_ifr compiler not found.\n";
+        exit 1;
+    }
+}
+
 $lookup_by_name = "";
 $other = "";
 
@@ -26,7 +42,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$TAO_IFR = new PerlACE::Process ("../../../../../bin/tao_ifr");
+$TAO_IFR = new PerlACE::Process ($tao_ifr);
 $IFR     = new PerlACE::Process ("../../../IFR_Service/IFR_Service", " -o $ifr_iorfile");
 $SV      = new PerlACE::Process ("server", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile");
 $CL      = new PerlACE::Process ("client", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
index e1f0a71cc46..a34e2eafcf1 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, minimum_corba {
+project: taoexe, ifr_client {
+  avoids  += minimum_corba
   exename  = IDL3_Test
   
   Source_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
index c351c9ef039..722bf26f64d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, minimum_corba {
+project: taoexe, ifr_client {
+  avoids  += minimum_corba
   exename  = IFR_Test
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
index 57112a88744..d9ae7520f6b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, minimum_corba {
+project: taoexe, ifr_client {
+  avoids  += minimum_corba
   exename  = Persistence_Test
 }
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
index 831fed1a8d3..42c4e3b8849 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: namingexe, portableserver {
+project: namingexe {
   exename = client
-}
+}
+\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 930aeaf426a..11f367176f8 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -24,7 +24,7 @@
 #define NCONTEXTEXT_CLIENT_I_H
 
 #include "Web_ServerC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 class NContextExt_Client_i
 {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
index 6e061d588c4..6ddc01606b7 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
@@ -6,8 +6,8 @@
 #define BASIC_H
 
 #include "TestS.h"
-#include "orbsvcs/CosLoadBalancingC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #if defined (_MSC_VER)
 # if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h
index c82ed1c073b..c3567cc2ce3 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h
@@ -12,8 +12,8 @@
 //=============================================================================
 
 
-#include "orbsvcs/CosLoadBalancingC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "tao/PortableServer/PortableServer.h"
 
 // Forward Declaration of the kind of servant we would like to handle
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
index 5b0513e2e5f..ead0fe0230e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
@@ -6,7 +6,7 @@
 #define FACTORY_H
 
 #include "Factory_Map.h"
-#include "orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
 #include "ace/Null_Mutex.h"
 
 #if defined (_MSC_VER)
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
index 9b0513431dc..eec9e8e1133 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
@@ -12,8 +12,8 @@
 //=============================================================================
 
 
-#include "orbsvcs/CosLoadBalancingC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "tao/PortableServer/PortableServer.h"
 
 /**
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
index c0a82d6a630..20a8851d235 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
@@ -6,8 +6,8 @@
 #define BASIC_H
 
 #include "TestS.h"
-#include "orbsvcs/CosLoadBalancingC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #if defined (_MSC_VER)
 # if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h
index dd8366cf547..f258bdfdee5 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h
@@ -12,8 +12,8 @@
 //=============================================================================
 
 
-#include "orbsvcs/CosLoadBalancingC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 #include "tao/PortableServer/PortableServer.h"
 
 // Forward Declaration of the kind of servant we would like to handle
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
index d023b875a7e..70000152112 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
@@ -6,8 +6,8 @@
 #define SIMPLE_H
 
 #include "TestS.h"
-#include "orbsvcs/CosLoadBalancingC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
 
 #if defined (_MSC_VER)
 # if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 78b92cc6fc3..e8f5116c435 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -1,6 +1,6 @@
 #include "Basic_Log_Test.h"
 
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index 031c19ba769..e60b1ecddc5 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -17,8 +17,8 @@
 #ifndef TAO_BASIC_LOG_TEST_H
 #define TAO_BASIC_LOG_TEST_H
 
-#include "orbsvcs/DsLogAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 class BasicLog_Test
 {
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
index d3602d257d0..b1655fe84c6 100644
--- a/TAO/orbsvcs/tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Makefile.am
@@ -1,40 +1,42 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Top-level Makefile for TAO's ORB Services Tests
+##
+##---------------------------------------------------------------------------
+
+##
 ##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
 
 SUBDIRS = \
         AVStreams \
-        Bug_1334_Regression \
-        Bug_1393_Regression \
-        Bug_1395_Regression \
-        Bug_1630_Regression \
         Concurrency \
-        CosEvent \
+        CosEC_Basic \
+        CosEC_Multiple \
         EC_Custom_Marshal \
-        EC_MT_Mcast \
         EC_Mcast \
+        EC_MT_Mcast \
         EC_Multiple \
         EC_Throughput \
-        Event \
-	FT_App \
-        FaultTolerance \
-	FtRtEvent
+        ImplRepo \
+        Logger \
+        Property \
+        Sched \
+        Sched_Conf \
+        Simple_Naming \
+        Redundant_Naming \
+        Simulator \
+        Time \
+        Trading \
+	Log \
+    RTCosScheduling
+
+noinst_SCRIPTS = start_services
 
-#        IOR_MCast \
-#        ImplRepo \
-#        InterfaceRepo \
-#        Interoperable_Naming \
-#        LoadBalancing \
-#        Log \
-#        Miop \
-#        Notify \
-#        Property \
-#        RTCosScheduling \
-#        Redundant_Naming \
-#        Sched \
-#        Sched_Conf \
-#        Security \
-#        Simple_Naming \
-#        Time \
-#        Trading \
-#        ior_corbaname \
-#        tests_svc_loader
+EXTRA_DIST = $(noinst_SCRIPTS)
 
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/README b/TAO/orbsvcs/tests/Miop/McastHello/README
index 2b7205b555d..d96228dc866 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/README
+++ b/TAO/orbsvcs/tests/Miop/McastHello/README
@@ -15,20 +15,4 @@ $ ./run_test.pl
 
 	the script returns 0 if the test was successful.
 
-The test has some unique features that should be noted by
-users. Firstly, server.cpp includes MIOP.h, which has some magic for
-loading MIOP protocol in static builds. Secondly, the svc.conf has
-a directive for loading the right protocol factory. Both of them are
-required for static builds in addition to linking with the
-TAO_PortableGroup library. 
-
-However for dynamic builds things are different
-
-. One need not include MIOP.h. Including MIOP.h will require linking
-  in the TAO_PortableGroup library
-
-. The entries in the svc.conf should have dynamic directives. In
-  svc.conf you would be required to remove commented parts and run
-  the test.
-
 */
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.conf b/TAO/orbsvcs/tests/Miop/McastHello/client.conf
new file mode 100644
index 00000000000..75accdd4d58
--- /dev/null
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.conf
@@ -0,0 +1,2 @@
+dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
+static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index 10180538dbf..c0fa7328e6a 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -2,8 +2,8 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+
 #include "tao/Object_T.h"
-#include "orbsvcs/PortableGroup/MIOP.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl
index 316cf14a560..ef87c284d2d 100755
--- a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl
+++ b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl
@@ -14,9 +14,12 @@ unlink $iorfile;
 unlink $iorfile_server2;
 $status = 0;
 
-$SV1 = new PerlACE::Process ("server", "-o $iorfile");
-$SV2 = new PerlACE::Process ("server", "-o $iorfile_server2 ");
-$CL = new PerlACE::Process ("client", " -k file://$iorfile ");
+$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
+$client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext");
+
+$SV1 = new PerlACE::Process ("server", "-o $iorfile -ORBsvcconf $server_conf");
+$SV2 = new PerlACE::Process ("server", "-o $iorfile_server2 -ORBsvcconf $server_conf");
+$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBsvcconf $client_conf");
 
 $SV1->Spawn ();
 $SV2->Spawn ();
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.conf b/TAO/orbsvcs/tests/Miop/McastHello/server.conf
new file mode 100644
index 00000000000..38dd6e5896c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.conf
@@ -0,0 +1,4 @@
+dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
+static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
+#static PortableGroup_Loader ""
+dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
+\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index c71f26760f2..711a9f53f1c 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -3,7 +3,6 @@
 #include "McastHello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
-#include "orbsvcs/PortableGroup/MIOP.h"
 
 ACE_RCSID (McastHello,
            server,
@@ -79,8 +78,6 @@ main (int argc, char *argv[])
 
       // Get the group IOR.
       CORBA::String_var ior = CORBA::string_dup (group_ior);
-
-
       CORBA::Object_var group1 =
         orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
index f41844762f9..eae38394313 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
+++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
@@ -8,13 +8,13 @@ project(*Notify ConnectDisconnect): notifytest {
 }
 
 
-project(*Notify LifeCycle): notifytest {
+project(*Notify LifeCycle): notifytest, naming {
   Source_Files {
     LifeCycle.cpp
   }
 }
 
-project(*Notify IdAssignment): notifytest {
+project(*Notify IdAssignment): notifytest, naming {
   Source_Files {
     IdAssignment.cpp
   }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index d6e52a015d8..6d96f438923 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -3,8 +3,8 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "IdAssignment.h"
 
 ACE_RCSID (Notify_Tests, 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 7b4a7e3920f..581fa2be9b5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -16,7 +16,7 @@
 #ifndef IDASSIGNMENT_H
 #define IDASSIGNMENT_H
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 
 class IdAssignment
 {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 4f48407b6af..bf7a29af1e4 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -3,9 +3,9 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
-#include <orbsvcs/CosNamingC.h>
-#include <orbsvcs/CosNotifyCommC.h>
-#include <orbsvcs/CosNotifyChannelAdminC.h>
+#include <orbsvcs/orbsvcs/CosNamingC.h>
+#include <orbsvcs/orbsvcs/CosNotifyCommC.h>
+#include <orbsvcs/orbsvcs/CosNotifyChannelAdminC.h>
 
 #include "LifeCycle.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 19352ec0150..fd234dcc6e5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -19,7 +19,7 @@
 #include "Notify_Test_Client.h"
 #include "Notify_SequencePushConsumer.h"
 #include "Notify_SequencePushSupplier.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index 475e5719d0d..c930e066381 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Structured_Push_Consumer.h"
-#include "orbsvcs/Notify/Notify_Extensions.h"
+#include "orbsvcs/orbsvcs/Notify/Notify_Extensions.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
index 8041f156b35..86b160c2e0a 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -19,7 +19,7 @@
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
 #include "Notify_StructuredPushConsumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 
 class Notify_Structured_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer
 {
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index 97db6fc7f80..bae1c684bf7 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -7,9 +7,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 03c7ce9214a..d1220a50e02 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -8,10 +8,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.h b/TAO/orbsvcs/tests/Notify/Blocking/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
index b437d7b75e3..c829b8efa06 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
 #include "../lib/Notify_Test_Client.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 #include "ace/OS_main.h"
 
 int
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index 4ad43dcb356..7e752c1189f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index 46516422f0f..8e5713ebb2d 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 427fc996aea..79cf4ff3634 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -8,10 +8,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index 18563673738..fe185bd3254 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 47302392e00..050a2976d53 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -8,10 +8,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.h b/TAO/orbsvcs/tests/Notify/Discarding/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 1486816ff5e..5e7b8b6f034 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -6,8 +6,8 @@
 
 #include "ace/Get_Opt.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 #include "ace/OS_NS_sys_time.h"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index f50a5bc3846..80f3d3ad428 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -8,9 +8,9 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index 94fdf02c5c1..f6dc8e42ab5 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 0e2973152ad..588d83caffc 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Structured_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index ca6de9a909a..ad410ec2af8 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index f689cb5b866..0434804c2be 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -9,10 +9,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index b06369cba80..a2c96e61b66 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index de8e0d5aae6..cd1c1b579b4 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -9,10 +9,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.h b/TAO/orbsvcs/tests/Notify/Ordering/common.h
index 679adb0a42c..54ce6c9720a 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 188dc2a032c..4a3ac0a1c4d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index ac2b673cd99..a2bfacea20d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 62127227df9..a99fcaa6aec 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -8,10 +8,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index 5b3e48d271f..509fe631c00 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 9cc7a728152..e64fd49f725 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index a6c6bac9662..6f2a32690c9 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -11,9 +11,9 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
index 2bfe6d28614..de96c575df2 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Struct Supp): notifytest {
+project(*Ntf Struct Supp): notifytest, naming {
   exename = Structured_Supplier
 
   Source_Files {
@@ -9,7 +9,7 @@ project(*Ntf Struct Supp): notifytest {
   }
 }
 
-project(*Ntf Struct Cons): notifytest {
+project(*Ntf Struct Cons): notifytest, naming {
   exename = Structured_Consumer
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 54406640c59..622080e1b27 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -7,9 +7,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "controlC.h"
 #include "Notify_Push_Consumer.h"
 #include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 74a90e7f845..fba45d19f79 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -4,9 +4,9 @@
 // Include Section
 // ******************************************************************
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "controlS.h"
 #include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
index 2c9b03fe5ca..b2962f5fba2 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Struct Supp): notifytest {
+project(*Ntf Struct Supp): notifytest, naming {
   exename = Structured_Supplier
 
   Source_Files {
@@ -10,7 +10,7 @@ project(*Ntf Struct Supp): notifytest {
   }
 }
 
-project(*Ntf Struct Cons): notifytest {
+project(*Ntf Struct Cons): notifytest, naming {
   exename = Structured_Consumer
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index 1673dd1975a..915ce0f8e61 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -7,9 +7,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "controlC.h"
 #include "Notify_Push_Consumer.h"
 #include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 829bc0b9b08..8b4d62ec7b7 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -5,9 +5,9 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Push_Supplier.h"
 #include "controlS.h"
 #include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index 4b2e1021bdb..0efa9039997 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index dd0588a2543..75d395824ae 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyFilterS.h"
-#include "orbsvcs/Notify/FilterFactory.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/Notify/FilterFactory.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
index 1964722a76f..3967e5772d7 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(TAO_RT_NotifyTests_Filter): orbsvcslib, notification_skel, rtcorba, etcl, dynamicany, portableserver, iortable {
+project(TAO_RT_NotifyTests_Filter): orbsvcslib, notification, rtcorba, etcl, dynamicany, portableserver, iortable {
 				    
   sharedname = TAO_RT_NotifyTests_Filter
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index a94146e47bc..429cfe0ca99 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 /**
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 1a07e216014..1a94c4f4291 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -20,9 +20,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
-//#include "../../../orbsvcs/Notify/CosNotify_Initializer.h"
+#include "../../../orbsvcs/Notify/CosNotify_Initializer.h"
 
 class TAO_Notify_Service;
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 2678b6c4437..24e263b908c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 /**
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index 6cd7f1da60d..bba40b99762 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -21,8 +21,8 @@
 
 #include "ace/Singleton.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Hash_Map_Manager.h"
 
 class TAO_Notify_Tests_Periodic_Supplier;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 60a1e436d08..b85f6540d86 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -16,9 +16,9 @@
 #ifndef NOTIFY_TEST_CLIENT_H
 #define NOTIFY_TEST_CLIENT_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "notify_test_export.h"
 
 class TAO_NOTIFY_TEST_Export Notify_Test_Client
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
index b4a0aacf126..c2cb98ffa63 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(NotifyTests_Lib): orbsvcslib, notification_skel, naming, svc_utils {
+project(NotifyTests_Lib): orbsvcslib, notification, naming {
   sharedname = TAO_NotifyTests
   dynamicflags = TAO_NOTIFY_TEST_BUILD_DLL
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 2134941a87f..0a257ceed2d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -7,7 +7,7 @@ ACE_RCSID (lib,
            "$Id$")
 
 #include "tao/debug.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index 7acd1919324..6cdc20933b0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Arg_Shifter.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 /**
  * @class TAO_Notify_Tests_Options_Parser
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index 293218f1ae5..f6e11655d40 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -14,7 +14,7 @@ ACE_RCSID (lib,
 #include "Name.h"
 #include "LookupManager.h"
 #include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer (void)
   : poa_name_ (TAO_Notify_Tests_Name::root_poa)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index 3273306214b..2df32f45f92 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 279291b2db2..8a042567060 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -17,7 +17,7 @@ ACE_RCSID (Notify,
 #include "Name.h"
 #include "LookupManager.h"
 #include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 template <class Peer_Traits>
 TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T (void)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 66d655dd9b6..116f4d7fedf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -5,7 +5,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
 #include "tao/debug.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "StructuredEvent.h"
 #include "Task_Stats.h"
 #include "Task_Callback.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index 7b3e5527ed7..78929ec2730 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (lib,
 #include "Direct_Consumer.h"
 #include "Activation_Manager.h"
 #include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command (void)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index d258c7e2e8a..977c0f22f64 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 class TAO_Notify_Tests_Periodic_Consumer;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index f637105b924..ded6a360841 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "StructuredEvent.h"
 #include "Task_Stats.h"
 #include "Task_Callback.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 0378605ffea..6b97740e3ca 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (lib,
 #include "Direct_Supplier.h"
 #include "Activation_Manager.h"
 #include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command (void)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 726d7cd0ddd..a03215cb7b4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 class TAO_Notify_Tests_Periodic_Supplier;
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 5aae9203447..4c624eb407b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Consumer_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index edf2753e87d..bce5a9a9c9e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Supplier_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 7e4a4773b27..a462f94db79 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Consumer_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index dad8bd6d0eb..441348257e3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Supplier_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
index dddecec4dc1..a2a5b236df8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 /**
  * @class TAO_Notify_Tests_StructuredEvent
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 43ee9ffec52..a83edf24f79 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Consumer_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index e1c11dc6a54..e7c04d2e82d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Supplier_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index fbed3172551..10c011ee66d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 /**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
index 0c726ed4014..3bc2661b6b9 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
@@ -1,12 +1,14 @@
 // $Id$
-project(*Ntf Perf Struct Supp): notifytest, minimum_corba {
+project(*Ntf Perf Struct Supp): notifytest {
+  avoids += minimum_corba
   exename = Structured_Supplier
   Source_Files {
     Structured_Supplier.cpp
   }
 }
 
-project(*Ntf Perf Struct Cons): notifytest, minimum_corba {
+project(*Ntf Perf Struct Cons): notifytest {
+  avoids += minimum_corba
   exename = Structured_Consumer
   Source_Files {
     goC.cpp
@@ -16,14 +18,16 @@ project(*Ntf Perf Struct Cons): notifytest, minimum_corba {
   }
 }
 
-project(*Ntf Perf Seq Supp): notifytest, minimum_corba {
+project(*Ntf Perf Seq Supp): notifytest {
+  avoids += minimum_corba
   exename = Sequence_Supplier
   Source_Files {
     Sequence_Supplier.cpp
   }
 }
 
-project(*notify perf Sequence Consumer): notifytest, minimum_corba {
+project(*notify perf Sequence Consumer): notifytest {
+  avoids += minimum_corba
   exename = Sequence_Consumer
   Source_Files {
     goC.cpp
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 1ff4cb087c0..a0cfc9f8a46 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -6,8 +6,8 @@
 
 #include "ace/Get_Opt.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 124dca8a155..cff6c00dfe3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -8,9 +8,9 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index 8c543bd6b44..541266d8cd1 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -6,8 +6,8 @@
 
 #include "ace/Get_Opt.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index c3cc5ac0f4a..5644e71b127 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -8,9 +8,9 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
index 619fd2e21b9..8f78c3f2121 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Perf RedGreen): notifytest {
+project(*Ntf Perf RedGreen): notifytest, naming {
   exename = RedGreen_Test
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index cbb435d4295..1dcc9f2e98a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -4,7 +4,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
 ACE_RCSID (Notify, 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index a6d83524294..6759d3bc543 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -17,9 +17,9 @@
 #ifndef NOTIFY_RedGreen_Test_CLIENT_H
 #define NOTIFY_RedGreen_Test_CLIENT_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Task.h"
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 24c72c47766..a298517a58d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -9,8 +9,8 @@
 #include "ace/Dynamic_Service.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Messaging/Messaging.h"
-#include "orbsvcs/Notify/Service.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Notify/Service.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 ACE_RCSID (Notify_Tests, 
            Throughput, 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
index b16923c43da..d645c76001a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Perf Throughput): notifytest, strategies, messaging, minimum_corba {
+project(*Ntf Perf Throughput): notifytest, strategies, messaging, naming {
+  avoids += minimum_corba
   exename  = Throughput
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
index 0515ecbd0db..8706e4bd882 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
index a747c353448..aa0e93c02df 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
index 0515ecbd0db..8706e4bd882 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
index a747c353448..aa0e93c02df 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
index cc59624b3fb..acb3f6fee00 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
@@ -3,7 +3,7 @@
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
 #
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
 
 ##---- Load the Factories------
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
index fcaa0f1cc8f..33d916bf88f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
@@ -2,7 +2,7 @@
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
index 61456d1a199..b9b7b4b50cc 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""         
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""         
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
index a747c353448..aa0e93c02df 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
index 0515ecbd0db..8706e4bd882 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
index a747c353448..aa0e93c02df 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 4845eb5a324..9ff5ad078b2 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -30,8 +30,8 @@
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 class Client
 {
diff --git a/TAO/orbsvcs/tests/Property/server.h b/TAO/orbsvcs/tests/Property/server.h
index 0ddad8b9aae..afe9808e3bf 100644
--- a/TAO/orbsvcs/tests/Property/server.h
+++ b/TAO/orbsvcs/tests/Property/server.h
@@ -21,7 +21,7 @@
 #define COSPROPERTYSERVICE_SERVER_H
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 #endif /* COSPROPERTYSERVICE_SERVER_H */
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index 5ee39f1c23a..1ad8bfc30f2 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -12,7 +12,7 @@
 
 
 #include "testSchedC.h"
-#include <orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h>
+#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h>
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
 #include "tao/Version.h"
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index ae46946ce65..7df823caafc 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -11,7 +11,7 @@
 //=============================================================================
 
 #include "Object1_i.h"
-#include <orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h>
+#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h>
 
 #include "tao/Version.h"
 
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
index bbeedbc28fb..18f3e669754 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
+++ b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : namingexe, portableserver {
+project(*Client) : namingexe {
   exename  = client
 }
 
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 3d93dfff3bb..786f53ab34b 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -17,8 +17,8 @@
 // ============================================================================
 
 #include "test_objectS.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 #include "tao/PortableServer/ORB_Manager.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
index fe06daf6ba8..4b580b8ed46 100644
--- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/Sched/Strategy_Scheduler.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #if defined (ACE_HAS_QUANTIFY)
 # include <quantify.h>
 #endif /* ACE_HAS_QUANTIFY */
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 2737124fdf9..74272df5877 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -6,10 +6,9 @@
 #include "ace/Sched_Params.h"
 #include "ace/Get_Opt.h"
 
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 ACE_RCSID (Sched_Conf, 
            Sched_Conf, 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index fff85f45219..fe655323b89 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -9,7 +9,7 @@
 
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
 
 ACE_RCSID(Sched_Conf, Sched_Conf_Anomalies, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index b6107a0a062..d65ee46ec55 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -10,7 +10,7 @@
 
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
 
 #include "Sched_Conf_Runtime.h"
 
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
index 1ab4d83b7e1..03c1d64f0d0 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*security server): orbsvcslib, portableserver, ssl, ssliop {
+project(*security server): orbsvcsexe, portableserver, ssl, ssliop {
   Source_Files {
     Server_Worker.cpp
     test_i.cpp
@@ -9,7 +9,7 @@ project(*security server): orbsvcslib, portableserver, ssl, ssliop {
   }
 }
 
-project(*security client): orbsvcslib {
+project(*security client): orbsvcsexe, ssl {
   Source_Files {
     testC.cpp
     Client_Worker.cpp
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index c2b447fab3a..618d490c664 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -5,7 +5,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Transport_Cache_Manager.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
+#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h"
 #include "ace/OS_NS_unistd.h"
 
 #if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index 144006f317e..3188c58be17 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -16,7 +16,7 @@
 #define SECURE_INVOCATION_FOO_I_H
 
 #include "FooS.h"
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
 
 class Foo_i : public virtual POA_Foo::Bar
             , public virtual PortableServer::RefCountServantBase
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
index 187ce8a2f7b..6ec5ebfe5de 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop {
+project(*security server): taoexe, portableserver, orbsvcsexe, security, ssl {
   Source_Files {
     Foo_i.cpp
     server.cpp
   }
 }
 
-project(*security client): taoexe, orbsvcslib, security {
+project(*security client): taoexe, orbsvcsexe, security, ssl {
   Source_Files {
     FooC.cpp
     client.cpp
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index ea861c51cd2..cfc5da04d59 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -3,7 +3,7 @@
 #include "ace/Get_Opt.h"
 
 #include "FooC.h"
-#include "orbsvcs/SecurityC.h"
+#include "orbsvcs/orbsvcs/SecurityC.h"
 
 ACE_RCSID (Secure_Invocation,
            client,
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
index 4243f3ab3dc..4fd7687a525 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -16,7 +16,7 @@
 #define TAO_SLEVEL1_TEST_I_H
 
 #include "SLevel1_TestS.h"
-#include "orbsvcs/SecurityLevel1C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel1C.h"
 #include "openssl/x509.h"
 
 class SLevel1_Server_i : public POA_SLevel1_Server
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
index 4ba28eda246..b6d7f968d50 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*security server): taoexe, portableserver, orbsvcslib, ssl, security {
+project(*security server): taoexe, portableserver, orbsvcsexe, ssl, security {
   Source_Files {
     SLevel1_Test_i.cpp
     server.cpp
   }
 }
 
-project(*security client): taoexe {
+project(*security client): taoexe, orbsvcsexe, ssl, security {
   Source_Files {
     SLevel1_TestC.cpp
     client.cpp
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
index 97620a0feb0..f7a14d12a38 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
+++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : namingexe, portableserver {
+project(*Client) : namingexe {
   Source_Files {
     client.cpp
   }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index 15eb7fe577e..94e0c1c5ae7 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #include "test_objectS.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 #include "tao/PortableServer/ORB_Manager.h"
 #include "ace/Task.h"
 
diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h
index 66062dace39..8d00d712578 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.h
+++ b/TAO/orbsvcs/tests/Time/Client_i.h
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-#include "orbsvcs/TimeServiceC.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/TimeServiceC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 class Client_i
 {
diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp
index 690b329a7d7..764d016bdf5 100644
--- a/TAO/orbsvcs/tests/Time/client.cpp
+++ b/TAO/orbsvcs/tests/Time/client.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "Client_i.h"
-#include "ace/Log_Msg.h"
 
 ACE_RCSID(Time, client, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 2a5e78885b3..a4d447cb7d7 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Trader/Trader_Utils.h"
+#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h"
 #include "ttest_export.h"
 
 class TAO_TTest_Export TAO_Offer_Importer
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 28cf7b442dd..b18406139fb 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -16,7 +16,7 @@
 #ifndef TAO_SIMPLE_DYNAMIC_H
 #define TAO_SIMPLE_DYNAMIC_H
 
-#include "orbsvcs/Trader/Trader_Utils.h"
+#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index dfd8d90740e..c19395fb428 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "TT_Info.h"
-#include "orbsvcs/Trader/Trader_Utils.h"
+#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index de4935df75c..d6f776e7465 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -6,9 +6,9 @@
 #include "TTestS.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Read_Buffer.h"
-#include "orbsvcs/CosTradingC.h"
-#include "orbsvcs/CosTradingReposC.h"
-#include "orbsvcs/CosTradingDynamicC.h"
+#include "orbsvcs/orbsvcs/CosTradingC.h"
+#include "orbsvcs/orbsvcs/CosTradingReposC.h"
+#include "orbsvcs/orbsvcs/CosTradingDynamicC.h"
 #include "ttest_export.h"
 
 class TAO_TTest_Export TT_Info
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index be9a73bffe7..45c782c3665 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynamicany, portableserver {
+project(*Test Lib): orbsvcslib, trading, naming, svc_utils, iortable, dynamicany, portableserver {
   sharedname = TTest
   idlflags += -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h
   dynamicflags = TAO_TTEST_BUILD_DLL
@@ -23,7 +23,7 @@ project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynam
   }
 }
 
-project(*export test): namingexe, trading_serv, dynamicany, portableserver {
+project(*export test): namingexe, trading, dynamicany {
   after   += Trading_Test_Lib
   libs    += TTest
 
@@ -35,7 +35,7 @@ project(*export test): namingexe, trading_serv, dynamicany, portableserver {
   }
 }
 
-project(*import test): namingexe, trading_serv, dynamicany, portableserver {
+project(*import test): namingexe, trading, dynamicany {
   after   += Trading_Test_Lib
   libs    += TTest
 
@@ -47,7 +47,7 @@ project(*import test): namingexe, trading_serv, dynamicany, portableserver {
   }
 }
 
-project(*colocated test): namingexe, trading_serv, dynamicany {
+project(*colocated test): namingexe, trading, dynamicany {
   after   += Trading_Test_Lib
   libs    += TTest
 
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index aa780f7e187..cf25819a70a 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -6,8 +6,8 @@
 #include "Offer_Exporter.h"
 #include "Offer_Importer.h"
 #include "Service_Type_Exporter.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h"
 
 ACE_RCSID (Trading, 
            colocated_test, 
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 23fc4c88e83..582c340445e 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -5,8 +5,8 @@
 #include "Offer_Importer.h"
 #include "Service_Type_Exporter.h"
 #include "ace/Auto_Ptr.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h"
 
 ACE_RCSID (Trading, 
            export_test, 
diff --git a/TAO/orbsvcs/tests/ior_corbaname/README b/TAO/orbsvcs/tests/ior_corbaname/README
index 75035230361..79ae355c477 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/README
+++ b/TAO/orbsvcs/tests/ior_corbaname/README
@@ -20,7 +20,7 @@ To test manually:
 	CORBANAME style URL is used and the protocol used to 
 	contact the naming context is <iiop> implicitly.
 	
- b)	./client corbaname::iiop:doc.ece.uci.edu:12345
+ b)	./client corbaname:iiop:doc.ece.uci.edu:12345
 
 	CORBANAME style URL is used and the protocol used to 
 	contact the naming context is <iiop>.
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
index 93e27debf15..a79ed9647e8 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, portableserver {
+project(*server): namingexe, naming {
   Source_Files {
     status_i.cpp
     server.cpp
   }
 }
 
-project(*client): namingexe, portableserver {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 96fbbdd52d9..04dfc884fbb 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -24,7 +24,7 @@
 #define IOR_CORBANAME_CLIENT_I_H
 
 #include "corbanameC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 class IOR_corbaname_Client_i
 {
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 4582f0445a0..1da3867a5da 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "status_i.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 int main (int argc, char* argv[])
 {
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index f4f3d3311c2..ceb937af83f 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -22,20 +22,16 @@
 //
 // ============================================================================
 
-#include "tao/ORB.h"
-#include "tao/Object.h"
-#include "tao/SystemException.h"
-
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 #include "ace/CORBA_macros.h"
 
+#include "tao/ORB.h"
 
-ACE_RCSID (tests_svc_loader,
-           tests_svc_loader,
+ACE_RCSID (tests_svc_loader, 
+           tests_svc_loader, 
            "$Id$")
 
-
 int main (int argc, char *argv [])
 {
 
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
deleted file mode 100644
index c9e68d98406..00000000000
--- a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.h b/TAO/performance-tests/AMI_Latency/Roundtrip.h
deleted file mode 100644
index efef33dd7e6..00000000000
--- a/TAO/performance-tests/AMI_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
deleted file mode 100644
index 5f0061601e4..00000000000
--- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip_Handler.h"
-
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
-Roundtrip_Handler::Roundtrip_Handler (int expected_callbacks)
-  : pending_callbacks_ (expected_callbacks)
-{
-}
-
-int
-Roundtrip_Handler::pending_callbacks (void) const
-{
-  return this->pending_callbacks_;
-}
-
-void
-Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
-{
-  this->latency_stats_.dump_results ("AMI Latency", gsf);
-}
-
-void
-Roundtrip_Handler::test_method (Test::Timestamp send_time
-                                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->pending_callbacks_--;
-
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->latency_stats_.sample (now - send_time);
-}
-
-void
-Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
-                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      this->pending_callbacks_--;
-      holder->raise_test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_method:");
-    }
-  ACE_ENDTRY;
-}
-
-void
-Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown:");
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
deleted file mode 100644
index ae777f50f20..00000000000
--- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_HANDLER_H
-#define ROUNDTRIP_HANDLER_H
-#include "ace/pre.h"
-
-#include "TestS.h"
-#include "ace/Basic_Stats.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip_Handler
-  : public virtual POA_Test::AMI_RoundtripHandler
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip_Handler (int expected_callbacks);
-
-  /// Return the number of pending callbacks
-  int pending_callbacks (void) const;
-
-  /// Dump the results
-  void dump_results (ACE_UINT32 gsf);
-
-  // = The skeleton methods
-  virtual void test_method (Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
-                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
-                               ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// The number of callbacks not received yet
-  int pending_callbacks_;
-
-  /// Collect the latency results
-  ACE_Basic_Stats latency_stats_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/AMI_Latency/Server_Task.cpp b/TAO/performance-tests/AMI_Latency/Server_Task.cpp
deleted file mode 100644
index 6df92f32a3f..00000000000
--- a/TAO/performance-tests/AMI_Latency/Server_Task.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-#include "Server_Task.h"
-
-ACE_RCSID(AMI_Latency, Server_Task, "$Id$")
-
-Server_Task::Server_Task (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Server_Task::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY {} ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/performance-tests/AMI_Latency/client.cpp b/TAO/performance-tests/AMI_Latency/client.cpp
deleted file mode 100644
index 0d396c4b67b..00000000000
--- a/TAO/performance-tests/AMI_Latency/client.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// $Id$
-
-#include "Roundtrip_Handler.h"
-#include "tao/debug.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-
-ACE_RCSID(AMI_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-ACE_hrtime_t throughput_base;
-
-int niterations = 1000;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-p <period (msecs)> "
-                           "-b <burst size> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Nil Test::Roundtrip reference <%s>\n",
-                           ior),
-                          1);
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      Roundtrip_Handler *roundtrip_handler_impl;
-      ACE_NEW_RETURN (roundtrip_handler_impl,
-                      Roundtrip_Handler (niterations),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
-
-      Test::AMI_RoundtripHandler_var roundtrip_handler =
-        roundtrip_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-      for (int i = 0; i != niterations; ++i)
-         {
-           // Invoke asynchronous operation....
-           roundtrip->sendc_test_method (roundtrip_handler.in (),
-                                         ACE_OS::gethrtime ()
-                                         ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-           ACE_TRY_CHECK;
-         }
-
-       ACE_Time_Value tv (0, 2000);
-
-       while (roundtrip_handler_impl->pending_callbacks ())
-         {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_TRY_CHECK;
-         }
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      roundtrip_handler_impl->dump_results (gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             niterations);
-
-      roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught: ");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/AMI_Latency/server.cpp b/TAO/performance-tests/AMI_Latency/server.cpp
deleted file mode 100644
index 74498dc13e0..00000000000
--- a/TAO/performance-tests/AMI_Latency/server.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "Server_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(AMI_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-int nthreads = 4;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile> "
-                           "-n <nthreads> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority);
-
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority);
-
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Server_Task server_task (orb.in ());
-      if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
-                                nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate server threads\n"),
-                          1);
-
-      server_task.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
index c0c97e91f12..ba46360e274 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
@@ -1,9 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba {
+project(*client): taoexe, portableserver, strategies, dynamicinterface {
   after    += IDL_Cubit_Server
   idlflags += -Gd
+  avoids   += minimum_corba
 
   Source_Files {
     cubitC.cpp
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.cpp b/TAO/performance-tests/DII_Latency/Roundtrip.cpp
deleted file mode 100644
index df15cd65d8a..00000000000
--- a/TAO/performance-tests/DII_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(DII_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.h b/TAO/performance-tests/DII_Latency/Roundtrip.h
deleted file mode 100644
index efef33dd7e6..00000000000
--- a/TAO/performance-tests/DII_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/DII_Latency/client.cpp b/TAO/performance-tests/DII_Latency/client.cpp
deleted file mode 100644
index 57935526269..00000000000
--- a/TAO/performance-tests/DII_Latency/client.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-
-#include "tao/Strategies/advanced_resource.h"
-#include "tao/DynamicInterface/Request.h"
-
-ACE_RCSID(DII_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int do_dump_history = 0;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (object.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil CORBA::Object reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      for (int j = 0; j < 100; ++j)
-        {
-          CORBA::Request_var request =
-            object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          CORBA::ULongLong dummy = 0;
-          request->add_in_arg("send_time") <<= dummy;
-
-          request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_Sample_History history (niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      for (int i = 0; i < niterations; ++i)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          CORBA::Request_var request =
-            object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          request->add_in_arg("send_time") <<= start;
-
-          request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          history.sample (now - start);
-        }
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      if (do_dump_history)
-        {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats stats;
-      history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             stats.samples_count ());
-
-      if (do_shutdown)
-        {
-          CORBA::Request_var request =
-            object->_request ("shutdown" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/DII_Latency/server.cpp b/TAO/performance-tests/DII_Latency/server.cpp
deleted file mode 100644
index e96f0ff595a..00000000000
--- a/TAO/performance-tests/DII_Latency/server.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
deleted file mode 100644
index 6de5cfe047a..00000000000
--- a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-#include "tao/DynamicInterface/Server_Request.h"
-
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request
-                   ACE_ENV_ARG_DECL)
-{
-  if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
-    {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Any type_id (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      const char *arg;
-      *(nv->value ()) >>= arg;
-
-      CORBA::Boolean type_matches = 0;
-      if (ACE_OS::strcmp (arg, "IDL:Test/Roundtrip:1.0") == 0
-          || ACE_OS::strcmp (arg, "IDL:omg.org/CORBA/Object:1.0") == 0
-          || ACE_OS::strcmp (arg, "") == 0)
-        type_matches = 1;
-
-      CORBA::Any result;
-      result <<= CORBA::Any::from_boolean (type_matches);
-
-      request->set_result (result ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Any send_time (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  CORBA::Any bad_operation;
-  CORBA::BAD_OPERATION exception;
-  bad_operation <<= exception;
-  request->set_exception (bad_operation ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::RepositoryId
-Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
-}
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.h b/TAO/performance-tests/DSI_Latency/Roundtrip.h
deleted file mode 100644
index d795dcb56f1..00000000000
--- a/TAO/performance-tests/DSI_Latency/Roundtrip.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include "ace/pre.h"
-
-#include "tao/DynamicInterface/Dynamic_Implementation.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/corba.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual PortableServer::DynamicImplementation
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The DSI methods
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL);
-  virtual CORBA::RepositoryId _primary_interface (
-      const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL);
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/DSI_Latency/client.cpp b/TAO/performance-tests/DSI_Latency/client.cpp
deleted file mode 100644
index 2a264e91b43..00000000000
--- a/TAO/performance-tests/DSI_Latency/client.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(DSI_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int do_dump_history = 0;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_Sample_History history (niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      for (int i = 0; i < niterations; ++i)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          history.sample (now - start);
-        }
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      if (do_dump_history)
-        {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats stats;
-      history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             stats.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/DSI_Latency/server.cpp b/TAO/performance-tests/DSI_Latency/server.cpp
deleted file mode 100644
index ebc70ade1d7..00000000000
--- a/TAO/performance-tests/DSI_Latency/server.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(DSI_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      PortableServer::ObjectId_var oid =
-        root_poa->activate_object (roundtrip_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var roundtrip =
-        root_poa->id_to_reference (oid.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp b/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
deleted file mode 100644
index 72f83576b44..00000000000
--- a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.h b/TAO/performance-tests/Deferred_Latency/Roundtrip.h
deleted file mode 100644
index efef33dd7e6..00000000000
--- a/TAO/performance-tests/Deferred_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Deferred_Latency/client.cpp b/TAO/performance-tests/Deferred_Latency/client.cpp
deleted file mode 100644
index 8aa94d94172..00000000000
--- a/TAO/performance-tests/Deferred_Latency/client.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-
-#include "tao/DynamicInterface/Request.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-
-ACE_RCSID(Deferred_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 1000;
-int burst = 10;
-int do_shutdown = 1;
-int do_dump_history = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:b:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'b':
-        burst = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-b <burst> "
-                           "-x (disable shutdown) "
-                           "-h (dump history) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_Sample_History history (niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-      CORBA::Request_var *request;
-      ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1);
-
-      for (int i = 0; i < niterations; ++i)
-        {
-          int j;
-
-          for (j = 0; j != burst; ++j)
-            {
-              CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-              request[j] =
-                roundtrip->_request ("test_method"
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              request[j]->add_in_arg () <<= start;
-              request[j]->set_return_type (CORBA::_tc_ulonglong);
-
-              request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-
-          for (j = 0; j != burst; ++j)
-            {
-              request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              CORBA::ULongLong retval;
-              if ((request[j]->return_value () >>= retval) == 1)
-                {
-                  ACE_hrtime_t now = ACE_OS::gethrtime ();
-                  history.sample (now - retval);
-                }
-            }
-        }
-      delete[] request;
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      if (do_dump_history)
-        {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats stats;
-      history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             stats.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Deferred_Latency/server.cpp b/TAO/performance-tests/Deferred_Latency/server.cpp
deleted file mode 100644
index e96f0ff595a..00000000000
--- a/TAO/performance-tests/Deferred_Latency/server.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index 3b7ab57a9c9..eb9d686f728 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency server): taoexe, portableserver, strategies, minimum_corba {
+project(*latency server): taoexe, portableserver, strategies {
+  avoids += minimum_corba
 
   Source_Files {
     Roundtrip.cpp
@@ -9,7 +10,8 @@ project(*latency server): taoexe, portableserver, strategies, minimum_corba {
   }
 }
 
-project(*latency client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba {
+project(*latency client): taoexe, portableserver, strategies, dynamicinterface {
+  avoids  += minimum_corba
 
   Source_Files {
     client.cpp
diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc
index 3d099c9d4da..2666d39006d 100644
--- a/TAO/performance-tests/Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Latency/DSI/DSI.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency server): taoexe, portableserver, strategies, dynamicinterface, minimum_corba {
+project(*latency server): taoexe, portableserver, strategies, dynamicinterface {
+  avoids  += minimum_corba
 
   IDL_Files {
   }
@@ -12,7 +13,8 @@ project(*latency server): taoexe, portableserver, strategies, dynamicinterface,
   }
 }
 
-project(*latency client): taoexe, strategies, minimum_corba {
+project(*latency client): taoexe, strategies {
+  avoids += minimum_corba
 
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
index 582246b039f..8d55ee55feb 100644
--- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies, minimum_corba {
+project(*server): taoexe, portableserver, strategies {
+  avoids += minimum_corba
 
   Source_Files {
     Roundtrip.cpp
@@ -9,7 +10,8 @@ project(*server): taoexe, portableserver, strategies, minimum_corba {
   }
 }
 
-project(*client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba {
+project(*client): taoexe, portableserver, strategies, dynamicinterface {
+  avoids  += minimum_corba
 
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/POA/Demux/Demux.mpc b/TAO/performance-tests/POA/Demux/Demux.mpc
index 5d1cb0ed9ed..d46b157a585 100644
--- a/TAO/performance-tests/POA/Demux/Demux.mpc
+++ b/TAO/performance-tests/POA/Demux/Demux.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*poa server): namingexe, portableserver {
+project(*poa server): namingexe {
   Source_Files {
     demux_test_server.cpp
     demux_test_i.cpp
@@ -9,7 +9,7 @@ project(*poa server): namingexe, portableserver {
   }
 }
 
-project(*poa client): namingexe, portableserver {
+project(*poa client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index 7ef4306b2eb..975fdeed1ab 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -25,7 +25,7 @@
 #include "ace/Log_Msg.h"
 #include "tao/Timeprobe.h"
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 #include "demux_test_i.h"
 #include "demux_test_macros.h"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
index 3319967277c..bfb4380bccc 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
@@ -1,5 +1,6 @@
 // $Id$
-project(RTCORBA_Common): taolib_with_idl, portableserver, minimum_corba {
+project(RTCORBA_Common): taolib_with_idl, portableserver {
+  avoids += minimum_corba
   sharedname   = RTCORBA_Common
   requires    += rt_corba
   idlflags    += -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
index 0819f051562..ee1af8fb5bf 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): rt_server, strategies, rtcorbacommon, minimum_corba {
+project(*server): rt_server, strategies, rtcorbacommon {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
index d5803b64f2d..2dd87870427 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
@@ -1,13 +1,15 @@
 // $Id$
 
-project(*oneways server RT): rt_server, messaging, minimum_corba {
+project(*oneways server RT): rt_server, messaging {
+  avoids += minimum_corba
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*oneways client RT): rt_client, messaging, minimum_corba {
+project(*oneways client RT): rt_client, messaging {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
index cc658473947..f7a311aff6d 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*RTCorba server): rt_server, minimum_corba {
+project(*RTCorba server): rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
-project(*RTCorba client): rt_client, minimum_corba {
+project(*RTCorba client): rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
index 1bd5a916d6b..16546d33c35 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*AMH sequence server): server, strategies, valuetype, amh {
+project(*AMH sequence server): amh, server, strategies, valuetype {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
 
-project(*AMH sequence client): taoexe, strategies, valuetype, amh {
+project(*AMH sequence client): amh, taoexe, strategies, valuetype {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
index 10900fc5f8f..da11b30d725 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(* sequence server): server, strategies, minimum_corba {
+project(* sequence server): server, strategies {
+  avoids += minimum_corba
 
   Source_Files {
     Roundtrip.cpp
@@ -9,8 +10,9 @@ project(* sequence server): server, strategies, minimum_corba {
   }
 }
 
-project(* sequence client): server, strategies, dynamicinterface, minimum_corba {
+project(* sequence client): server, strategies, dynamicinterface {
   exename  = client
+  avoids  += minimum_corba
 
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index 8aa01068f30..38fb2d8acdb 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*sequence server) : server, strategies, dynamicinterface, minimum_corba {
+project(*sequence server) : server, strategies, dynamicinterface {
+  avoids  += minimum_corba
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
-project(*sequence client): taoexe, strategies, minimum_corba {
+project(*sequence client): taoexe, strategies {
+  avoids += minimum_corba
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 10900fc5f8f..da11b30d725 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(* sequence server): server, strategies, minimum_corba {
+project(* sequence server): server, strategies {
+  avoids += minimum_corba
 
   Source_Files {
     Roundtrip.cpp
@@ -9,8 +10,9 @@ project(* sequence server): server, strategies, minimum_corba {
   }
 }
 
-project(* sequence client): server, strategies, dynamicinterface, minimum_corba {
+project(* sequence client): server, strategies, dynamicinterface {
   exename  = client
+  avoids  += minimum_corba
 
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
deleted file mode 100644
index 72f83576b44..00000000000
--- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
deleted file mode 100644
index efef33dd7e6..00000000000
--- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Single_Threaded_Latency/client.cpp b/TAO/performance-tests/Single_Threaded_Latency/client.cpp
deleted file mode 100644
index 2d841b9909d..00000000000
--- a/TAO/performance-tests/Single_Threaded_Latency/client.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int do_dump_history = 0;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "-h (dump history) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_Sample_History history (niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      for (int i = 0; i < niterations; ++i)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          history.sample (now - start);
-        }
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      if (do_dump_history)
-        {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats stats;
-      history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             stats.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Single_Threaded_Latency/server.cpp b/TAO/performance-tests/Single_Threaded_Latency/server.cpp
deleted file mode 100644
index e96f0ff595a..00000000000
--- a/TAO/performance-tests/Single_Threaded_Latency/server.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
deleted file mode 100644
index 09d15331436..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// $Id$
-//
-#include "Client_Task.h"
-
-ACE_RCSID(Thread_Per_Connection_Latency, Client_Task, "$Id$")
-
-Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
-                          int niterations)
-  : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
-  , niterations_ (niterations)
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      for (int i = 0; i != this->niterations_; ++i)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          this->latency_.sample (now - start);
-        }
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
-                                  const char *msg,
-                                  ACE_UINT32 gsf)
-{
-  totals.accumulate (this->latency_);
-  this->latency_.dump_results (msg, gsf);
-}
-
-void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::ULongLong dummy = 0;
-  for (int i = 0; i != 100; ++i)
-    {
-      ACE_TRY
-        {
-          (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY {} ACE_ENDTRY;
-    }
-}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h
deleted file mode 100644
index ffc4e9d6b6a..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-#include "ace/pre.h"
-
-#include "TestC.h"
-#include "ace/Task.h"
-#include "ace/Basic_Stats.h"
-
-/// Implement the Test::Client_Task interface
-class Client_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Client_Task (Test::Roundtrip_ptr roundtrip,
-               int niterations);
-
-  /// Add this thread results to the global numbers and print the
-  /// per-thread results.
-  void accumulate_and_dump (ACE_Basic_Stats &totals,
-                            const char *msg,
-                            ACE_UINT32 gsf);
-
-  /// The service method
-  virtual int svc (void);
-
-private:
-  /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-  /// The object reference used for this test
-  Test::Roundtrip_var roundtrip_;
-
-  /// The number of iterations
-  int niterations_;
-
-  /// Keep track of the latency (minimum, average, maximum and jitter)
-  ACE_Basic_Stats latency_;
-};
-
-#include "ace/post.h"
-#endif /* CLIENT_TASK_H */
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
deleted file mode 100644
index 2bc67948fd0..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Single_Per_Connection_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
deleted file mode 100644
index efef33dd7e6..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
deleted file mode 100644
index 69aac2b4ca5..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-#include "Client_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Per_Connection_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 1000;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "Starting threads\n"));
-
-      Client_Task task0(roundtrip.in (), niterations);
-      Client_Task task1(roundtrip.in (), niterations);
-      Client_Task task2(roundtrip.in (), niterations);
-      Client_Task task3(roundtrip.in (), niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      task0.activate(THR_NEW_LWP | THR_JOINABLE);
-      task1.activate(THR_NEW_LWP | THR_JOINABLE);
-      task2.activate(THR_NEW_LWP | THR_JOINABLE);
-      task3.activate(THR_NEW_LWP | THR_JOINABLE);
-
-      task0.thr_mgr()->wait ();
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      ACE_Basic_Stats totals;
-      task0.accumulate_and_dump (totals, "Task[0]", gsf);
-      task1.accumulate_and_dump (totals, "Task[1]", gsf);
-      task2.accumulate_and_dump (totals, "Task[2]", gsf);
-      task3.accumulate_and_dump (totals, "Task[3]", gsf);
-
-      totals.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             totals.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
deleted file mode 100644
index 004ce70cebf..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Per_Connection_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
deleted file mode 100644
index efb544633b2..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// $Id$
-//
-#include "Client_Task.h"
-
-ACE_RCSID(Thread_Pool_Latency, Client_Task, "$Id$")
-
-Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
-                          int niterations)
-  : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
-  , niterations_ (niterations)
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      for (int i = 0; i != this->niterations_; ++i)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          this->latency_.sample (now - start);
-        }
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
-                                  const char *msg,
-                                  ACE_UINT32 gsf)
-{
-  totals.accumulate (this->latency_);
-  this->latency_.dump_results (msg, gsf);
-}
-
-void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::ULongLong dummy = 0;
-  for (int i = 0; i != 100; ++i)
-    {
-      ACE_TRY
-        {
-          (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY {} ACE_ENDTRY;
-    }
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h
deleted file mode 100644
index ffc4e9d6b6a..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-#include "ace/pre.h"
-
-#include "TestC.h"
-#include "ace/Task.h"
-#include "ace/Basic_Stats.h"
-
-/// Implement the Test::Client_Task interface
-class Client_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Client_Task (Test::Roundtrip_ptr roundtrip,
-               int niterations);
-
-  /// Add this thread results to the global numbers and print the
-  /// per-thread results.
-  void accumulate_and_dump (ACE_Basic_Stats &totals,
-                            const char *msg,
-                            ACE_UINT32 gsf);
-
-  /// The service method
-  virtual int svc (void);
-
-private:
-  /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-  /// The object reference used for this test
-  Test::Roundtrip_var roundtrip_;
-
-  /// The number of iterations
-  int niterations_;
-
-  /// Keep track of the latency (minimum, average, maximum and jitter)
-  ACE_Basic_Stats latency_;
-};
-
-#include "ace/post.h"
-#endif /* CLIENT_TASK_H */
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
deleted file mode 100644
index 6028512202c..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Thread_Pool_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
deleted file mode 100644
index efef33dd7e6..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp
deleted file mode 100644
index e485bb2b843..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-#include "Worker_Thread.h"
-
-ACE_RCSID(Thread_Pool_Latency, Worker_Thread, "$Id$")
-
-Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Worker_Thread::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY {} ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/client.cpp b/TAO/performance-tests/Thread_Pool_Latency/client.cpp
deleted file mode 100644
index 643f541a53f..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/client.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-#include "Client_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Pool_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 1000;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "Starting threads\n"));
-
-      Client_Task task0(roundtrip.in (), niterations);
-      Client_Task task1(roundtrip.in (), niterations);
-      Client_Task task2(roundtrip.in (), niterations);
-      Client_Task task3(roundtrip.in (), niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      task0.activate(THR_NEW_LWP | THR_JOINABLE);
-      task1.activate(THR_NEW_LWP | THR_JOINABLE);
-      task2.activate(THR_NEW_LWP | THR_JOINABLE);
-      task3.activate(THR_NEW_LWP | THR_JOINABLE);
-
-      task0.thr_mgr()->wait ();
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      ACE_Basic_Stats totals;
-      task0.accumulate_and_dump (totals, "Task[0]", gsf);
-      task1.accumulate_and_dump (totals, "Task[1]", gsf);
-      task2.accumulate_and_dump (totals, "Task[2]", gsf);
-      task3.accumulate_and_dump (totals, "Task[3]", gsf);
-
-      totals.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             totals.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/server.cpp b/TAO/performance-tests/Thread_Pool_Latency/server.cpp
deleted file mode 100644
index bcacaf713c2..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/server.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "Worker_Thread.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Pool_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Worker_Thread worker (orb.in ());
-
-      worker.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1);
-      worker.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index 60de99f4815..3b9c88e9f32 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -1,7 +1,5 @@
-// -*- C++ -*-
-//
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -30,7 +28,6 @@
 #include "ORB_Core.h"
 #include "Transport_Cache_Manager.h"
 #include "Thread_Lane_Resources.h"
-#include "Transport.h"
 #include "debug.h"
 
 #if !defined(__ACE_INLINE__)
@@ -41,13 +38,12 @@ ACE_RCSID (tao,
            Acceptor_Impl,
            "$Id$")
 
-//////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 template <class SVC_HANDLER>
-TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (
-  TAO_ORB_Core *orb_core,
-  void *arg,
-  CORBA::Boolean flag)
+TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (TAO_ORB_Core *orb_core,
+                                                           void *arg,
+                                                           CORBA::Boolean flag)
   : ACE_Creation_Strategy<SVC_HANDLER> (0, orb_core->reactor()),
     orb_core_ (orb_core),
     arg_ (arg),
@@ -73,7 +69,7 @@ TAO_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
   return 0;
 }
 
-//////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 template <class SVC_HANDLER>
 TAO_Concurrency_Strategy<SVC_HANDLER>::TAO_Concurrency_Strategy (TAO_ORB_Core *orb_core)
@@ -85,14 +81,6 @@ template <class SVC_HANDLER> int
 TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
                                                              void *arg)
 {
-  sh->transport ()->opened_as (TAO::TAO_SERVER_ROLE);
-
-  // Indicate that this transport was opened in the server role
-  if (TAO_debug_level > 6)
-    ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) - TAO_Concurrency_Strategy::activate_svc_handler "
-                "opened as TAO_SERVER_ROLE\n"));
-
   // Here the service handler has been created and the new connection
   // has been accepted.  #REFCOUNT# is one at this point.
 
@@ -194,7 +182,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
   return result;
 }
 
-//////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::TAO_Accept_Strategy (TAO_ORB_Core *orb_core)
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 0508d97bbc8..3d0e03ee4b9 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -12,7 +12,6 @@
 #include "tao/Acceptor_Filter.h"
 #include "tao/Endpoint.h"
 #include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
@@ -118,7 +117,8 @@ int
 TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                              ACE_Reactor *reactor,
                              int ignore_address
-                             ACE_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // protocol_factories is in the following form
   //   IOP1://addr1,addr2,...,addrN/;IOP2://addr1,...addrM/;...
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index 6c3e0694ffa..bdee4795fef 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -68,7 +68,8 @@ public:
   int open (TAO_ORB_Core *orb_core,
             ACE_Reactor *reactor,
             int ignore_address
-            ACE_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Close all open acceptors.
   int close_all (void);
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index 4b9199cdcf1..60d70e90e00 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -1,7 +1,6 @@
 // $Id$
 #include "Object.h"
 #include "Adapter.h"
-#include "SystemException.h"
 #include "debug.h"
 
 #include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index a3723a868f3..6e6dd7ed1ef 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/tao/Any_Basic_Impl.cpp b/TAO/tao/Any_Basic_Impl.cpp
index 66aeedb132c..5a08003b1df 100644
--- a/TAO/tao/Any_Basic_Impl.cpp
+++ b/TAO/tao/Any_Basic_Impl.cpp
@@ -4,7 +4,6 @@
 #include "tao/Typecode.h"
 #include "tao/Any.h"
 #include "tao/CDR.h"
-#include "tao/SystemException.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
@@ -20,48 +19,49 @@ namespace TAO
     : Any_Impl (0, tc),
       kind_ (tc ? tc->kind_ : CORBA::tk_null)
   {
-    CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (this->kind_);
+    CORBA::TCKind tckind = ACE_static_cast (CORBA::TCKind,
+                                            this->kind_);
 
     switch (tckind)
     {
       case CORBA::tk_short:
-        this->u_.s = *static_cast<CORBA::Short *> (value);
+        this->u_.s = *ACE_static_cast (CORBA::Short *, value);
         break;
       case CORBA::tk_ushort:
-        this->u_.us = *static_cast<CORBA::UShort *> (value);
+        this->u_.us = *ACE_static_cast (CORBA::UShort *, value);
         break;
       case CORBA::tk_long:
-        this->u_.l = *static_cast<CORBA::Long *> (value);
+        this->u_.l = *ACE_static_cast (CORBA::Long *, value);
         break;
       case CORBA::tk_ulong:
-         this->u_.ul = *static_cast<CORBA::ULong *> (value);
+         this->u_.ul = *ACE_static_cast (CORBA::ULong *, value);
         break;
       case CORBA::tk_float:
-        this->u_.f = *static_cast<CORBA::Float *> (value);
+        this->u_.f = *ACE_static_cast (CORBA::Float *, value);
         break;
       case CORBA::tk_double:
-        this->u_.d = *static_cast<CORBA::Double *> (value);
+        this->u_.d = *ACE_static_cast (CORBA::Double *, value);
         break;
       case CORBA::tk_boolean:
-        this->u_.b = *static_cast<CORBA::Boolean *> (value);
+        this->u_.b = *ACE_static_cast (CORBA::Boolean *, value);
         break;
       case CORBA::tk_char:
-        this->u_.c = *static_cast<CORBA::Char *> (value);
+        this->u_.c = *ACE_static_cast (CORBA::Char *, value);
         break;
       case CORBA::tk_octet:
-        this->u_.o = *static_cast<CORBA::Octet *> (value);
+        this->u_.o = *ACE_static_cast (CORBA::Octet *, value);
         break;
       case CORBA::tk_longlong:
-        this->u_.ll = *static_cast<CORBA::LongLong *> (value);
+        this->u_.ll = *ACE_static_cast (CORBA::LongLong *, value);
         break;
       case CORBA::tk_ulonglong:
-        this->u_.ull = *static_cast<CORBA::ULongLong *> (value);
+        this->u_.ull = *ACE_static_cast (CORBA::ULongLong *, value);
         break;
       case CORBA::tk_longdouble:
-        this->u_.ld = *static_cast<CORBA::LongDouble *> (value);
+        this->u_.ld = *ACE_static_cast (CORBA::LongDouble *, value);
         break;
       case CORBA::tk_wchar:
-        this->u_.wc = *static_cast<CORBA::WChar *> (value);
+        this->u_.wc = *ACE_static_cast (CORBA::WChar *, value);
         break;
       default:
         break;
@@ -80,7 +80,7 @@ namespace TAO
     Any_Basic_Impl *new_impl = 0;
     ACE_NEW (new_impl,
              Any_Basic_Impl (tc,
-                             const_cast<void *> (value)));
+                             ACE_const_cast (void *, value)));
     any.replace (new_impl);
   }
 
@@ -150,7 +150,7 @@ namespace TAO
             Any_Basic_Impl::assign_value (_tao_elem,
                                           replacement,
 					  tck);
-            const_cast<CORBA::Any &> (any).replace (replacement);
+            ACE_const_cast (CORBA::Any &, any).replace (replacement);
             replacement_safety.release ();
             return 1;
           }
@@ -169,7 +169,8 @@ namespace TAO
   CORBA::Boolean
   Any_Basic_Impl::marshal_value (TAO_OutputCDR &cdr)
   {
-    CORBA::TCKind tckind = static_cast<CORBA::TCKind> (this->kind_);
+    CORBA::TCKind tckind = ACE_static_cast (CORBA::TCKind,
+                                            this->kind_);
 
     switch (tckind)
     {
@@ -215,7 +216,9 @@ namespace TAO
   Any_Basic_Impl::demarshal_value (TAO_InputCDR &cdr,
                                    CORBA::Long tck)
   {
-    CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (tck);
+    CORBA::TCKind tckind =
+      ACE_static_cast (CORBA::TCKind,
+                       tck);
     switch (tckind)
     {
       case CORBA::tk_short:
@@ -262,7 +265,7 @@ namespace TAO
   Any_Basic_Impl *
   Any_Basic_Impl::create_empty (CORBA::TypeCode_ptr tc)
   {
-    CORBA::TCKind const kind = static_cast<CORBA::TCKind> (tc->kind_);
+    CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind, tc->kind_);
     TAO::Any_Basic_Impl * retval = 0;
 
     switch (kind)
@@ -312,48 +315,49 @@ namespace TAO
                                 Any_Basic_Impl *src,
                                 CORBA::Long tck)
   {
-    CORBA::TCKind const kind = static_cast<CORBA::TCKind> (tck);
+    CORBA::TCKind kind =
+      ACE_static_cast (CORBA::TCKind, tck);
 
     switch (kind)
       {
       case CORBA::tk_short:
-        *static_cast<CORBA::Short *> (dest) = src->u_.s;
+        *ACE_static_cast (CORBA::Short *, dest) = src->u_.s;
         break;
       case CORBA::tk_ushort:
-        *static_cast<CORBA::UShort *> (dest) = src->u_.us;
+        *ACE_static_cast (CORBA::UShort *, dest) = src->u_.us;
         break;
       case CORBA::tk_long:
-        *static_cast<CORBA::Long *> (dest) = src->u_.l;
+        *ACE_static_cast (CORBA::Long *, dest) = src->u_.l;
         break;
       case CORBA::tk_ulong:
-        *static_cast<CORBA::ULong *> (dest) = src->u_.ul;
+        *ACE_static_cast (CORBA::ULong *, dest) = src->u_.ul;
         break;
       case CORBA::tk_float:
-        *static_cast<CORBA::Float *> (dest) = src->u_.f;
+        *ACE_static_cast (CORBA::Float *, dest) = src->u_.f;
         break;
       case CORBA::tk_double:
-        *static_cast<CORBA::Double *> (dest) = src->u_.d;
+        *ACE_static_cast (CORBA::Double *, dest) = src->u_.d;
         break;
       case CORBA::tk_boolean:
-        *static_cast<CORBA::Boolean *> (dest) = src->u_.b;
+        *ACE_static_cast (CORBA::Boolean *, dest) = src->u_.b;
         break;
       case CORBA::tk_char:
-        *static_cast<CORBA::Char *> (dest) = src->u_.c;
+        *ACE_static_cast (CORBA::Char *, dest) = src->u_.c;
         break;
       case CORBA::tk_octet:
-        *static_cast<CORBA::Octet *> (dest) = src->u_.o;
+        *ACE_static_cast (CORBA::Octet *, dest) = src->u_.o;
         break;
       case CORBA::tk_longlong:
-        *static_cast<CORBA::LongLong *> (dest) = src->u_.ll;
+        *ACE_static_cast (CORBA::LongLong *, dest) = src->u_.ll;
         break;
       case CORBA::tk_ulonglong:
-        *static_cast<CORBA::ULongLong *> (dest) = src->u_.ull;
+        *ACE_static_cast (CORBA::ULongLong *, dest) = src->u_.ull;
         break;
       case CORBA::tk_longdouble:
-        *static_cast<CORBA::LongDouble *> (dest) = src->u_.ld;
+        *ACE_static_cast (CORBA::LongDouble *, dest) = src->u_.ld;
         break;
       case CORBA::tk_wchar:
-        *static_cast<CORBA::WChar *> (dest) = src->u_.wc;
+        *ACE_static_cast (CORBA::WChar *, dest) = src->u_.wc;
         break;
       default:
         break;
diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp
index 2e453f93ede..57e1928f960 100644
--- a/TAO/tao/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/Any_Dual_Impl_T.cpp
@@ -8,7 +8,7 @@
 #include "tao/Marshal.h"
 #include "tao/CORBA_String.h"
 #include "tao/Environment.h"
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.h"
 
diff --git a/TAO/tao/Any_Impl.cpp b/TAO/tao/Any_Impl.cpp
index 2a139aeeebc..bf1ba96f614 100644
--- a/TAO/tao/Any_Impl.cpp
+++ b/TAO/tao/Any_Impl.cpp
@@ -3,10 +3,8 @@
 #include "Any_Impl.h"
 #include "Marshal.h"
 #include "CORBA_String.h"
-#include "SystemException.h"
 #include "Typecode.h"
 
-
 #include "ace/Guard_T.h"
 
 
diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp
index 7f432b92c30..9c0f2b18110 100644
--- a/TAO/tao/Any_Impl_T.cpp
+++ b/TAO/tao/Any_Impl_T.cpp
@@ -8,7 +8,7 @@
 #include "tao/Marshal.h"
 #include "tao/CDR.h"
 #include "tao/Environment.h"
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 #include "tao/Typecode.h"
 
 #include "ace/CORBA_macros.h"
diff --git a/TAO/tao/Any_SystemException.cpp b/TAO/tao/Any_SystemException.cpp
index 0f5794c2225..b398583f18c 100644
--- a/TAO/tao/Any_SystemException.cpp
+++ b/TAO/tao/Any_SystemException.cpp
@@ -7,19 +7,16 @@
 #include "Environment.h"
 #include "Marshal.h"
 #include "CORBA_String.h"
-#include "SystemException.h"
 #include "Typecode.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/CORBA_macros.h"
 #include "ace/Auto_Ptr.h"
 
-
 ACE_RCSID (tao,
            Any_SystemException,
            "$Id$")
 
-
 TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor,
                                                CORBA::TypeCode_ptr tc,
                                                CORBA::SystemException * const val)
diff --git a/TAO/tao/Any_Unknown_IDL_Type.cpp b/TAO/tao/Any_Unknown_IDL_Type.cpp
index 65b61162a2a..6e9f5ab53b4 100644
--- a/TAO/tao/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/Any_Unknown_IDL_Type.cpp
@@ -3,7 +3,6 @@
 #include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Valuetype_Adapter.h"
 #include "tao/ORB_Core.h"
-#include "tao/SystemException.h"
 #include "tao/Marshal.h"
 #include "tao/Typecode.h"
 #include "tao/CDR.h"
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
index e038eeec2d7..51327b316a5 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -19,8 +19,6 @@ TAO::Argument::demarshal (TAO_InputCDR &)
   return 1;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 void
 TAO::Argument::interceptor_param (Dynamic::Parameter &)
 {
@@ -31,5 +29,3 @@ TAO::Argument::interceptor_result (CORBA::Any *)
 {
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h
index 647b26a1685..28b6db65ed2 100644
--- a/TAO/tao/Argument.h
+++ b/TAO/tao/Argument.h
@@ -21,7 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
 #include "tao/TAO_Export.h"
 
 namespace Dynamic
@@ -51,10 +50,8 @@ namespace TAO
     virtual ~Argument (void);
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_param (Dynamic::Parameter &);
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
   };
 
 }
diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp
index 63093981053..a2a49674086 100644
--- a/TAO/tao/Array_VarOut_T.cpp
+++ b/TAO/tao/Array_VarOut_T.cpp
@@ -21,7 +21,7 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p)
   if (this->ptr_ != p)
     {
       // Delete our stuff and assume ownership of p.
-      TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
+      TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_);
       this->ptr_ = p;
     }
 
@@ -36,10 +36,10 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (
 {
   if (this != &p)
     {
-      TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
+      TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_);
 
       // Deep copy.
-      this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ());
+      this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ());
     }
 
   return *this;
@@ -55,7 +55,7 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p)
   if (this->ptr_ != p)
     {
       // Delete our stuff and assume ownership of p.
-      TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
+      TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_);
       this->ptr_ = p;
     }
 
@@ -70,10 +70,10 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (
 {
   if (this != &p)
     {
-      TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
+      TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_);
 
       // Deep copy.
-      this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ());
+      this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ());
     }
 
   return *this;
@@ -88,7 +88,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor (
   )
 {
   T_slice * tmp = static_cast<T_slice *> (_tao_void_pointer);
-  TAO::Array_Traits<T,T_slice,TAG>::free (tmp);
+  TAO::Array_Traits<T,T_slice,TAG>::tao_free (tmp);
 }
 
 #endif /* TAO_ARRAY_VAROUT_T_C */
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
index e036dd6bb79..c55e07de677 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -31,11 +31,11 @@ namespace TAO
   template<typename T, typename T_slice, typename TAG>
   struct Array_Traits
   {
-    static T_slice * alloc (void);
-    static void free (T_slice * _tao_slice);
-    static T_slice * dup (const T_slice * _tao_slice);
-    static void copy (T_slice * _tao_to,
-                      const T_slice * _tao_from);
+    static T_slice * tao_alloc (void);
+    static void tao_free (T_slice * _tao_slice);
+    static T_slice * tao_dup (const T_slice * _tao_slice);
+    static void tao_copy (T_slice * _tao_to,
+                          const T_slice * _tao_from);
   };
 }
 
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
index 4a4809ee8f7..d8354544595 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -20,14 +20,14 @@ TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T (
     const TAO_Array_Var_Base_T & p
   )
 {
-  this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ());
+  this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ());
 }
 
 template<typename T, typename T_slice, typename TAG>
 ACE_INLINE
 TAO_Array_Var_Base_T<T,T_slice,TAG>::~TAO_Array_Var_Base_T (void)
 {
-  TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
+  TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_);
 }
 
 template<typename T, typename T_slice, typename TAG>
@@ -74,7 +74,7 @@ ACE_INLINE
 T_slice *&
 TAO_Array_Var_Base_T<T,T_slice,TAG>::out (void)
 {
-  TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
+  TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_);
   this->ptr_ = 0;
   return this->ptr_;
 }
@@ -161,7 +161,7 @@ ACE_INLINE
 TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (T_var & p)
   : ptr_ (p.out ())
 {
-  TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
+  TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_);
   this->ptr_ = 0;
 }
 
@@ -386,5 +386,5 @@ ACE_INLINE
 T_slice *
 TAO_Array_Forany_T<T,T_slice,TAG>::tao_alloc (void)
 {
-  return TAO::Array_Traits<T,T_slice,TAG>::alloc ();
+  return TAO::Array_Traits<T,T_slice,TAG>::tao_alloc ();
 }
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index cd1625d1ced..0c5adc5590e 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -23,8 +23,6 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
   return cdr << from_S (this->x_, BOUND);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S, size_t BOUND>
 void
 TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
@@ -35,8 +33,6 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
@@ -58,8 +54,6 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
   return cdr >> to_S (this->x_, BOUND);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S, size_t BOUND>
 void
 TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
@@ -70,8 +64,6 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, 
@@ -87,8 +79,6 @@ TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::demarshal (
   return cdr >> to_S (this->x_, BOUND);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, 
          typename S_out, 
          typename to_S, 
@@ -103,8 +93,6 @@ TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S, 
@@ -120,8 +108,6 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
   return cdr >> to_S (this->x_.out (), BOUND);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, 
          typename S_var, 
          typename to_S, 
@@ -135,6 +121,4 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::interceptor_result (
   (*any) <<= from_S (this->x_.in (), BOUND);
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_BD_STRING_ARGUMENT_T_C */
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index 43502f0b869..0d6c0b390a7 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -38,9 +38,9 @@ namespace TAO
     In_BD_String_Argument_T (const S * x);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S * arg (void) const;
 
   private:
@@ -61,9 +61,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -87,9 +87,9 @@ namespace TAO
     Out_BD_String_Argument_T (S_out x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -113,9 +113,9 @@ namespace TAO
     Ret_BD_String_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
     S * excp (void);
diff --git a/TAO/tao/BD_String_SArgument_T.cpp b/TAO/tao/BD_String_SArgument_T.cpp
index d428442272a..cdc0eabb792 100644
--- a/TAO/tao/BD_String_SArgument_T.cpp
+++ b/TAO/tao/BD_String_SArgument_T.cpp
@@ -27,8 +27,6 @@ TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
   return cdr >> to_S (this->x_.out (), BOUND);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, 
          typename S_var, 
          typename to_S, 
@@ -43,8 +41,6 @@ TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S, 
@@ -73,8 +69,6 @@ TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
   return cdr >> to_S (this->x_.out (), BOUND);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, 
          typename S_var, 
          typename to_S, 
@@ -88,8 +82,6 @@ interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, 
@@ -106,8 +98,6 @@ TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::marshal (
   return cdr << from_S (this->x_.in (), BOUND);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, 
          typename S_var, 
          typename S_out,
@@ -122,8 +112,6 @@ interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S, 
@@ -139,8 +127,6 @@ TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::marshal (
   return cdr << from_S (this->x_.in (), BOUND);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, 
          typename S_var, 
          typename to_S, 
@@ -153,6 +139,4 @@ interceptor_result (CORBA::Any * any)
   (*any) <<= from_S (this->x_.in (), BOUND);
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_BD_STRING_SARGUMENT_T_C */
diff --git a/TAO/tao/BD_String_SArgument_T.h b/TAO/tao/BD_String_SArgument_T.h
index 829fd3dc548..ff37eb463d6 100644
--- a/TAO/tao/BD_String_SArgument_T.h
+++ b/TAO/tao/BD_String_SArgument_T.h
@@ -42,9 +42,9 @@ namespace TAO
     In_BD_String_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S * arg (void) const;
 
   private:
@@ -69,9 +69,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -96,9 +96,9 @@ namespace TAO
     Out_BD_String_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -122,9 +122,9 @@ namespace TAO
     Ret_BD_String_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp
index 353d125e7a8..5bade0f3c2d 100644
--- a/TAO/tao/Basic_Argument_T.cpp
+++ b/TAO/tao/Basic_Argument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_Basic_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
   return cdr << this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -31,8 +29,6 @@ TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S>
@@ -49,8 +45,6 @@ TAO::Inout_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -59,8 +53,6 @@ TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S>
@@ -70,8 +62,6 @@ TAO::Out_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -80,8 +70,6 @@ TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S>
@@ -91,8 +79,6 @@ TAO::Ret_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any)
@@ -100,6 +86,4 @@ TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_BASIC_ARGUMENT_T_C */
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index 101aa3d94c5..61a7cbbf946 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -37,9 +37,9 @@ namespace TAO
     In_Basic_Argument_T (S const & x);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S arg (void) const;
 
   private:
@@ -60,9 +60,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -82,9 +82,9 @@ namespace TAO
     Out_Basic_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -104,9 +104,9 @@ namespace TAO
     Ret_Basic_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
     S excp (void);
diff --git a/TAO/tao/Basic_SArgument_T.cpp b/TAO/tao/Basic_SArgument_T.cpp
index 2bfd618f9a6..afa1323b7df 100644
--- a/TAO/tao/Basic_SArgument_T.cpp
+++ b/TAO/tao/Basic_SArgument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_Basic_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -31,8 +29,6 @@ TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S>
@@ -49,8 +45,6 @@ TAO::Inout_Basic_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -59,8 +53,6 @@ TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S>
@@ -70,8 +62,6 @@ TAO::Out_Basic_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -80,8 +70,6 @@ TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S>
@@ -91,8 +79,6 @@ TAO::Ret_Basic_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
   return cdr << this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any)
@@ -100,6 +86,4 @@ TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_BASIC_SARGUMENT_T_C */
diff --git a/TAO/tao/Basic_SArgument_T.h b/TAO/tao/Basic_SArgument_T.h
index f4eaf282bf0..28db20c6f25 100644
--- a/TAO/tao/Basic_SArgument_T.h
+++ b/TAO/tao/Basic_SArgument_T.h
@@ -37,9 +37,9 @@ namespace TAO
     In_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S arg (void) const;
 
   private:
@@ -60,9 +60,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -82,9 +82,9 @@ namespace TAO
     Out_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -104,9 +104,9 @@ namespace TAO
     Ret_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
index f28ca8f2107..2ecd74e9285 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 class TAO_ORB_Core;
 class TAO_Policy_Validator;
diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc
index f01b598b7d1..d18feb65a60 100644
--- a/TAO/tao/BiDir_GIOP.mpc
+++ b/TAO/tao/BiDir_GIOP.mpc
@@ -22,8 +22,4 @@ project : taolib, core {
   Resource_Files {
     BiDir_GIOP
   }
-
-  PIDL_Files {
-    BiDir_GIOP
-  }
 }
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
index 8fa5d711a18..6c744c3e0a7 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -94,4 +94,4 @@ TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer ();
 #undef TAO_BIDIRGIOP_SAFE_INCLUDE
 
 #include /**/ "ace/post.h"
-#endif /* TAO_BIDIR_GIOP_H */
+#endif /* TAO_DYNAMICANY_H */
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index 419f2a4f64b..309ff9b2a5d 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -57,7 +57,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 BiDirPolicy::BidirectionalPolicy_ptr
-TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::duplicate (
+TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_duplicate (
     BiDirPolicy::BidirectionalPolicy_ptr p
   )
 {
@@ -66,7 +66,7 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::release (
+TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_release (
     BiDirPolicy::BidirectionalPolicy_ptr p
   )
 {
@@ -75,14 +75,14 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 BiDirPolicy::BidirectionalPolicy_ptr
-TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::nil (void)
+TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_nil (void)
 {
   return BiDirPolicy::BidirectionalPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::marshal (
+TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_marshal (
     BiDirPolicy::BidirectionalPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -91,7 +91,7 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*BiDirPolicy__TAO_BidirectionalPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -112,10 +112,10 @@ BiDirPolicy::BidirectionalPolicy::_narrow (
     {
       return BidirectionalPolicy::_nil ();
     }
-
+  
   BidirectionalPolicy_ptr proxy =
     dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-
+  
   return BidirectionalPolicy::_duplicate (proxy);
 }
 
@@ -129,10 +129,10 @@ BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
     {
       return BidirectionalPolicy::_nil ();
     }
-
+  
   BidirectionalPolicy_ptr proxy =
     dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-
+  
   return BidirectionalPolicy::_duplicate (proxy);
 }
 
@@ -143,7 +143,7 @@ BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -205,7 +205,7 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         BiDirPolicy::BidirectionalPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         BiDirPolicy::BidirectionalPolicy
@@ -222,10 +222,11 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         BiDirPolicy::BidirectionalPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         BiDirPolicy::BidirectionalPolicy
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index cdc1291dc3f..8d090854786 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -73,13 +73,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -89,43 +89,43 @@ namespace TAO
 
 namespace BiDirPolicy
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::UShort BidirectionalPolicyValue;
   typedef CORBA::UShort_out BidirectionalPolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const BiDirPolicy::BidirectionalPolicyValue NORMAL = 0U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const BiDirPolicy::BidirectionalPolicyValue BOTH = 1U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37U;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_
-
+  
   class BidirectionalPolicy;
   typedef BidirectionalPolicy *BidirectionalPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         BidirectionalPolicy
       >
     BidirectionalPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         BidirectionalPolicy
@@ -133,91 +133,91 @@ namespace BiDirPolicy
     BidirectionalPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_
-
+  
   class TAO_BiDirGIOP_Export BidirectionalPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef BidirectionalPolicy_ptr _ptr_type;
     typedef BidirectionalPolicy_var _var_type;
-
+    
     // The static operations.
     static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj);
-
+    
     static BidirectionalPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BidirectionalPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BidirectionalPolicy_ptr _nil (void)
     {
       return (BidirectionalPolicy_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual BiDirPolicy::BidirectionalPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     BidirectionalPolicy (void);
-
+    
     virtual ~BidirectionalPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     BidirectionalPolicy (const BidirectionalPolicy &);
-
+    
     void operator= (const BidirectionalPolicy &);
   };
 
@@ -237,18 +237,18 @@ namespace TAO
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_BiDirGIOP_Export Objref_Traits<BiDirPolicy::BidirectionalPolicy>
   {
-    static BiDirPolicy::BidirectionalPolicy_ptr duplicate (
+    static BiDirPolicy::BidirectionalPolicy_ptr tao_duplicate (
         BiDirPolicy::BidirectionalPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         BiDirPolicy::BidirectionalPolicy_ptr
       );
-    static BiDirPolicy::BidirectionalPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static BiDirPolicy::BidirectionalPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         BiDirPolicy::BidirectionalPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -275,3 +275,4 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
index a91220671d8..82bc7329a0d 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
@@ -12,8 +12,8 @@
  */
 //=============================================================================
 
-#ifndef TAO_BIDIR_POLICY_VALIDATOR_H_
-#define TAO_BIDIR_POLICY_VALIDATOR_H_
+#ifndef TAO_POLICY_VALIDATOR_H_
+#define TAO_POLICY_VALIDATOR_H_
 
 #include /**/ "ace/pre.h"
 #include "bidirgiop_export.h"
@@ -53,4 +53,4 @@ private:
 };
 
 #include /**/ "ace/post.h"
-#endif /* TAO_BIDIR_POLICY_VALIDATOR_H_ */
+#endif /**/
diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp
index a7d50c3d307..445daf1d21d 100644
--- a/TAO/tao/Blocked_Connect_Strategy.cpp
+++ b/TAO/tao/Blocked_Connect_Strategy.cpp
@@ -45,11 +45,3 @@ TAO_Blocked_Connect_Strategy::wait (TAO_Connection_Handler *,
   // We cannot wait for connection completion
   return -1;
 }
-
-int
-TAO_Blocked_Connect_Strategy::wait (TAO_Transport *,
-                                    ACE_Time_Value *)
-{
-  // We cannot wait for connection completion
-  return -1;
-}
diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h
index 87016f0470f..4e04945b255 100644
--- a/TAO/tao/Blocked_Connect_Strategy.h
+++ b/TAO/tao/Blocked_Connect_Strategy.h
@@ -45,10 +45,8 @@ public:
                               ACE_Synch_Options &opt);
 
   virtual int wait (TAO_Connection_Handler *ch,
-                     ACE_Time_Value *val);
+                    ACE_Time_Value *val);
 
-  virtual int wait (TAO_Transport *t,
-                     ACE_Time_Value *val);
 };
 
 
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index e5c5c7f8c12..4b169d34ac3 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -30,7 +30,6 @@
 
 
 #include "BoundsC.h"
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h
index 59684723965..e32b474d2fb 100644
--- a/TAO/tao/Buffer_Allocator_T.h
+++ b/TAO/tao/Buffer_Allocator_T.h
@@ -32,7 +32,7 @@ namespace TAO
    * of allocator to be used to allocate the object.
    */
   template <typename handler_type, typename alloc_type>
-  class TAO_Buffer_Allocator : public TAO_Allocator<handler_type>
+  class TAO_Buffer_Allocator : TAO_Allocator<handler_type>
   {
     public:
       typedef handler_type HANDLER_TYPE;
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index dc11eeedd16..cde985310cb 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -6,12 +6,8 @@
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
 #include "TAOC.h"
-#include "SystemException.h"
-
-ACE_RCSID (tao,
-           Buffering_Constraint_Policy,
-           "$Id$")
 
+ACE_RCSID(TAO, Buffering_Constraint_Policy, "$Id$")
 
 #if ! defined (__ACE_INLINE__)
 #include "tao/Buffering_Constraint_Policy.i"
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 3c62df4c3e5..daf72e720ee 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -36,7 +36,6 @@
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Core.h"
 #include "tao/Environment.h"
-#include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/CDR.i"
@@ -173,7 +172,7 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
       ACE_NOTREACHED(break);
 
     default :
-      ACE_THROW (CORBA::MARSHAL(0, CORBA::COMPLETED_YES));
+      ACE_THROW (CORBA::MARSHAL(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
 
     }
 }
@@ -221,7 +220,7 @@ TAO_InputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
       ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES));
       ACE_NOTREACHED(break);
     default :
-      ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES));
+      ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
     }
 }
 
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
index a73f43bc43e..c5c604c8f37 100644
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CDR_Encaps_Codec.cpp
@@ -11,12 +11,10 @@
 #include "Typecode.h"
 #include "Marshal.h"
 #include "Any_Unknown_IDL_Type.h"
-#include "SystemException.h"
 #include "ORB_Constants.h"
-
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao,
+ACE_RCSID (TAO_CodecFactory,
            CDR_Encaps_Codec,
            "$Id$")
 
@@ -64,7 +62,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
                         CORBA::OctetSeq,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (0);
@@ -130,7 +128,7 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
                         CORBA::Any,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (0);
@@ -203,7 +201,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
                         CORBA::OctetSeq,
                         CORBA::NO_MEMORY (
                             CORBA::SystemException::_tao_minor_code (
-                                0,
+                                TAO_DEFAULT_MINOR_CODE,
                                 ENOMEM
                               ),
                             CORBA::COMPLETED_NO
@@ -341,7 +339,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
                             CORBA::Any,
                             CORBA::NO_MEMORY (
                                 CORBA::SystemException::_tao_minor_code (
-                                    0,
+                                    TAO_DEFAULT_MINOR_CODE,
                                     ENOMEM
                                   ),
                                 CORBA::COMPLETED_NO
diff --git a/TAO/tao/CORBA.pidl b/TAO/tao/CORBA.pidl
new file mode 100644
index 00000000000..b6ce0f6987f
--- /dev/null
+++ b/TAO/tao/CORBA.pidl
@@ -0,0 +1,13 @@
+// $Id$
+
+// This will have all new definitions that will go in to CORBA from
+// now on.
+
+#ifndef TAO_CORBA_IDL
+#define TAO_CORBA_IDL
+
+#include <orb.idl>
+
+// This file is deprecated.
+
+#endif
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index cd64090e2b4..89209b05011 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -2,7 +2,6 @@
 #include "ORB_Core.h"
 #include "Stub.h"
 #include "Connector_Registry.h"
-#include "SystemException.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
@@ -281,7 +280,7 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (
     {
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                      0,
+                      TAO_DEFAULT_MINOR_CODE,
                       EINVAL),
                    CORBA::COMPLETED_NO));
     }
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 43ebeb0c0b8..2950c75a6c7 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -3,7 +3,6 @@
 #include "CORBANAME_Parser.h"
 #include "ORB.h"
 #include "Object.h"
-#include "SystemException.h"
 #include "UB_String_Arguments.h"
 #include "Invocation_Adapter.h"
 #include "debug.h"
diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
index a1d64942028..7f836fd3000 100644
--- a/TAO/tao/ClientRequestInfo.cpp
+++ b/TAO/tao/ClientRequestInfo.cpp
@@ -1,18 +1,13 @@
-// $Id$
-
+// -*- C++ -*-
 #include "ClientRequestInfo.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-
-ACE_RCSID (tao,
+ACE_RCSID (TAO,
            ClientRequestInfo,
            "$Id$")
 
+#if TAO_HAS_INTERCEPTORS == 1
 
 #include "ClientRequestInfo_i.h"
 #include "Any.h"
-#include "PolicyC.h"
 
 # if !defined (__ACE_INLINE__)
 #   include "ClientRequestInfo.inl"
diff --git a/TAO/tao/ClientRequestInfo.inl b/TAO/tao/ClientRequestInfo.inl
index 07eaef27c7f..7359e828ff9 100644
--- a/TAO/tao/ClientRequestInfo.inl
+++ b/TAO/tao/ClientRequestInfo.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-#include "SystemException.h"
-
 ACE_INLINE void
 TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
 {
diff --git a/TAO/tao/ClientRequestInfo_i.inl b/TAO/tao/ClientRequestInfo_i.inl
index 877493b58dd..28e783606a5 100644
--- a/TAO/tao/ClientRequestInfo_i.inl
+++ b/TAO/tao/ClientRequestInfo_i.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-#include "SystemException.h"
-
 ACE_INLINE void
 TAO_ClientRequestInfo_i::exception (CORBA::Exception *exception)
 {
diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp
index ff1ba26d9f8..f919cb0454d 100644
--- a/TAO/tao/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory.cpp
@@ -4,7 +4,6 @@
 
 #include "CodecFactory.h"
 #include "CDR_Encaps_Codec.h"
-#include "SystemException.h"
 #include "ORB_Constants.h"
 
 ACE_RCSID (TAO_CodecFactory,
@@ -43,7 +42,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc
           // There is no such thing as a "0.x" CDR encapsulation.
           ACE_THROW_RETURN (CORBA::BAD_PARAM (
                               CORBA::SystemException::_tao_minor_code (
-                                0,
+                                TAO_DEFAULT_MINOR_CODE,
                                 EINVAL),
                               CORBA::COMPLETED_NO),
                             IOP::Codec::_nil ());
@@ -55,7 +54,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc
                                               this->orb_core_),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             ENOMEM),
                           CORBA::COMPLETED_MAYBE));
       ACE_CHECK_RETURN (IOP::Codec::_nil ());
diff --git a/TAO/tao/CodecFactory_ORBInitializer.cpp b/TAO/tao/CodecFactory_ORBInitializer.cpp
index c39ec7142b9..fa1c5a4aeac 100644
--- a/TAO/tao/CodecFactory_ORBInitializer.cpp
+++ b/TAO/tao/CodecFactory_ORBInitializer.cpp
@@ -5,7 +5,6 @@
 #include "CodecFactory_ORBInitializer.h"
 #include "CodecFactory.h"
 #include "ORBInitInfo.h"
-#include "SystemException.h"
 #include "ORB_Constants.h"
 
 ACE_RCSID (TAO_CodecFactory,
@@ -30,7 +29,7 @@ TAO_CodecFactory_ORBInitializer::pre_init (
                     TAO_CodecFactory (orb_core),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 9bdb67d0b9e..945ec05b3e2 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -6,14 +6,12 @@
 #include "tao/Transport.h"
 #include "tao/Profile.h"
 #include "tao/Codeset_Translator_Factory.h"
-#include "tao/SystemException.h"
-#include "tao/UTF16_BOM_Factory.h"
 #include "tao/debug.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Codeset_Registry.h"
 #include "ace/OS_NS_string.h"
-
+#include "tao/UTF16_BOM_Factory.h"
 
 ACE_RCSID (tao,
            Codeset_Manager,
@@ -133,8 +131,8 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile,
                      this->codeset_info_.ForCharData);
        if (TAO_debug_level > 2)
          ACE_DEBUG ((LM_DEBUG,
-                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
-                     ACE_TEXT("setting char translator (%08x)\n"),
+                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs ")
+                     ACE_TEXT("setting char translator(%08x)\n"),
                      tcs));
        trans.char_translator(this->get_char_trans (tcs));
 
@@ -143,7 +141,7 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile,
 
        if (TAO_debug_level > 2)
          ACE_DEBUG ((LM_DEBUG,
-                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
+                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs ")
                      ACE_TEXT("setting wchar translator (%08x)\n"),
                      tcs));
        trans.wchar_translator(this->get_wchar_trans (tcs));
diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h
index 488fe149d93..61b400e4510 100644
--- a/TAO/tao/Connect_Strategy.h
+++ b/TAO/tao/Connect_Strategy.h
@@ -24,7 +24,6 @@
 class TAO_ORB_Core;
 class TAO_Connector;
 class TAO_Connection_Handler;
-class TAO_Transport;
 class ACE_Synch_Options;
 class ACE_Time_Value;
 
@@ -66,9 +65,6 @@ public:
    * connection handler is set appropriately.
    */
   virtual int wait (TAO_Connection_Handler *ch,
-                     ACE_Time_Value *val) = 0;
-
-  virtual int wait (TAO_Transport *t,
                     ACE_Time_Value *val) = 0;
 
 protected:
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index fdfe3ef99e6..9ae1a7c2583 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -209,43 +209,6 @@ TAO_Connection_Handler::handle_output_eh (
 
 int
 TAO_Connection_Handler::handle_input_eh (
-  ACE_HANDLE h, ACE_Event_Handler *eh)
-{
-  if (this->transport ()->acts_as_server () && 
-      this->orb_core_->get_tss_resources ()->upcalls_temporarily_suspended_on_this_thread_)
-    {
-#if 0 // DON'T IMPLEMENT YET, BUT RECORD THE IDEA FOR POSTERITY
-      // ACE_Time_Value this->spin_prevention_backoff_delay_;
-      ACE_OS::usleep (this->spin_prevention_backoff_delay_);
-      this->spin_prevention_backoff_delay_ = 2 * this->spin_prevention_backoff_delay_ + 1;
-#endif
-      if (TAO_debug_level > 6)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Connection_Handler[%d] - not going to handle_input "
-                    "on Transport %d "
-                    "because upcalls temporarily suspended on this thread\n",
-                    this->transport()->id(),
-                    this->transport()->id()));
-      return 0;
-    }
-
-#if 0
-  this->spin_prevention_backoff_delay_ = 0;
-#endif
-
-  int result = this->handle_input_internal (h, eh);
-  
-  if (result == -1)
-    {
-      this->close_connection ();
-      return 0;
-    }
-
-  return result;
-}
-
-int
-TAO_Connection_Handler::handle_input_internal (
     ACE_HANDLE h, ACE_Event_Handler * eh)
 {
   // Let the transport know that it is used
@@ -302,7 +265,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
     {
       ACE_DEBUG  ((LM_DEBUG,
                    "TAO (%P|%t) - Connection_Handler[%d]::"
-                   "close_connection_eh, purging entry from cache\n",
+                   "close_connection, purging entry from cache\n",
                    handle));
     }
 
@@ -348,7 +311,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
         {
           ACE_DEBUG  ((LM_DEBUG,
                        "TAO (%P|%t) - Connection_Handler[%d]::"
-                       "close_connection_eh, removing from the reactor\n",
+                       "close_connection, removing from the reactor\n",
                        handle));
         }
 
@@ -362,7 +325,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
         {
           ACE_DEBUG  ((LM_DEBUG,
                        "TAO (%P|%t) - Connection_Handler[%d]::"
-                       "close_connection_eh, cancel all timers\n",
+                       "close_connection, cancel all timers\n",
                        handle));
         }
 
@@ -386,7 +349,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
     {
       ACE_DEBUG  ((LM_DEBUG,
                    "TAO (%P|%t) - Connection_Handler[%d]::"
-                   "close_connection_eh\n",
+                   "close_connection\n",
                    id));
     }
 
@@ -408,11 +371,3 @@ void
 TAO_Connection_Handler::pos_io_hook (int & )
 {
 }
-
-int
-TAO_Connection_Handler::close_handler (void)
-{
-  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
-  this->transport ()->remove_reference ();
-  return 0;
-}
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 357ea8ab768..e3b348a3b2c 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -93,10 +93,6 @@ public:
    */
   virtual int open_handler (void *) = 0;
 
-  /// A close() hook, called by the Transport Connector when they want to close
-  /// this handler
-  virtual int close_handler (void);
-
 protected:
 
   /// Return our TAO_ORB_Core pointer
@@ -125,12 +121,7 @@ protected:
   int handle_output_eh (ACE_HANDLE h, ACE_Event_Handler * eh);
 
   /// Implement the handle_input() callback
-  // We're actually going to pull the code from the protocol-specific
-  // handlers back into this class, because they ALL look exactly the same.
-  // If some other protocol comes along and needs to do something different,
-  // it is always free to override handle_input() as it sees fit.
   int handle_input_eh (ACE_HANDLE h, ACE_Event_Handler * eh);
-  int handle_input_internal (ACE_HANDLE h, ACE_Event_Handler *eh);
 
   /// Implement close_connection() for Connection_Handlers that are
   /// also Event_Handlers.
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 57bc3f9d201..7f81f485e25 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -8,7 +8,6 @@
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
-#include "tao/SystemException.h"
 
 #if !defined(__ACE_INLINE__)
 #include "tao/Connector_Registry.i"
@@ -119,7 +118,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
     // Failure: Null IOR string pointer
     ACE_THROW_RETURN (CORBA::INV_OBJREF (
       CORBA::SystemException::_tao_minor_code (
-        0,
+        TAO_DEFAULT_MINOR_CODE,
         EINVAL),
       CORBA::COMPLETED_NO),
       -1);
@@ -146,7 +145,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
         // Failure: Null pointer to connector in connector registry.
         ACE_THROW_RETURN (CORBA::INV_OBJREF (
           CORBA::SystemException::_tao_minor_code (
-            0,
+            TAO_DEFAULT_MINOR_CODE,
             EINVAL),
           CORBA::COMPLETED_NO),
           -1);
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
index a45841ecc88..3b7b8e66c61 100644
--- a/TAO/tao/Current.pidl
+++ b/TAO/tao/Current.pidl
@@ -33,14 +33,9 @@
 //   patch < diffs/Current.diff
 // ================================================================
 
-#ifndef TAO_CURRENT_PIDL
-#define TAO_CURRENT_PIDL
-
 #pragma prefix "omg.org"
 
 module CORBA
 {
   local interface Current {};
 };
-
-#endif  /* TAO_CURRENT_PIDL */
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index dbd3f67136f..913d7394e52 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -58,7 +58,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Current_ptr
-TAO::Objref_Traits<CORBA::Current>::duplicate (
+TAO::Objref_Traits<CORBA::Current>::tao_duplicate (
     CORBA::Current_ptr p
   )
 {
@@ -67,7 +67,7 @@ TAO::Objref_Traits<CORBA::Current>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::Current>::release (
+TAO::Objref_Traits<CORBA::Current>::tao_release (
     CORBA::Current_ptr p
   )
 {
@@ -76,14 +76,14 @@ TAO::Objref_Traits<CORBA::Current>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Current_ptr
-TAO::Objref_Traits<CORBA::Current>::nil (void)
+TAO::Objref_Traits<CORBA::Current>::tao_nil (void)
 {
   return CORBA::Current::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::Current>::marshal (
+TAO::Objref_Traits<CORBA::Current>::tao_marshal (
     CORBA::Current_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -92,7 +92,7 @@ TAO::Objref_Traits<CORBA::Current>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -103,7 +103,7 @@ CORBA::Current::Current (void)
 CORBA::Current::~Current (void)
 {}
 
-void
+void 
 CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
@@ -121,10 +121,10 @@ CORBA::Current::_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -138,10 +138,10 @@ CORBA::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -152,7 +152,7 @@ CORBA::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -210,7 +210,7 @@ CORBA::Current::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         CORBA::Current
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::Current
@@ -227,10 +227,11 @@ CORBA::Current::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         CORBA::Current
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::Current
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index bae17f58713..efdb265e360 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -66,13 +66,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -82,22 +82,22 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_CURRENT__VAR_OUT_CH_)
 #define _CORBA_CURRENT__VAR_OUT_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Current
@@ -105,69 +105,69 @@ namespace CORBA
     Current_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CURRENT_CH_)
 #define _CORBA_CURRENT_CH_
-
+  
   class TAO_Export Current
     : public virtual CORBA::Object
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-
+    
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-
+    
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _nil (void)
     {
       return (Current_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Current (void);
-
+    
     virtual ~Current (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-
+    
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
 // TAO_IDL - Generated from
@@ -184,18 +184,18 @@ namespace TAO
 
 #if !defined (_CORBA_CURRENT__TRAITS_CH_)
 #define _CORBA_CURRENT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::Current>
   {
-    static CORBA::Current_ptr duplicate (
+    static CORBA::Current_ptr tao_duplicate (
         CORBA::Current_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::Current_ptr
       );
-    static CORBA::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::Current_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::Current_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -229,3 +229,4 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &)
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/DLL_ORB.cpp b/TAO/tao/DLL_ORB.cpp
new file mode 100644
index 00000000000..6873a3a5276
--- /dev/null
+++ b/TAO/tao/DLL_ORB.cpp
@@ -0,0 +1,181 @@
+// -*- C++ -*-
+
+#include "tao/DLL_ORB.h"
+#include "tao/TAO_Singleton_Manager.h"
+#include "tao/Environment.h"
+#include "tao/debug.h"
+#include "tao/CORBA_methods.h"
+
+#include "ace/ARGV.h"
+#include "ace/Argv_Type_Converter.h"
+
+ACE_RCSID (tao,
+           DLL_ORB,
+           "$Id$")
+
+#if !defined (__ACE_INLINE__)
+# include "tao/DLL_ORB.inl"
+#endif  /* ! __ACE_INLINE__ */
+
+TAO_DLL_ORB::TAO_DLL_ORB (void)
+  : orb_ ()
+{
+  // Nothing
+}
+
+TAO_DLL_ORB::~TAO_DLL_ORB (void)
+{
+  // Nothing
+}
+
+int
+TAO_DLL_ORB::init (int /*argc*/, ACE_TCHAR *argv[])
+{
+  // This class is deprecated.  See the class documentation in
+  // DLL_ORB.h for details explaining why this is so.
+  if (TAO_debug_level > 0)
+    {
+      ACE_DEBUG ((LM_WARNING,
+                  ACE_TEXT ("TAO (%P|%t) - The TAO_DLL_ORB class is ")
+                  ACE_TEXT ("deprecated.  See the class documentation\n")
+                  ACE_TEXT ("TAO (%P|%t) - `tao/DLL_ORB.h' for details ")
+                  ACE_TEXT ("explaining why this is so.\n")));
+    }
+
+  // Make sure TAO's singleton manager is initialized, and set to not
+  // register itself with the ACE_Object_Manager since it is under the
+  // control of the Service Configurator.
+  int register_with_object_manager = 0;
+
+  if (TAO_Singleton_Manager::instance ()->init (register_with_object_manager)
+        == -1)
+    {
+      return -1;  // No exceptions yet.
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      ACE_ARGV new_argv;
+
+      if (new_argv.add (ACE_TEXT ("dummy")) == -1
+          || new_argv.add (argv) == -1)
+        return -1;
+
+      int new_argc = new_argv.argc ();
+
+#if defined (ACE_HAS_WINCE) || defined (ACE_USES_WCHAR)
+      {
+          // Copy command line parameter from new_argv.
+          ACE_Argv_Type_Converter command_line(new_argc, new_argv.argv());
+
+          // Initialize the ORB.
+          this->orb_ = CORBA::ORB_init (command_line.get_argc(),
+                                        command_line.get_ASCII_argv(),
+                                        ""
+                                         ACE_ENV_ARG_PARAMETER);
+          // command_line will be destroyed here and new_argv will be updated if necessary
+      }
+#else
+      // Initialize the ORB.
+      this->orb_ = CORBA::ORB_init (new_argc,
+                                    new_argv.argv (),
+                                    ""
+                                     ACE_ENV_ARG_PARAMETER);
+#endif  // ACE_HAS_WINCE
+
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (this->orb_.in ()))
+        return -1;
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level >= 4)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                             "TAO_DLL_ORB::init");
+
+      return -1;
+    }
+  ACE_ENDTRY;
+
+#if defined (ACE_HAS_THREADS)
+      // Become an Active Object so that the ORB
+      // will execute in a separate thread.
+      return this->activate ();
+#else
+      return 0;
+#endif /* ACE_HAS_THREADS */
+}
+
+int
+TAO_DLL_ORB::fini (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (TAO_Singleton_Manager::instance ()->fini () == -1)
+        return -1;
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level >= 4)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                             "TAO_DLL_ORB::fini");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+int
+TAO_DLL_ORB::svc (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+      // Run the ORB event loop in its own thread.
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level >= 4)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                             "TAO_DLL_ORB::svc");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+
+ACE_STATIC_SVC_DEFINE (TAO_DLL_ORB,
+                       ACE_TEXT ("DLL_ORB"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_DLL_ORB),
+                       ACE_Service_Type::DELETE_THIS
+                       | ACE_Service_Type::DELETE_OBJ,
+                       0)
+
+ACE_FACTORY_DEFINE (TAO, TAO_DLL_ORB)
+
+
+
+// Template instantiations necessary for use when dynamically load the
+// TAO_DLL_ORB.
+
+#if 0
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Dynamic_Service<TAO_DLL_ORB>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Dynamic_Service<TAO_DLL_ORB>
+
+#endif
+
+#endif /*if 0*/
diff --git a/TAO/tao/DLL_ORB.h b/TAO/tao/DLL_ORB.h
new file mode 100644
index 00000000000..dc1f63b46eb
--- /dev/null
+++ b/TAO/tao/DLL_ORB.h
@@ -0,0 +1,88 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file     DLL_ORB.h
+ *
+ *  $Id$
+ *
+ *  Header file for the TAO_DLL_ORB helper class.
+ *
+ *
+ *  @author  Ossama Othman <ossama@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+
+#ifndef TAO_DLL_ORB_H
+#define TAO_DLL_ORB_H
+
+#include /**/ "ace/pre.h"
+#include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+
+#include "tao/ORB.h"
+/**
+ * @class TAO_DLL_ORB
+ *
+ * @brief @e Deprecated helper class that initializes an ORB when an
+ *        instance of this class is dynamically loaded.
+ *
+ * @deprecated This class is deprecated.  While it does demonstrate
+ * how to initialize an ORB in a dynamically loaded object, the fact
+ * that it is located in the TAO library forces the TAO library to be
+ * linked to the application binary.  This prevents TAO from being
+ * completely decoupled from an application when dynamic loading is
+ * used, hence defeating the purpose of dynamically loading the
+ * object!
+ * @par
+ * For an example of how to dynamically load an ORB (actually initialize
+ * an ORB inside a dynamically loaded object) that is completely
+ * decoupled from an application binary see the @c TAO/tests/DLL_ORB
+ * test.
+ */
+class TAO_Export TAO_DLL_ORB : public ACE_Task_Base
+{
+
+public:
+
+  /// Constructor
+  TAO_DLL_ORB (void);
+
+  /// Destructor
+  ~TAO_DLL_ORB (void);
+
+  /// Initializes ORB when dynamic linking occurs.
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+
+  /// Terminates ORB when dynamic unlinking occurs.
+  virtual int fini (void);
+
+  /// Run by a daemon thread to handle deferred processing.
+  virtual int svc (void);
+
+  /// Returns a duplicate reference to the ORB.
+  CORBA::ORB_ptr orb (void);
+
+private:
+
+  /// Reference to the ORB.
+  CORBA::ORB_var orb_;
+
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/DLL_ORB.inl"
+#endif  /* ! __ACE_INLINE__ */
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_ORB)
+ACE_FACTORY_DECLARE (TAO, TAO_DLL_ORB)
+
+#include /**/ "ace/post.h"
+
+#endif  /* TAO_DLL_ORB_H */
diff --git a/TAO/tao/DLL_ORB.inl b/TAO/tao/DLL_ORB.inl
new file mode 100644
index 00000000000..b3240cf9ff9
--- /dev/null
+++ b/TAO/tao/DLL_ORB.inl
@@ -0,0 +1,10 @@
+// -*- C++ -*-
+//
+// $Id$
+
+
+ACE_INLINE CORBA::ORB_ptr
+TAO_DLL_ORB::orb (void)
+{
+  return CORBA::ORB::_duplicate (this->orb_.in());
+}
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index 1c9bbd07eca..fbb3ea8c5f4 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -5,7 +5,6 @@
 #include "Object.h"
 #include "Environment.h"
 #include "ORB_Constants.h"
-#include "SystemException.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
@@ -54,7 +53,7 @@ TAO_DLL_Parser::parse_string (const char *ior,
       ACE_THROW_RETURN
         (CORBA::INV_OBJREF
          (CORBA::SystemException::_tao_minor_code (
-            0,
+            TAO_DEFAULT_MINOR_CODE,
             EINVAL),
           CORBA::COMPLETED_NO),
          CORBA::Object::_nil ());
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
index d6603362980..dc2666670e6 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -3,7 +3,6 @@
 #include "Default_Stub_Factory.h"
 #include "Stub.h"
 #include "ORB_Constants.h"
-#include "SystemException.h"
 
 #include "ace/Log_Msg.h"
 
@@ -19,15 +18,15 @@ TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void)
 
 TAO_Stub *
 TAO_Default_Stub_Factory::create_stub (const char *repository_id,
-                                       const TAO_MProfile &profiles,
-                                       TAO_ORB_Core *orb_core
-                                       ACE_ENV_ARG_DECL)
+                               const TAO_MProfile &profiles,
+                               TAO_ORB_Core *orb_core
+                               ACE_ENV_ARG_DECL)
 {
   TAO_Stub *retval = 0;
 
   ACE_NEW_THROW_EX (retval,
                     TAO_Stub (repository_id, profiles, orb_core),
-                    CORBA::NO_MEMORY (0,
+                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                       CORBA::COMPLETED_MAYBE));
   ACE_CHECK_RETURN (retval);
 
diff --git a/TAO/tao/Domain.mpc b/TAO/tao/Domain.mpc
index 23ef70eb3e4..f9a421b103f 100644
--- a/TAO/tao/Domain.mpc
+++ b/TAO/tao/Domain.mpc
@@ -22,7 +22,4 @@ project : taolib, core, ifr_client, portableserver {
   Resource_Files {
     Domain
   }
-
-  PIDL_Files {
-  }
 }
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 8da6882f61d..5d57ebb49c7 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -65,8 +65,6 @@ namespace CORBA
   typedef TAO_Objref_Out_T<InterfaceDef> InterfaceDef_out;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 ACE_TEMPLATE_SPECIALIZATION
 void
 TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p)
@@ -80,8 +78,6 @@ TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr)
@@ -100,7 +96,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
 #define _CORBA_POLICY__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_Export Arg_Traits<CORBA::Policy>
     : public
@@ -117,7 +113,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_Export Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -141,7 +137,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::DomainManager_ptr
-TAO::Objref_Traits<CORBA::DomainManager>::duplicate (
+TAO::Objref_Traits<CORBA::DomainManager>::tao_duplicate (
     CORBA::DomainManager_ptr p
   )
 {
@@ -150,7 +146,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::DomainManager>::release (
+TAO::Objref_Traits<CORBA::DomainManager>::tao_release (
     CORBA::DomainManager_ptr p
   )
 {
@@ -159,14 +155,14 @@ TAO::Objref_Traits<CORBA::DomainManager>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::DomainManager_ptr
-TAO::Objref_Traits<CORBA::DomainManager>::nil (void)
+TAO::Objref_Traits<CORBA::DomainManager>::tao_nil (void)
 {
   return CORBA::DomainManager::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::DomainManager>::marshal (
+TAO::Objref_Traits<CORBA::DomainManager>::tao_marshal (
     CORBA::DomainManager_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -175,7 +171,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -195,21 +191,21 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_DomainManager_Proxy_Broker_ == 0)
     {
       CORBA_DomainManager_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits<CORBA::Policy>::ret_val _tao_retval;
   TAO::Arg_Traits<CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_policy_type
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -218,10 +214,10 @@ TAO::Collocation_Proxy_Broker *
       17,
       this->the_TAO_DomainManager_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -244,7 +240,7 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation ()
 CORBA::DomainManager::~DomainManager (void)
 {}
 
-void
+void 
 CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   DomainManager *_tao_tmp_pointer =
@@ -289,7 +285,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -339,7 +335,7 @@ CORBA::DomainManager::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ConstructionPolicy_ptr
-TAO::Objref_Traits<CORBA::ConstructionPolicy>::duplicate (
+TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_duplicate (
     CORBA::ConstructionPolicy_ptr p
   )
 {
@@ -348,7 +344,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ConstructionPolicy>::release (
+TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_release (
     CORBA::ConstructionPolicy_ptr p
   )
 {
@@ -357,14 +353,14 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ConstructionPolicy_ptr
-TAO::Objref_Traits<CORBA::ConstructionPolicy>::nil (void)
+TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_nil (void)
 {
   return CORBA::ConstructionPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal (
+TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_marshal (
     CORBA::ConstructionPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -373,7 +369,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -394,23 +390,23 @@ void CORBA::ConstructionPolicy::make_domain_manager (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0)
     {
       CORBA_ConstructionPolicy_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits<void>::ret_val _tao_retval;
   TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
   TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_object_type,
       &_tao_constr_policy
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -419,7 +415,7 @@ void CORBA::ConstructionPolicy::make_domain_manager (
       19,
       this->the_TAO_ConstructionPolicy_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -438,14 +434,14 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation ()
       this->the_TAO_ConstructionPolicy_Proxy_Broker_ =
         ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this);
     }
-
+  
   this->CORBA_Policy_setup_collocation ();
 }
 
 CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 {}
 
-void
+void 
 CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstructionPolicy *_tao_tmp_pointer =
@@ -490,7 +486,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -537,7 +533,7 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
@@ -611,21 +607,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::CORBA::DomainManager RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -647,21 +643,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -677,21 +673,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
             _tao_sequence[i].in ()->marshal (strm);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -701,7 +697,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -711,28 +707,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
@@ -794,7 +790,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         CORBA::DomainManager
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::DomainManager
@@ -819,7 +815,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         CORBA::ConstructionPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::ConstructionPolicy
@@ -922,7 +918,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         CORBA::DomainManager
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::DomainManager
@@ -947,7 +943,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         CORBA::ConstructionPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::ConstructionPolicy
@@ -997,4 +993,5 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 4cbee563d39..f17de220707 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -428,14 +428,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::DomainManager>
   {
-    static CORBA::DomainManager_ptr duplicate (
+    static CORBA::DomainManager_ptr tao_duplicate (
         CORBA::DomainManager_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::DomainManager_ptr
       );
-    static CORBA::DomainManager_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::DomainManager_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::DomainManager_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -449,14 +449,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::ConstructionPolicy>
   {
-    static CORBA::ConstructionPolicy_ptr duplicate (
+    static CORBA::ConstructionPolicy_ptr tao_duplicate (
         CORBA::ConstructionPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ConstructionPolicy_ptr
       );
-    static CORBA::ConstructionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ConstructionPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ConstructionPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc
index 9b3944a1ee1..65031d77de0 100644
--- a/TAO/tao/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : valuetype, taolib, core {
   sharedname    = TAO_DynamicAny
   dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
 
@@ -22,8 +22,4 @@ project : taolib, core {
   Resource_Files {
     DynamicAny
   }
-
-  PIDL_Files {
-    DynamicAny
-  }
 }
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index fd1ffe9666d..47dc1ae5dbf 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -57,7 +57,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynAny_ptr
-TAO::Objref_Traits<DynamicAny::DynAny>::duplicate (
+TAO::Objref_Traits<DynamicAny::DynAny>::tao_duplicate (
     DynamicAny::DynAny_ptr p
   )
 {
@@ -66,7 +66,7 @@ TAO::Objref_Traits<DynamicAny::DynAny>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<DynamicAny::DynAny>::release (
+TAO::Objref_Traits<DynamicAny::DynAny>::tao_release (
     DynamicAny::DynAny_ptr p
   )
 {
@@ -75,14 +75,14 @@ TAO::Objref_Traits<DynamicAny::DynAny>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynAny_ptr
-TAO::Objref_Traits<DynamicAny::DynAny>::nil (void)
+TAO::Objref_Traits<DynamicAny::DynAny>::tao_nil (void)
 {
   return DynamicAny::DynAny::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynAny>::marshal (
+TAO::Objref_Traits<DynamicAny::DynAny>::tao_marshal (
     DynamicAny::DynAny_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -364,7 +364,7 @@ DynamicAny::DynAny::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynFixed_ptr
-TAO::Objref_Traits<DynamicAny::DynFixed>::duplicate (
+TAO::Objref_Traits<DynamicAny::DynFixed>::tao_duplicate (
     DynamicAny::DynFixed_ptr p
   )
 {
@@ -373,7 +373,7 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<DynamicAny::DynFixed>::release (
+TAO::Objref_Traits<DynamicAny::DynFixed>::tao_release (
     DynamicAny::DynFixed_ptr p
   )
 {
@@ -382,14 +382,14 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynFixed_ptr
-TAO::Objref_Traits<DynamicAny::DynFixed>::nil (void)
+TAO::Objref_Traits<DynamicAny::DynFixed>::tao_nil (void)
 {
   return DynamicAny::DynFixed::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynFixed>::marshal (
+TAO::Objref_Traits<DynamicAny::DynFixed>::tao_marshal (
     DynamicAny::DynFixed_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -505,7 +505,7 @@ DynamicAny::DynFixed::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynEnum_ptr
-TAO::Objref_Traits<DynamicAny::DynEnum>::duplicate (
+TAO::Objref_Traits<DynamicAny::DynEnum>::tao_duplicate (
     DynamicAny::DynEnum_ptr p
   )
 {
@@ -514,7 +514,7 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<DynamicAny::DynEnum>::release (
+TAO::Objref_Traits<DynamicAny::DynEnum>::tao_release (
     DynamicAny::DynEnum_ptr p
   )
 {
@@ -523,14 +523,14 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynEnum_ptr
-TAO::Objref_Traits<DynamicAny::DynEnum>::nil (void)
+TAO::Objref_Traits<DynamicAny::DynEnum>::tao_nil (void)
 {
   return DynamicAny::DynEnum::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynEnum>::marshal (
+TAO::Objref_Traits<DynamicAny::DynEnum>::tao_marshal (
     DynamicAny::DynEnum_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -744,7 +744,7 @@ DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynStruct_ptr
-TAO::Objref_Traits<DynamicAny::DynStruct>::duplicate (
+TAO::Objref_Traits<DynamicAny::DynStruct>::tao_duplicate (
     DynamicAny::DynStruct_ptr p
   )
 {
@@ -753,7 +753,7 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<DynamicAny::DynStruct>::release (
+TAO::Objref_Traits<DynamicAny::DynStruct>::tao_release (
     DynamicAny::DynStruct_ptr p
   )
 {
@@ -762,14 +762,14 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynStruct_ptr
-TAO::Objref_Traits<DynamicAny::DynStruct>::nil (void)
+TAO::Objref_Traits<DynamicAny::DynStruct>::tao_nil (void)
 {
   return DynamicAny::DynStruct::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynStruct>::marshal (
+TAO::Objref_Traits<DynamicAny::DynStruct>::tao_marshal (
     DynamicAny::DynStruct_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -885,7 +885,7 @@ DynamicAny::DynStruct::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynUnion_ptr
-TAO::Objref_Traits<DynamicAny::DynUnion>::duplicate (
+TAO::Objref_Traits<DynamicAny::DynUnion>::tao_duplicate (
     DynamicAny::DynUnion_ptr p
   )
 {
@@ -894,7 +894,7 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<DynamicAny::DynUnion>::release (
+TAO::Objref_Traits<DynamicAny::DynUnion>::tao_release (
     DynamicAny::DynUnion_ptr p
   )
 {
@@ -903,14 +903,14 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynUnion_ptr
-TAO::Objref_Traits<DynamicAny::DynUnion>::nil (void)
+TAO::Objref_Traits<DynamicAny::DynUnion>::tao_nil (void)
 {
   return DynamicAny::DynUnion::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynUnion>::marshal (
+TAO::Objref_Traits<DynamicAny::DynUnion>::tao_marshal (
     DynamicAny::DynUnion_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1117,7 +1117,7 @@ DynamicAny::DynAnySeq::~DynAnySeq (void)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynSequence_ptr
-TAO::Objref_Traits<DynamicAny::DynSequence>::duplicate (
+TAO::Objref_Traits<DynamicAny::DynSequence>::tao_duplicate (
     DynamicAny::DynSequence_ptr p
   )
 {
@@ -1126,7 +1126,7 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<DynamicAny::DynSequence>::release (
+TAO::Objref_Traits<DynamicAny::DynSequence>::tao_release (
     DynamicAny::DynSequence_ptr p
   )
 {
@@ -1135,14 +1135,14 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynSequence_ptr
-TAO::Objref_Traits<DynamicAny::DynSequence>::nil (void)
+TAO::Objref_Traits<DynamicAny::DynSequence>::tao_nil (void)
 {
   return DynamicAny::DynSequence::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynSequence>::marshal (
+TAO::Objref_Traits<DynamicAny::DynSequence>::tao_marshal (
     DynamicAny::DynSequence_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1258,7 +1258,7 @@ DynamicAny::DynSequence::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynArray_ptr
-TAO::Objref_Traits<DynamicAny::DynArray>::duplicate (
+TAO::Objref_Traits<DynamicAny::DynArray>::tao_duplicate (
     DynamicAny::DynArray_ptr p
   )
 {
@@ -1267,7 +1267,7 @@ TAO::Objref_Traits<DynamicAny::DynArray>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<DynamicAny::DynArray>::release (
+TAO::Objref_Traits<DynamicAny::DynArray>::tao_release (
     DynamicAny::DynArray_ptr p
   )
 {
@@ -1276,14 +1276,14 @@ TAO::Objref_Traits<DynamicAny::DynArray>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynArray_ptr
-TAO::Objref_Traits<DynamicAny::DynArray>::nil (void)
+TAO::Objref_Traits<DynamicAny::DynArray>::tao_nil (void)
 {
   return DynamicAny::DynArray::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynArray>::marshal (
+TAO::Objref_Traits<DynamicAny::DynArray>::tao_marshal (
     DynamicAny::DynArray_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1399,7 +1399,7 @@ DynamicAny::DynArray::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynValue_ptr
-TAO::Objref_Traits<DynamicAny::DynValue>::duplicate (
+TAO::Objref_Traits<DynamicAny::DynValue>::tao_duplicate (
     DynamicAny::DynValue_ptr p
   )
 {
@@ -1408,7 +1408,7 @@ TAO::Objref_Traits<DynamicAny::DynValue>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<DynamicAny::DynValue>::release (
+TAO::Objref_Traits<DynamicAny::DynValue>::tao_release (
     DynamicAny::DynValue_ptr p
   )
 {
@@ -1417,14 +1417,14 @@ TAO::Objref_Traits<DynamicAny::DynValue>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynValue_ptr
-TAO::Objref_Traits<DynamicAny::DynValue>::nil (void)
+TAO::Objref_Traits<DynamicAny::DynValue>::tao_nil (void)
 {
   return DynamicAny::DynValue::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynValue>::marshal (
+TAO::Objref_Traits<DynamicAny::DynValue>::tao_marshal (
     DynamicAny::DynValue_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1540,7 +1540,7 @@ DynamicAny::DynValue::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynAnyFactory_ptr
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::duplicate (
+TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_duplicate (
     DynamicAny::DynAnyFactory_ptr p
   )
 {
@@ -1549,7 +1549,7 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::release (
+TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_release (
     DynamicAny::DynAnyFactory_ptr p
   )
 {
@@ -1558,14 +1558,14 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 DynamicAny::DynAnyFactory_ptr
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::nil (void)
+TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_nil (void)
 {
   return DynamicAny::DynAnyFactory::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::marshal (
+TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_marshal (
     DynamicAny::DynAnyFactory_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 686c7a586a8..1d09f559712 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -2296,14 +2296,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAny>
   {
-    static DynamicAny::DynAny_ptr duplicate (
+    static DynamicAny::DynAny_ptr tao_duplicate (
         DynamicAny::DynAny_ptr
       );
-    static void release (
+    static void tao_release (
         DynamicAny::DynAny_ptr
       );
-    static DynamicAny::DynAny_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static DynamicAny::DynAny_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         DynamicAny::DynAny_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2317,14 +2317,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynFixed>
   {
-    static DynamicAny::DynFixed_ptr duplicate (
+    static DynamicAny::DynFixed_ptr tao_duplicate (
         DynamicAny::DynFixed_ptr
       );
-    static void release (
+    static void tao_release (
         DynamicAny::DynFixed_ptr
       );
-    static DynamicAny::DynFixed_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static DynamicAny::DynFixed_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         DynamicAny::DynFixed_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2338,14 +2338,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynEnum>
   {
-    static DynamicAny::DynEnum_ptr duplicate (
+    static DynamicAny::DynEnum_ptr tao_duplicate (
         DynamicAny::DynEnum_ptr
       );
-    static void release (
+    static void tao_release (
         DynamicAny::DynEnum_ptr
       );
-    static DynamicAny::DynEnum_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static DynamicAny::DynEnum_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         DynamicAny::DynEnum_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2359,14 +2359,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynStruct>
   {
-    static DynamicAny::DynStruct_ptr duplicate (
+    static DynamicAny::DynStruct_ptr tao_duplicate (
         DynamicAny::DynStruct_ptr
       );
-    static void release (
+    static void tao_release (
         DynamicAny::DynStruct_ptr
       );
-    static DynamicAny::DynStruct_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static DynamicAny::DynStruct_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         DynamicAny::DynStruct_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2380,14 +2380,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynUnion>
   {
-    static DynamicAny::DynUnion_ptr duplicate (
+    static DynamicAny::DynUnion_ptr tao_duplicate (
         DynamicAny::DynUnion_ptr
       );
-    static void release (
+    static void tao_release (
         DynamicAny::DynUnion_ptr
       );
-    static DynamicAny::DynUnion_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static DynamicAny::DynUnion_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         DynamicAny::DynUnion_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2401,14 +2401,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynSequence>
   {
-    static DynamicAny::DynSequence_ptr duplicate (
+    static DynamicAny::DynSequence_ptr tao_duplicate (
         DynamicAny::DynSequence_ptr
       );
-    static void release (
+    static void tao_release (
         DynamicAny::DynSequence_ptr
       );
-    static DynamicAny::DynSequence_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static DynamicAny::DynSequence_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         DynamicAny::DynSequence_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2422,14 +2422,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynArray>
   {
-    static DynamicAny::DynArray_ptr duplicate (
+    static DynamicAny::DynArray_ptr tao_duplicate (
         DynamicAny::DynArray_ptr
       );
-    static void release (
+    static void tao_release (
         DynamicAny::DynArray_ptr
       );
-    static DynamicAny::DynArray_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static DynamicAny::DynArray_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         DynamicAny::DynArray_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2443,14 +2443,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynValue>
   {
-    static DynamicAny::DynValue_ptr duplicate (
+    static DynamicAny::DynValue_ptr tao_duplicate (
         DynamicAny::DynValue_ptr
       );
-    static void release (
+    static void tao_release (
         DynamicAny::DynValue_ptr
       );
-    static DynamicAny::DynValue_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static DynamicAny::DynValue_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         DynamicAny::DynValue_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2464,14 +2464,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAnyFactory>
   {
-    static DynamicAny::DynAnyFactory_ptr duplicate (
+    static DynamicAny::DynAnyFactory_ptr tao_duplicate (
         DynamicAny::DynAnyFactory_ptr
       );
-    static void release (
+    static void tao_release (
         DynamicAny::DynAnyFactory_ptr
       );
-    static DynamicAny::DynAnyFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static DynamicAny::DynAnyFactory_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         DynamicAny::DynAnyFactory_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc
index 6dbe854fd98..4add99313e9 100644
--- a/TAO/tao/DynamicInterface.mpc
+++ b/TAO/tao/DynamicInterface.mpc
@@ -1,5 +1,6 @@
 //$Id$
-project : taolib, core, messaging, minimum_corba {
+project : taolib, core, messaging {
+  avoids += minimum_corba
   sharedname   = TAO_DynamicInterface
   dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL
 
@@ -22,7 +23,4 @@ project : taolib, core, messaging, minimum_corba {
   Resource_files {
     DynamicInterface
   }
-
-  PIDL_Files {
-  }
 }
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index ed48e85cd35..9ca2232f3f3 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -10,7 +10,6 @@ ACE_RCSID (DynamicInterface,
 #include "tao/NVList.h"
 #include "tao/Environment.h"
 #include "tao/CORBA_String.h"
-#include "tao/SystemException.h"
 
 #include "ace/Guard_T.h"
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 4e96ad4bff2..11d43e96011 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -71,7 +71,7 @@ namespace TAO
 
     return safe_parameter_list._retn ();
   }
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+#endif /*TAO_HAS_INTERCEPTORS*/
 
   Invocation_Status
   DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time
@@ -218,7 +218,7 @@ namespace TAO
 
     return safe_parameter_list._retn ();
   }
-#endif /* TAO_HAS_INTERCEPTORS == 1*/
+#endif /*TAO_HAS_INTERCEPTORS*/
 
   Invocation_Status
   DII_Deferred_Invocation::remote_invocation (
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 4a2c034b1ea..80061329001 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -6,7 +6,6 @@ ACE_RCSID (DynamicInterface,
 
 #include "tao/Typecode.h"
 #include "tao/Environment.h"
-#include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "ExceptionList.inl"
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index b8de495cfc7..88902f9be16 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -13,7 +13,6 @@ ACE_RCSID (DynamicInterface,
 #include "tao/Marshal.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl.h"
-#include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Server_Request.inl"
@@ -245,3 +244,4 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception)
 # pragma instantiate TAO_Pseudo_Out_T<CORBA::ServerRequest, CORBA::ServerRequest_var>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index e540116ac9d..1e06bf14085 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -5,12 +5,9 @@
 #include "tao/Any.h"
 #include "tao/Environment.h"
 #include "tao/TC_Constants_Forward.h"
-#include "tao/SystemException.h"
-
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
-
 ACE_RCSID (DynamicInterface,
            Unknown_User_Exception,
            "$Id$")
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index e80e61525f8..ba2b41bcc66 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -26,7 +26,7 @@
 #  pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/UserException.h"
+#include "tao/Exception.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 70dd1ecbcb6..d5c5e5a18fb 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -1,6 +1,6 @@
 #include "Environment.h"
 #include "ORB_Core.h"
-#include "SystemException.h"
+#include "Exception.h"
 
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index e8711f28f66..92fbb75ee88 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -1,7 +1,9 @@
-// $Id$
+// $id: Exception.cpp,v 1.182 2003/11/10 20:29:26 dhinton Exp $
+
+// THREADING NOTE:  calling thread handles mutual exclusion policy
+// on all of these data structures.
 
 #include "Exception.h"
-#include "SystemException.h"
 #include "Environment.h"
 #include "Any_SystemException.h"
 #include "Any_Dual_Impl_T.h"
@@ -29,27 +31,70 @@
 
 #include "ace/OS_NS_stdio.h"
 
-
 ACE_RCSID (tao,
            Exception,
            "$Id$")
 
+// Static initializers.
+
+ACE_Allocator *TAO_Exceptions::global_allocator_;
+
+// Flag that denotes that the TAO TypeCode constants have been
+// initialized.
+bool TAO_Exceptions::initialized_ = false;
+
+namespace TAO
+{
+  // TAO specific typecode.
+  extern CORBA::TypeCode_ptr TC_completion_status;
+}
+
+
+/**
+ * @name @c errno Encoding
+ *
+ * The @c errno encoding is located in the bottom 7 bits.
+ */
+//@{
+const CORBA::ULong TAO_UNSPECIFIED_MINOR_CODE        = 0x0U;
+const CORBA::ULong TAO_ETIMEDOUT_MINOR_CODE          = 0x1U;
+const CORBA::ULong TAO_ENFILE_MINOR_CODE             = 0x2U;
+const CORBA::ULong TAO_EMFILE_MINOR_CODE             = 0x3U;
+const CORBA::ULong TAO_EPIPE_MINOR_CODE              = 0x4U;
+const CORBA::ULong TAO_ECONNREFUSED_MINOR_CODE       = 0x5U;
+const CORBA::ULong TAO_ENOENT_MINOR_CODE             = 0x6U;
+const CORBA::ULong TAO_EBADF_MINOR_CODE              = 0x7U;
+const CORBA::ULong TAO_ENOSYS_MINOR_CODE             = 0x8U;
+const CORBA::ULong TAO_EPERM_MINOR_CODE              = 0x9U;
+const CORBA::ULong TAO_EAFNOSUPPORT_MINOR_CODE       = 0xAU;
+const CORBA::ULong TAO_EAGAIN_MINOR_CODE             = 0xBU;
+const CORBA::ULong TAO_ENOMEM_MINOR_CODE             = 0xCU;
+const CORBA::ULong TAO_EACCES_MINOR_CODE             = 0xDU;
+const CORBA::ULong TAO_EFAULT_MINOR_CODE             = 0xEU;
+const CORBA::ULong TAO_EBUSY_MINOR_CODE              = 0xFU;
+const CORBA::ULong TAO_EEXIST_MINOR_CODE             = 0x10U;
+const CORBA::ULong TAO_EINVAL_MINOR_CODE             = 0x11U;
+const CORBA::ULong TAO_ECOMM_MINOR_CODE              = 0x12U;
+const CORBA::ULong TAO_ECONNRESET_MINOR_CODE         = 0x13U;
+const CORBA::ULong TAO_ENOTSUP_MINOR_CODE            = 0x14U;
+// *Don't* use TAO_<errno>_MINOR_CODE greater than 0x7FU!
+//@}
 
 // ****************************************************************
 
-CORBA::Exception::Exception (const char * repository_id,
-                             const char * local_name)
+CORBA::Exception::Exception (const char *repository_id,
+                             const char *local_name)
   : id_ (CORBA::string_dup (repository_id)),
     name_ (CORBA::string_dup (local_name))
 {
-  ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0);
+  ACE_ASSERT (this->id_ != 0 && this->name_ != 0);
 }
 
 CORBA::Exception::Exception (const CORBA::Exception &src)
   : id_ (CORBA::string_dup (src.id_)),
     name_ (CORBA::string_dup (src.name_))
 {
-  ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0);
+  ACE_ASSERT (this->id_ != 0 && this->name_ != 0);
 }
 
 // NOTE: It's this code, not anything defined in a subclass, which is
@@ -57,23 +102,35 @@ CORBA::Exception::Exception (const CORBA::Exception &src)
 // can do this because it's got the local name and the id.
 
 CORBA::Exception::Exception (void)
-  : id_ (),
-    name_ ()
+  : id_ (0),
+    name_ (0)
 {
 }
 
 CORBA::Exception::~Exception (void)
 {
+  CORBA::string_free (this->id_);
+  CORBA::string_free (this->name_);
 }
 
 CORBA::Exception &
 CORBA::Exception::operator= (const CORBA::Exception &src)
 {
+  if (this->id_)
+    {
+      CORBA::string_free (this->id_);
+    }
+
   this->id_ = CORBA::string_dup (src.id_);
-  ACE_ASSERT (this->id_.in () != 0);
+  ACE_ASSERT (this->id_ != 0);
+
+  if (this->name_)
+    {
+      CORBA::string_free (this->name_);
+    }
 
   this->name_ = CORBA::string_dup (src.name_);
-  ACE_ASSERT (this->name_.in () != 0);
+  ACE_ASSERT (this->name_ != 0);
 
   return *this;
 }
@@ -81,13 +138,13 @@ CORBA::Exception::operator= (const CORBA::Exception &src)
 const char *
 CORBA::Exception::_rep_id (void) const
 {
-  return this->id_.in ();
+  return this->id_;
 }
 
 const char *
 CORBA::Exception::_name (void) const
 {
-  return this->name_.in ();
+  return this->name_;
 }
 
 CORBA::TypeCode_ptr
@@ -158,6 +215,1186 @@ namespace CORBA
 
 #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
 
+// Avoid zillions of not-quite-inlined copies of utilities.
+
+CORBA::UserException::UserException (void)
+{
+}
+
+CORBA::UserException::UserException (const char *repository_id,
+                                     const char *local_name)
+  : CORBA::Exception (repository_id,
+                      local_name)
+{
+}
+
+CORBA::UserException::~UserException (void)
+{
+}
+
+CORBA::UserException &
+CORBA::UserException::operator= (const CORBA::UserException &src)
+{
+  this->Exception::operator= (src);
+  return *this;
+}
+
+int
+CORBA::UserException::_is_a (const char* interface_id) const
+{
+  return ACE_OS::strcmp (interface_id,
+                         "IDL:omg.org/CORBA/UserException:1.0") == 0
+    || this->Exception::_is_a (interface_id);
+}
+
+CORBA::UserException*
+CORBA::UserException::_downcast (CORBA::Exception* exception)
+{
+  if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0"))
+    {
+      return dynamic_cast<CORBA::UserException *> (exception);
+    }
+
+  return 0;
+}
+
+const CORBA::UserException*
+CORBA::UserException::_downcast (const CORBA::Exception *exception)
+{
+  if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0"))
+    {
+      return dynamic_cast<const CORBA::UserException *> (exception);
+    }
+
+  return 0;
+}
+
+ACE_CString
+CORBA::UserException::_info (void) const
+{
+  // @@ we can use the exception's typecode to dump all the data held
+  // within it ...
+
+  ACE_CString user_exception_info = "user exception, ID '";
+  user_exception_info += this->_rep_id ();
+  user_exception_info += "'";
+  return user_exception_info;
+}
+
+// ****************************************************************
+
+namespace CORBA
+{
+  CORBA::TypeCode_ptr _tc_UnknownUserException = 0;
+}
+
+// ****************************************************************
+
+CORBA::SystemException::SystemException (void)
+{
+}
+
+CORBA::SystemException::SystemException (const char *repository_id,
+                                         const char *local_name,
+                                         CORBA::ULong code,
+                                         CORBA::CompletionStatus completed)
+  : CORBA::Exception (repository_id,
+                      local_name),
+    minor_ (code),
+    completed_ (completed)
+{
+}
+
+CORBA::SystemException::SystemException (CORBA::ULong code,
+                                         CORBA::CompletionStatus completed)
+  : minor_ (code),
+    completed_ (completed)
+{
+}
+
+
+CORBA::SystemException::SystemException (const CORBA::SystemException &src)
+  : CORBA::Exception (src),
+    minor_ (src.minor_),
+    completed_ (src.completed_)
+{
+}
+
+CORBA::SystemException::~SystemException (void)
+{
+}
+
+CORBA::SystemException &
+CORBA::SystemException::operator= (const CORBA::SystemException &src)
+{
+  this->Exception::operator= (src);
+
+  this->minor_ = src.minor_;
+  this->completed_ = src.completed_;
+
+  return *this;
+}
+
+
+int
+CORBA::SystemException::_is_a (const char* interface_id) const
+{
+  return ((ACE_OS::strcmp (interface_id, this->_rep_id ()) == 0) ||
+          (ACE_OS::strcmp (interface_id,
+                           "IDL:omg.org/CORBA/SystemException:1.0") == 0)
+          || this->Exception::_is_a (interface_id));
+}
+
+CORBA::SystemException*
+CORBA::SystemException::_downcast (CORBA::Exception* exception)
+{
+  if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0"))
+    {
+      return dynamic_cast<CORBA::SystemException *> (exception);
+    }
+
+  return 0;
+}
+
+const CORBA::SystemException*
+CORBA::SystemException::_downcast (const CORBA::Exception *exception)
+{
+  if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0"))
+    {
+      return dynamic_cast<const CORBA::SystemException *> (exception);
+    }
+
+  return 0;
+}
+
+void
+CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
+                                     ACE_ENV_ARG_DECL) const
+{
+  if (cdr.write_string (this->_rep_id ())
+      && cdr.write_ulong (this->minor ())
+      && cdr.write_ulong (this->completed ()))
+    {
+      return;
+    }
+
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void
+CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr
+                                     ACE_ENV_ARG_DECL)
+{
+  // The string is read by the caller, to determine the exact type of
+  // the exception.  We just decode the fields...
+  // cdr.read_string (this->id ());
+  CORBA::ULong tmp;
+
+  if (cdr.read_ulong (this->minor_)
+      && cdr.read_ulong (tmp))
+    {
+      this->completed_ = CORBA::CompletionStatus (tmp);
+      return;
+    }
+
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+CORBA::ULong
+CORBA::SystemException::_tao_errno (int errno_value)
+{
+  switch (errno_value)
+    {
+    case 0:
+      return TAO_UNSPECIFIED_MINOR_CODE;
+    case ETIMEDOUT:
+      return TAO_ETIMEDOUT_MINOR_CODE;
+    case ENFILE:
+      return TAO_ENFILE_MINOR_CODE;
+    case EPIPE:
+      return TAO_EPIPE_MINOR_CODE;
+    case ECONNREFUSED:
+      return TAO_ECONNREFUSED_MINOR_CODE;
+    case ENOENT:
+      return TAO_ENOENT_MINOR_CODE;
+
+#if !defined (ACE_HAS_WINCE)
+    case EMFILE:
+      return TAO_EMFILE_MINOR_CODE;
+    case EBADF:
+      return TAO_EBADF_MINOR_CODE;
+    case EPERM:
+      return TAO_EPERM_MINOR_CODE;
+    case EINVAL:
+      return TAO_EINVAL_MINOR_CODE;
+#endif  // ACE_HAS_WINCE
+
+#if (ENOSYS != EFAULT)
+    case ENOSYS:
+      return TAO_ENOSYS_MINOR_CODE;
+#endif /* ENOSYS != EFAULT */
+    case EAFNOSUPPORT:
+      return TAO_EAFNOSUPPORT_MINOR_CODE;
+    case EAGAIN:
+      return TAO_EAGAIN_MINOR_CODE;
+    case ENOMEM:
+      return TAO_ENOMEM_MINOR_CODE;
+    case EACCES:
+      return TAO_EACCES_MINOR_CODE;
+    case EFAULT:
+      return TAO_EFAULT_MINOR_CODE;
+    case EBUSY:
+      return TAO_EBUSY_MINOR_CODE;
+    case EEXIST:
+      return TAO_EEXIST_MINOR_CODE;
+    case ECOMM:
+      return TAO_ECOMM_MINOR_CODE;
+    case ECONNRESET:
+      return TAO_ECONNRESET_MINOR_CODE;
+#if (ENOTSUP != ENOSYS)
+    case ENOTSUP:
+      return TAO_ENOTSUP_MINOR_CODE;
+#endif /* ENOSYS != EFAULT */
+    default:
+      // Mask off bottom 7 bits and return them.
+      return errno_value & 0x7FU;
+    }
+}
+
+CORBA::ULong
+CORBA::SystemException::_tao_minor_code (u_int location,
+                                         int errno_value)
+{
+  return
+    TAO_DEFAULT_MINOR_CODE
+    | location
+    | _tao_errno (errno_value);
+}
+
+void
+CORBA::SystemException::_tao_print_system_exception (FILE *) const
+{
+  ACE_DEBUG ((LM_ERROR,
+              ACE_TEXT("(%P|%t) system exception, ID '%s'\n"),
+              ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ())));
+}
+
+ACE_CString
+CORBA::SystemException::_info (void) const
+{
+  // @@ there are a few other "user exceptions" in the CORBA scope,
+  // they're not all standard/system exceptions ... really need to
+  // either compare exhaustively against all those IDs (yeech) or
+  // (preferably) to represent the exception type directly in the
+  // exception value so it can be queried.
+
+  ACE_CString info = "system exception, ID '";
+  info += this->_rep_id ();
+  info += "'\n";
+
+  const CORBA::ULong VMCID = this->minor () & 0xFFFFF000u;
+
+  if (VMCID == TAO_DEFAULT_MINOR_CODE)
+    {
+      // @@ Move the following code to a subroutine, it is too long already!
+      const char *location;
+      switch (this->minor () & 0x00000F80u)
+        {
+        case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE:
+          location = "location forward failed";
+          break;
+        case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
+          location = "send request failed";
+          break;
+        case TAO_POA_DISCARDING:
+          location = "poa in discarding state";
+          break;
+        case TAO_POA_HOLDING:
+          location = "poa in holding state";
+          break;
+        case TAO_POA_INACTIVE:
+          location = "poa in inactive state";
+          break;
+        case TAO_UNHANDLED_SERVER_CXX_EXCEPTION:
+          location = "unhandled c++ exception in server side";
+          break;
+        case TAO_INVOCATION_RECV_REQUEST_MINOR_CODE:
+          location = "failed to recv request response";
+          break;
+        case TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL:
+          location = "all protocols failed to parse the IOR";
+          break;
+        case TAO_MPROFILE_CREATION_ERROR:
+          location = "error during MProfile creation";
+          break;
+        case TAO_TIMEOUT_CONNECT_MINOR_CODE:
+          location = "timeout during connect";
+          break;
+        case TAO_TIMEOUT_SEND_MINOR_CODE:
+          location = "timeout during send";
+          break;
+        case TAO_TIMEOUT_RECV_MINOR_CODE:
+          location = "timeout during recv";
+          break;
+        case TAO_IMPLREPO_MINOR_CODE:
+          location = "implrepo server exception";
+          break;
+        case TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE:
+          location = "endpoint initialization failure in Acceptor Registry";
+          break;
+        case TAO_ORB_CORE_INIT_LOCATION_CODE:
+          location = "ORB Core initialization failed";
+          break;
+        case TAO_POLICY_NARROW_CODE:
+          location = "Failure when narrowing a Policy";
+          break;
+        case TAO_GUARD_FAILURE:
+          location = "Failure when trying to acquire a guard/monitor";
+          break;
+        case TAO_POA_BEING_DESTROYED:
+          location = "POA has been destroyed or is currently being destroyed";
+          break;
+        case TAO_AMH_REPLY_LOCATION_CODE:
+          location = "Failure when trying to send AMH reply";
+          break;
+        case TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE:
+          location = "Failure in thread creation for RTCORBA thread pool";
+          break;
+        default:
+          location = "unknown location";
+        }
+
+      const char *errno_indication;
+      char unknown_errno [255];
+      CORBA::ULong minor_code = this->minor () & 0x7FU;
+      switch (minor_code)
+        {
+        case TAO_UNSPECIFIED_MINOR_CODE:
+          errno_indication = "unspecified errno";
+          break;
+        case TAO_ETIMEDOUT_MINOR_CODE:
+          errno_indication = "ETIMEOUT";
+          break;
+        case TAO_ENFILE_MINOR_CODE:
+          errno_indication = "ENFILE";
+          break;
+        case TAO_EMFILE_MINOR_CODE:
+          errno_indication = "EMFILE";
+          break;
+        case TAO_EPIPE_MINOR_CODE:
+          errno_indication = "EPIPE";
+          break;
+        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;
+        case TAO_EAGAIN_MINOR_CODE:
+          errno_indication = "EAGAIN";
+          break;
+        case TAO_ENOMEM_MINOR_CODE:
+          errno_indication = "ENOMEM";
+          break;
+        case TAO_EACCES_MINOR_CODE:
+          errno_indication = "EACCES";
+          break;
+        case TAO_EFAULT_MINOR_CODE:
+          errno_indication = "EFAULT";
+          break;
+        case TAO_EBUSY_MINOR_CODE:
+          errno_indication = "EBUSY";
+          break;
+        case TAO_EEXIST_MINOR_CODE:
+          errno_indication = "EEXIST";
+          break;
+        case TAO_EINVAL_MINOR_CODE:
+          errno_indication = "EINVAL";
+          break;
+        case TAO_ECOMM_MINOR_CODE:
+          errno_indication = "ECOMM";
+          break;
+        case TAO_ECONNRESET_MINOR_CODE:
+          errno_indication = "ECONNRESET";
+          break;
+        case TAO_ENOTSUP_MINOR_CODE:
+          errno_indication = "ENOTSUP";
+          break;
+        default:
+          {
+            // 7 bits of some other errno.
+            ACE_OS::sprintf (unknown_errno,
+                             "low 7 bits of errno: %3u %s",
+                             minor_code, ACE_OS::strerror (minor_code));
+
+            errno_indication = unknown_errno;
+          }
+        }
+
+      char buffer[BUFSIZ];
+      ACE_OS::sprintf (buffer,
+                       "TAO exception, "
+                       "minor code = %x (%s; %s), "
+                       "completed = %s\n",
+                       minor_code,
+                       location,
+                       errno_indication,
+                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
+                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
+                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
+                       "garbage");
+
+      info += buffer;
+    }
+  else if (VMCID == CORBA::OMGVMCID)
+    {
+      const CORBA::ULong minor_code = this->minor () & 0xFFFU;
+
+      const char *minor_description = 0;
+
+      if (minor_code > 0)
+          minor_description =
+            CORBA::SystemException::_tao_get_omg_exception_description (
+              *this,
+              minor_code);
+      else
+        minor_description = "*unknown description*";
+
+      char buffer[BUFSIZ];
+      ACE_OS::sprintf (buffer,
+                       "OMG minor code (%d), "
+                       "described as '%s', "
+                       "completed = %s\n",
+                       minor_code,
+                       minor_description,
+                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
+                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
+                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
+                       "garbage");
+
+      info += buffer;
+    }
+  else
+    {
+      char buffer[BUFSIZ];
+      ACE_OS::sprintf (buffer,
+                       "Unknown vendor minor code id (%x), "
+                       "minor code = %x, completed = %s\n",
+                       VMCID,
+                       this->minor (),  // Use the raw minor code
+                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
+                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
+                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
+                       "garbage");
+
+      info += buffer;
+    }
+
+  return info;
+}
+
+const char *
+CORBA::SystemException::_tao_get_omg_exception_description (
+  const CORBA::SystemException &exc,
+  CORBA::ULong minor_code)
+{
+#ifndef ACE_NDEBUG
+
+  static const char *UNKNOWN_TABLE[] =
+    {
+      "Unlisted user exception received by client.",    // 1
+      "Non-standard SystemException not supported.",    // 2
+      "An unkown user exception received by a portable interceptor." // 3
+    };
+
+  static const char *BAD_PARAM_TABLE[] =
+    {
+      "Failure to register, unregister, or lookup value factory.", // 1
+      "RID already defined in IFR.",                               // 2
+      "Name already used in the context in IFR.",                  // 3
+      "Target is not a valid container.",                          // 4
+      "Name clash in inherited context.",                          // 5
+      "Incorrect type for abstract interface.",                    // 6
+      "string_to_object conversion failed due to a bad scheme name.", // 7
+      "string_to_object conversion failed due to a bad address.",  // 8
+      "string_to_object conversion failed due to a bad schema specific part.",// 9
+      "string_to_object conversion failed due to non specific reason.", // 10
+      "Attempt to derive abstract interface from non-abstract base interface in the Interface Repository.", // 11
+      "Attempt to let a ValueDef support more than one non-abstract interface in the Interface Repository.", // 12
+      "Attempt to use an incomplete TypeCode as a parameter.",     // 13
+      "Invalid object id passed to POA::create_reference_by_id.",  // 14
+      "Bad name argument in TypeCode operation.",                  // 15
+      "Bad RepositoryId argument in TypeCode operation.",          // 16
+      "Invalid member namein TypeCode operation.",                 // 17
+      "Duplicate label value in create_union_tc.",                 // 18
+      "Incompatible TypeCode of label and discriminator in create_union_tc.", // 19
+      "Supplied discriminator type illegitimate in create_union_tc.", // 20
+      "Any passed to ServerRequest::set_exception does not contain an exception.", // 21
+      "Unlisted user exception passed to ServerRequest::set_exception", // 22
+      "wchar transmission code set not in service context.",       // 23
+      "Service context is not in OMG-defined range.",              // 24
+      "Enum value out of range.",                                  // 25
+      "Invalid service context Id in portable interceptor.",       // 26
+      "Attempt to call register_initial_reference with a null Object.", // 27
+      "Invalid component Id in portable interceptor.",             // 28
+      "Invalid profile Id in portable interceptor.",               // 29
+      "Two or more Policy objects with the same PolicyType value supplied to Object::set_policy_overrides or PolicyManager::set_policy_overrides." // 30
+      "Attempt to define a oneway operation with non-void result, out or inout parameters or user exceptions.", // 31
+      "DII asked to create request for an implicit operation.",     // 32,
+      "An OTS/XA integration xa_ call returned XAER_INVAL.",        // 33
+      "Union branch modifier called with bad case label discriminator.", // 34
+      "Illegal IDL context property name.",   // 35
+      "Illegal IDL property search string.",  // 36
+      "Illegal IDL context name.",            // 37
+      "Non-empty IDL context.",               // 38
+      "Servant not found [ServantManager].",  // 39
+      "ORB output stream does not support ValueOutputStream interface.", // 40
+      "ORB input stream does not support ValueInputStream interface."    // 41
+    };
+
+  static const char *IMP_LIMIT_TABLE[] =
+    {
+      "Unable to use any profile in IOR." // 1
+    };
+
+  static const char *INITIALIZE_TABLE[] =
+    {
+      "Priority range too restricted for ORB." // 1
+    };
+
+
+  static const char *INV_OBJREF_TABLE[] =
+    {
+      "wchar Code Set support not specified.", // 1
+      "Codeset component required for type using wchar or wstring data." // 2
+    };
+
+  static const char *MARSHAL_TABLE[] =
+    {
+      "Unable to locate value factory.",  // 1
+      "ServerRequest::set_result called before ServerRequest::ctx when the operation IDL contains a context clause.", // 2
+      "NVList passed to ServerRequest::arguments does not describe all parameters passed by client.", // 3
+      "Attempt to marshal Local object.", // 4
+      "wchar or wstring data erroneously sent by client over GIOP 1.0 connection.", // 5
+      "wchar or wstring data erroneously returned by server over GIOP 1.0 connection." //6
+      "Unsupported RMI/IDL custom value type stream format." // 7
+    };
+
+  static const char *BAD_TYPECODE_TABLE[] =
+    {
+      "Attempt to marshal incomplete TypeCode.",              // 1
+      "Member type code illegitimate in TypeCode operation.", // 2
+      "Illegal parameter type."                               // 3
+    };
+
+  static const char *NO_IMPLEMENT_TABLE[] =
+    {
+      "Missing local value implementation.",        // 1
+      "Incompatible value implementation version.", // 2
+      "Unable to use any profile in IOR.",          // 3
+      "Attempt to use DII on Local object.",        // 4
+      "Biomolecular Sequence Analysis iterator cannot be reset.",         // 5
+      "Biomolecular Sequence Analysis metadata is not available as XML.", // 6
+      "Genomic Maps iterator cannot be rest."       // 7
+    };
+
+  static const char *NO_RESOURCE_TABLE[] =
+    {
+      "Portable Interceptor operation not support in this binding.", // 1
+      "No connection for request's priority."                        // 2
+    };
+
+  static const char *BAD_INV_ORDER_TABLE[] =
+    {
+      "Dependency exists in IFR preventing destruction of this object", // 1
+      "Attempt to destroy indestructible objects in IFR.", // 2
+      "Operation would deadlock.",                         // 3
+      "ORB has shutdown.",                                 // 4
+      "Attempt to invoke \"send\" or \"invoke\" operation of the same \"Request\" object more than once.", // 5
+      "Attempt to set a servant manager after one has already been set.", // 6
+      "ServerRequest::arguments called more than once or after a call to ServerRequest::set_exception.", // 7
+      "ServerRequest::ctx called more than once or before ServerRequest::arguments or after ServerRequest::ctx, ServerRequest::set_result or ServerRequest::set_exception.", // 8
+      "ServerRequest::result called more than once or before ServerRequest::arguments or after ServerRequest::set_result or ServerRequest::set_exception.", // 9
+      "Attempt to send a DII request after it was sent previously.", // 10
+      "Attempt to poll a DII request or to retrieve its result before the request was sent.", // 11
+      "Attempt to poll a DII request or to retrieve its result after the result was retrieved previously.", // 12
+      "Attempt to poll a synchronous DII request or to retrieve results from a synchronous DII request.", // 13
+      "Invalid portable interceptor call",                 // 14
+      "Service context add failed in portable interceptor because a service context with the given id already exists.", // 15
+      "Registration of PolicyFactory failed because a factory already exists for the given type.", // 16
+      "POA cannot create POAs while undergoing destruction." // 17
+    };
+
+  static const char *TRANSIENT_TABLE[] =
+    {
+      "Request discarded due to resource exhaustion in POA, or because POA is in discarding state.", // 1
+      "No usable profile in IOR.",                            // 2
+      "Request cancelled.",                                   // 3
+      "POA destroyed."                                        // 4
+    };
+
+  static const char *OBJ_ADAPTER_TABLE[] =
+    {
+      "System exception in POA::unknown_adapter.",              // 1
+      "Incorrect servant type returned by servant manager",     // 2
+      "No default servant available [POA policy].",             // 3
+      "No servant manager available [POA policy].",             // 4
+      "Violation of POA policy by ServantActivator::incarnate.",// 5
+      "Exception in PortableInterceptor::IORInterceptor::components_established.", // 6
+      "Null servant returned by servant manager."               // 7
+    };
+
+  static const char *DATA_CONVERSION_TABLE[] =
+    {
+      "Character does not map to negotiated transmission code set.", // 1
+      "Failure of PriorityMapping object."                           // 2
+    };
+
+  static const char *OBJECT_NOT_EXIST_TABLE[] =
+    {
+      "Attempt to pass an unactivated (unregistered) value as an object reference.", // 1
+      "POAManager::incarnate failed to create POA." // 2
+    };
+
+  static const char *INV_POLICY_TABLE[] =
+    {
+      "Unable to reconcile IOR specified policy with the effective policy override." // 1
+      "Invalid PolicyType.", // 2
+      "No PolicyFactory has been registered for the given PolicyType." // 3
+    };
+
+  if (minor_code == 0)
+    return "*unknown description*";
+
+  minor_code--;  // Adjust to match table offset.
+
+  if (exc._is_a ("IDL:omg.org/CORBA/UNKNOWN:1.0")
+      && minor_code < sizeof UNKNOWN_TABLE / sizeof (char *))
+    return UNKNOWN_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/BAD_PARAM:1.0")
+      && minor_code < sizeof BAD_PARAM_TABLE / sizeof (char *))
+    return BAD_PARAM_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/IMP_LIMIT:1.0")
+      && minor_code < sizeof IMP_LIMIT_TABLE / sizeof (char *))
+    return IMP_LIMIT_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/INITIALIZE:1.0")
+      && minor_code < sizeof INITIALIZE_TABLE / sizeof (char *))
+    return INITIALIZE_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/INV_OBJREF:1.0")
+      && minor_code < sizeof INV_OBJREF_TABLE / sizeof (char *))
+    return INV_OBJREF_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/MARSHAL:1.0")
+      && minor_code < sizeof MARSHAL_TABLE / sizeof (char *))
+    return MARSHAL_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/BAD_TYPECODE:1.0")
+      && minor_code < sizeof BAD_TYPECODE_TABLE / sizeof (char *))
+    return BAD_TYPECODE_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/NO_IMPLEMENT:1.0")
+      && minor_code < sizeof NO_IMPLEMENT_TABLE / sizeof (char *))
+    return NO_IMPLEMENT_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/NO_RESOURCE:1.0")
+      && minor_code < sizeof NO_RESOURCE_TABLE / sizeof (char *))
+    return NO_RESOURCE_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/BAD_INV_ORDER:1.0")
+      && minor_code < sizeof BAD_INV_ORDER_TABLE / sizeof (char *))
+    return BAD_INV_ORDER_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/TRANSIENT:1.0")
+      && minor_code < sizeof TRANSIENT_TABLE / sizeof (char *))
+    return TRANSIENT_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/OBJ_ADAPTER:1.0")
+      && minor_code < sizeof OBJ_ADAPTER_TABLE / sizeof (char *))
+    return OBJ_ADAPTER_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/DATA_CONVERSION:1.0")
+      && minor_code < sizeof DATA_CONVERSION_TABLE / sizeof (char *))
+    return DATA_CONVERSION_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0")
+      && minor_code < sizeof OBJECT_NOT_EXIST_TABLE / sizeof (char *))
+    return OBJECT_NOT_EXIST_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/INV_POLICY:1.0")
+      && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *))
+    return INV_POLICY_TABLE[minor_code];
+
+#else
+  ACE_UNUSED_ARG (exc);
+  ACE_UNUSED_ARG (minor_code);
+#endif  /* !ACE_NDEBUG */
+
+  return "*unknown description*";
+}
+
+// Note that "buffer" holds the (unscoped) name originally, and is
+// then overwritten.
+
+void
+TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp
+                                            ACE_ENV_ARG_DECL)
+{
+  // Create the TypeCode for the CORBA::UnknownUserException.
+  TAO_OutputCDR stream (0,
+                        ACE_CDR_BYTE_ORDER,
+                        TAO_Exceptions::global_allocator_,
+                        TAO_Exceptions::global_allocator_,
+                        TAO_Exceptions::global_allocator_,
+                        ACE_DEFAULT_CDR_MEMCPY_TRADEOFF);
+
+  static const char * interface_id =
+    "IDL:omg.org/CORBA/UnknownUserException:1.0";
+  static const char * name = "UnknownUserException";
+  static const char * field_name = "exception";
+
+  const CORBA::Boolean result =
+    (stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
+     || stream.write_string (interface_id) == 0
+     || stream.write_string (name) == 0
+     || stream.write_ulong (1L) == 0
+     || stream.write_string (field_name) == 0);
+
+  if (result)
+    ACE_THROW (CORBA::INITIALIZE ());
+
+  if (!(stream << CORBA::_tc_any))
+    ACE_THROW (CORBA::INITIALIZE ());
+
+  ACE_NEW_THROW_EX (tcp,
+                    CORBA::TypeCode (CORBA::tk_except,
+                                     stream.length (),
+                                     stream.buffer (),
+                                     1,
+                                     sizeof (CORBA::UserException)),
+                    CORBA::INITIALIZE ());
+}
+
+void
+TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
+                                        const char *name,
+                                        char *buffer,
+                                        size_t buflen
+                                        ACE_ENV_ARG_DECL)
+{
+  // This function must only be called ONCE, and with a global lock
+  // held!  The <CORBA::ORB_init> method is responsible for ensuring
+  // this.
+  static const char *minor = "minor";
+  static const char *completed = "completed";
+
+  // Create a CDR stream ... juggle the alignment here a bit, we know
+  // it's good enough for the typecode.
+
+#if defined(ACE_MVS)
+  // @@ We need to use a translator to make sure that all TypeCodes
+  // 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;
+  TAO_OutputCDR stream (buffer,
+                        buflen,
+                        ACE_CDR_BYTE_ORDER,
+                        TAO_Exceptions::global_allocator_,
+                        TAO_Exceptions::global_allocator_,
+                        TAO_Exceptions::global_allocator_,
+                        ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
+                        &translator);
+#else
+  TAO_OutputCDR stream (buffer,
+                        buflen,
+                        ACE_CDR_BYTE_ORDER,
+                        TAO_Exceptions::global_allocator_,
+                        TAO_Exceptions::global_allocator_,
+                        TAO_Exceptions::global_allocator_,
+                        ACE_DEFAULT_CDR_MEMCPY_TRADEOFF);
+#endif /* ACE_MVS */
+
+  // into CDR stream, stuff (in order):
+  //    - byte order flag [4 bytes]
+  //    - exception ID [27 + N bytes]
+  //    - exception name [4 + N bytes ]
+  //    - number of members (2) [4 bytes ]
+  //    - foreach member, { name string, typecode } [~40 bytes]
+
+  static const char prefix[] = "IDL:omg.org/CORBA/";
+  static const char suffix[] = ":1.0";
+  char * full_id =
+    CORBA::string_alloc (sizeof prefix
+                         + static_cast<CORBA::ULong> (ACE_OS::strlen (name))
+                         + sizeof suffix);
+
+  CORBA::String_var safe_full_id = full_id;
+
+  ACE_OS::strcpy (full_id, prefix);
+  ACE_OS::strcat (full_id, name);
+  ACE_OS::strcat (full_id, suffix);
+
+  CORBA::Boolean result = stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
+    || stream.write_string (full_id) == 0
+    || stream.write_string (name) == 0
+    || stream.write_ulong (2L) != 1
+    || stream.write_string (minor) == 0;
+
+  result = result || !(stream << CORBA::_tc_ulong);
+
+  (void) safe_full_id.out ();  // No longer need the string
+
+  result = result || stream.write_string (completed) == 0;
+  result = result || !(stream << TAO::TC_completion_status);
+
+  if (result)
+    ACE_THROW (CORBA::INITIALIZE ());
+
+  // @@ It is possible to throw an exception at this point?
+  //    What if the exception typecode has not been initialized yet?
+
+  // OK, we stuffed the buffer we were given (or grew a bigger one;
+  // hope to avoid that during initialization).  Now build and return
+  // 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::INITIALIZE ());
+  ACE_CHECK;
+
+  ACE_ASSERT (tcp->length_ <= buflen);
+  return;
+}
+
+#if defined (__Lynx__)
+
+// LynxOS uses macro THREAD_CANCELLED internally, so it must
+// be undefined to avoid compilation errors
+#if defined (THREAD_CANCELLED)
+#undef THREAD_CANCELLED
+#endif /* THREAD_CANCELLED */
+
+#endif /*__Lynx__ */
+
+
+// List of standard/system exceptions ... used to create static
+// storage for their typecodes, then later to initialize that storage
+// using the routine above. (It's just too painful to init these
+// typecodes statically in all cases!)
+
+#define STANDARD_EXCEPTION_LIST \
+    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
+    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
+    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
+    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
+    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
+    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
+    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
+    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
+    TAO_SYSTEM_EXCEPTION (INTERNAL) \
+    TAO_SYSTEM_EXCEPTION (MARSHAL) \
+    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
+    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
+    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
+    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
+    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
+    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
+    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
+    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
+    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
+    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
+    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
+    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
+    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
+    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
+    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
+    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \
+    TAO_SYSTEM_EXCEPTION (INV_POLICY) \
+    TAO_SYSTEM_EXCEPTION (REBIND) \
+    TAO_SYSTEM_EXCEPTION (TIMEOUT) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \
+    TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \
+    TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \
+    TAO_SYSTEM_EXCEPTION (BAD_QOS) \
+    TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \
+    TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \
+    TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \
+    TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED)
+
+// Declare static storage for these ... the buffer is "naturally"
+// aligned and overwritten.
+//
+// @@ this actually doesn't guarantee "natural" alignment, but
+// it works that way in most systems.
+
+#define TAO_TC_BUF_LEN 256
+
+static CORBA::Long tc_buf_CORBA[TAO_TC_BUF_LEN / sizeof (CORBA::Long)];
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+  CORBA::TypeCode_ptr CORBA::_tc_ ## name = 0;
+  STANDARD_EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+
+  static CORBA::TypeCode_ptr *type_code_array [] = {
+#define TAO_SYSTEM_EXCEPTION(name) \
+      &CORBA::_tc_ ## name,
+      STANDARD_EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+      &CORBA::_tc_null};
+
+// Since we add an extra element subtract 1
+static const CORBA::ULong array_sz =
+    (sizeof (type_code_array) / sizeof (CORBA::TypeCode_ptr)) - 1;
+
+static const char *repo_id_array[] = {
+#define TAO_SYSTEM_EXCEPTION(name) \
+                  (char *) "IDL:omg.org/CORBA/" #name ":1.0",
+      STANDARD_EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+      0
+  };
+
+
+TAO::excp_factory excp_array [] = {
+#define TAO_SYSTEM_EXCEPTION(name) \
+      &CORBA::name::_tao_create,
+      STANDARD_EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+      0
+    };
+
+void
+TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL)
+{
+  // This routine should only be called once.
+
+  // Not thread safe.  Caller must provide synchronization.
+
+  if (TAO_Exceptions::initialized_)
+    {
+      return;
+    }
+
+  // Initialize the start up allocator.
+  ACE_NEW (TAO_Exceptions::global_allocator_,
+           ACE_New_Allocator);
+
+  static const char *name_array[] = {
+#define TAO_SYSTEM_EXCEPTION(name) \
+                        # name,
+      STANDARD_EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+      0
+  };
+
+  for (CORBA::ULong i = 0; i < array_sz; ++i)
+    {
+      TAO_Exceptions::make_standard_typecode (*type_code_array[i],
+                                              name_array[i],
+                                              (char*) tc_buf_CORBA,
+                                              sizeof tc_buf_CORBA
+                                              ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+  TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException
+                                              ACE_ENV_ARG_PARAMETER);
+
+  TAO_Exceptions::initialized_ = true;
+}
+
+#undef TAO_TC_BUF_LEN
+
+
+CORBA::SystemException *
+TAO_Exceptions::create_system_exception (const char *id
+                                         ACE_ENV_ARG_DECL_NOT_USED)
+{
+  for (CORBA::ULong i = 0; i < array_sz; ++i)
+    {
+      if (ACE_OS::strcmp (id, repo_id_array[i]) == 0)
+        return (*(excp_array[i])) ();
+    }
+
+  return 0;
+}
+
+void
+TAO_Exceptions::fini (void)
+{
+  for (CORBA::ULong i = 0; i < array_sz; ++i)
+    {
+      CORBA::release (*type_code_array[i]);
+      *type_code_array[i] = 0;
+    }
+
+  CORBA::release (CORBA::_tc_UnknownUserException);
+  CORBA::_tc_UnknownUserException = 0;
+
+  delete TAO_Exceptions::global_allocator_;
+  TAO_Exceptions::global_allocator_ = 0;
+}
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+CORBA::name * \
+CORBA::name ::_downcast (CORBA::Exception* exception) \
+{ \
+  if (exception->_is_a ("IDL:omg.org/CORBA/" #name ":1.0")) \
+    return dynamic_cast<CORBA::name *> (exception); \
+  return 0; \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+void \
+CORBA::name ::_raise (void) const \
+{ \
+  TAO_RAISE (*this); \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+// SystemException constructors
+#define TAO_SYSTEM_EXCEPTION(name) \
+CORBA::name ::name (void) \
+  :  CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
+                             #name, \
+                             TAO_DEFAULT_MINOR_CODE, \
+                             CORBA::COMPLETED_NO) \
+{ \
+} \
+\
+CORBA::name ::name (CORBA::ULong code, CORBA::CompletionStatus completed) \
+  : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
+                            #name, \
+                            code, \
+                            completed) \
+{ \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+CORBA::TypeCode_ptr \
+CORBA::name ::_type (void) const \
+{ \
+  return CORBA::_tc_ ## name; \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+void \
+CORBA::name ::_tao_any_destructor (void *x) \
+{ \
+  CORBA::name *tmp = static_cast<CORBA::name *> (x); \
+  delete tmp; \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+CORBA::Exception * \
+CORBA::name ::_tao_duplicate (void) const \
+{ \
+  CORBA::Exception *result; \
+  ACE_NEW_RETURN (result, CORBA::name (*this), 0); \
+  return result; \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+CORBA::SystemException * \
+CORBA::name ::_tao_create (void) \
+{ \
+  CORBA::name *result; \
+  ACE_NEW_RETURN (result, CORBA::name (), 0); \
+  return result; \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+void \
+CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \
+{ \
+  TAO::Any_SystemException::insert_copy ( \
+      any, \
+      CORBA::name ::_tao_any_destructor, \
+      CORBA::_tc_ ## name, \
+      ex \
+    ); \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+void \
+CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \
+{ \
+  TAO::Any_SystemException::insert ( \
+      any, \
+      CORBA::name ::_tao_any_destructor, \
+      CORBA::_tc_ ## name, \
+      ex \
+    ); \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+CORBA::Boolean operator>>= (const CORBA::Any &any, \
+                            const CORBA::name *&ex) \
+{ \
+  return \
+    TAO::Any_SystemException::extract ( \
+        any, \
+        CORBA::name ::_tao_any_destructor, \
+        CORBA::_tc_ ## name, \
+        (const CORBA::SystemException *&) ex, \
+        &CORBA::name ::_tao_create); \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+
 
 #if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
 TAO_DONT_CATCH::TAO_DONT_CATCH (void)
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 9a6cff3dd5c..76759a0e755 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -8,13 +8,13 @@
  *
  *   This file defines way in which CORBA exceptions are reported.
  *
+ *  @author Copyright 1994-1995 by Sun Microsystems Inc.
  *  @author DOC Group at Vanderbilt U., Wash U, and UCI
  */
 //=============================================================================
 
 #ifndef TAO_EXCEPTION_H
 #define TAO_EXCEPTION_H
-
 #include /**/ "ace/pre.h"
 
 // Do not try removing this. If you remove this for subsetting lots of
@@ -32,12 +32,11 @@
 #define TAO_RAISE(EXCEPTION)
 #endif /* ACE_HAS_EXCEPTIONS */
 
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/CORBA_String.h"
 #include "ace/SStringfwd.h"
 #include "ace/iosfwd.h"
 #include "ace/CORBA_macros.h"
+#include "tao/TAO_Export.h"
+#include "tao/Basic_Types.h"
 
 class ACE_Allocator;
 
@@ -64,26 +63,26 @@ class TAO_InputCDR;
 namespace CORBA
 {
   class TypeCode;
-  typedef TypeCode * TypeCode_ptr;
+  typedef TypeCode *TypeCode_ptr;
 
   class Environment;
 
   class Any;
-  typedef Any * Any_ptr;
+  typedef Any *Any_ptr;
+
+  enum CompletionStatus
+  {
+    // = Completion Status for System exceptions
 
-  class SystemException;
+    COMPLETED_YES,     // successful or exceptional completion
+    COMPLETED_NO,      // didn't change any state; retry is OK
+    COMPLETED_MAYBE    // can't say what happened; retry unsafe
+  };
 
-  /**
-   * @enum exception_type
-   *
-   * @brief Enumeration used to identify the type of CORBA exception.
-   *
-   * CORBA exceptions generally fall into two categories, user
-   * exceptions and system exceptions.  This enumeration is used when
-   * identifying the type of CORBA exception.
-   */
   enum exception_type
   {
+    // = Exception type.
+
     NO_EXCEPTION,
     USER_EXCEPTION,
     SYSTEM_EXCEPTION
@@ -97,18 +96,25 @@ namespace CORBA
    * @brief Exception
    *
    * CORBA2-specified exception hierarchy.  All exceptions have a
-   * type (represented by a @c TypeCode) and a widely scoped type ID
-   * (in the @c TypeCode) that are generated by any OMG-IDL compiler
-   * and available through the Interface Repository.  Think of it as a
+   * type (represented by a TypeCode) and a widely scoped type ID
+   * (in the TypeCode) that generated by any OMG-IDL compiler and
+   * available through the Interface Repositories.  Think of it as a
    * "globally scoped" name distinguishing each exception.
-   *
-   * @todo According to the OMG CORBA C++ Mapping version 1.1, all
-   *       constructors, copy constructors and assignment operators
-   *       should be moved to "protected" section in class
-   *       declarations.  Since the current MS Visual C++ 6.0 compiler
-   *       will cause some problems to TAO's exception mechanism, we
-   *       defer doing this until we drop support for MSVC++ 6.
    */
+
+  /* NOTE:
+     According to the OMG CORBA C++ Mapping version 1.1, all
+         constructors, copy constructors and assignment operators
+         should be moved to "protected" section in class declarations
+
+         Since the current MS Visual C++ 6.0 compiler will cause some
+         problems to TAO's exception mechanism, so we defer doing this until
+         we full migrate from VC 6.0 to VC 7.0 and higher version.
+
+     This later change only affect the "Exception.h" file and won't
+         affect the "Exception.cpp" file.
+  */
+
   class TAO_Export Exception
   {
   public:
@@ -142,14 +148,12 @@ namespace CORBA
     // = To implement the narrow method.
     virtual int _is_a (const char* repository_id) const;
 
-    /// Construct from a respository id.
+    /// Constructor from a respository id.
     Exception (const char *repository_id,
                const char *local_name);
 
-    /// Print the exception to output determined by @a f.
-    /**
-     * @note This method is TAO-specific.
-     */
+    /// Print the exception <ex> to output determined by <f>.  This
+    /// function is not CORBA compliant.
     void _tao_print_exception (const char *info,
                                FILE *f = stdout) const;
 
@@ -191,20 +195,234 @@ namespace CORBA
     virtual CORBA::Exception *_tao_duplicate (void) const = 0;
 
   protected:
-
-    /// Default constructor.
+    /// Default constructor is protected.
     Exception (void);
 
   private:
+    /// Storage of our repository id and local name.
+    char *id_;
+    char *name_;
+  };
+
+  /**
+   * @class UserException
+   *
+   * @brief User exceptions are those defined by application developers
+   * using OMG-IDL.
+   */
+  class TAO_Export UserException : public Exception
+  {
+  public:
+
+    /// Copy constructor.
+    UserException (const UserException &src);
+
+    /// Destructor.
+    ~UserException (void);
+
+    /// Assignment operator.
+    UserException &operator= (const UserException &src);
+
+    /// The narrow operation.
+    static UserException *_downcast (CORBA::Exception *exception);
+
+        /// The const version of narrow operation
+    static const UserException *_downcast (const CORBA::Exception *exception);
+
+    virtual void _raise (void) const = 0;
+
+    // = TAO specific extension.
+
+    /// Constructor from a repository id.
+    UserException (const char *repository_id,
+                   const char *local_name);
+
+    virtual int _is_a (const char *interface_id) const;
+
+    // Used for narrowing
+
+    /// Returns a string containing information about the exception. This
+    /// function is not CORBA compliant.
+    virtual ACE_CString _info (void) const;
+
+    //protected:
+    /// Default constructor.
+    UserException (void);
+  };
+
+
+
+  /**
+   * @class SystemException
+   *
+   * @brief SystemException
+   *
+   * System exceptions are those defined in the CORBA spec; OMG-IDL
+   * defines these.
+   */
+  class TAO_Export SystemException : public Exception
+  {
+  public:
+    /// Default constructtor
+    SystemException (void);
+
+
+    /// Copy constructor.
+    SystemException (const SystemException &src);
+
+    /// Destructor.
+    ~SystemException (void);
+
+    /// Assignment operator.
+    SystemException &operator= (const SystemException &src);
+
+    /// Get the minor status.
+    ULong minor (void) const;
+
+    /// Set the minor status.
+    void minor (ULong m);
+
+    /// Get the completion status.
+    CORBA::CompletionStatus completed (void) const;
+
+    /// Set the operation completion status.
+    void completed (CORBA::CompletionStatus c);
+
+    /// Narrow to a SystemException.
+    static SystemException *_downcast (CORBA::Exception *exception);
+
+        /// The const version of narrow operation to a SystemException
+    static const SystemException *_downcast(const CORBA::Exception *exception);
 
-    /// Repository Id
-    CORBA::String_var id_;
+    virtual void _raise (void) const = 0;
+
+    // = TAO-specific extension.
+
+    /// Helper for the _downcast operation.
+    virtual int _is_a (const char *type_id) const;
+
+    /// Print the system exception @c ex to output determined by @c f.
+    /// This function is not CORBA compliant.
+    void _tao_print_system_exception (FILE *f = stdout) const;
+
+    /// Create an exception from the available exception
+    /// virtual CORBA::Exception *_tao_duplicate (void) const;
+
+    /// Returns a string containing information about the exception. This
+    /// function is not CORBA compliant.
+    virtual ACE_CString _info (void) const;
+
+    virtual void _tao_encode (TAO_OutputCDR &cdr
+                              ACE_ENV_ARG_DECL_NOT_USED) const;
+    virtual void _tao_decode (TAO_InputCDR &cdr
+                              ACE_ENV_ARG_DECL_NOT_USED);
+
+    /// Helper to create a minor status value.
+    static CORBA::ULong _tao_minor_code (u_int location,
+                                         int errno_value);
 
-    /// Local name.
-    CORBA::String_var name_;
+    /// Helper to translate a platform-specific errno to a TAO errno
+    /// value.
+    static CORBA::ULong _tao_errno (int errno_value);
+
+    /// Overridden base class method to help compilers that use
+    /// explicit template instantiations going
+    virtual CORBA::Exception *_tao_duplicate (void) const {return 0;}
+
+  protected:
+
+    /// Constructor using a repository id.
+    SystemException (CORBA::ULong code,
+                     CORBA::CompletionStatus completed);
+
+    /// Constructor using a repository id.
+    SystemException (const char *repository_id,
+                     const char *local_name,
+                     CORBA::ULong code,
+                     CORBA::CompletionStatus completed);
+
+    /// Return the exception description associated with the given OMG
+    /// minor code.
+    static const char *_tao_get_omg_exception_description (
+      const CORBA::SystemException &exc,
+      CORBA::ULong minor_code);
+
+  private:
+    /// Minor code.
+    CORBA::ULong minor_;
+
+    /// Completion status.
+    CORBA::CompletionStatus completed_;
 
   };
 
+  // Declarations for all of the CORBA standard exceptions.
+  //
+  // @@ - shouldn't have a default minor code, at least for code that's
+  // inside the ORB.  All minor codes should be symbolically catalogued.
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+    class TAO_Export name : public SystemException \
+    { \
+    public: \
+      name (void); \
+      name (CORBA::ULong code, \
+            CORBA::CompletionStatus completed); \
+      static name * _downcast (CORBA::Exception* exception); \
+      virtual void _raise (void) const; \
+      virtual CORBA::TypeCode_ptr _type (void) const; \
+      static void _tao_any_destructor (void*); \
+      virtual CORBA::Exception *_tao_duplicate (void) const; \
+      static CORBA::SystemException *_tao_create (void); \
+    }; \
+  TAO_Export void operator<<= (CORBA::Any &, const CORBA::name &); \
+  TAO_Export void operator<<= (CORBA::Any &, CORBA::name *); \
+  TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, \
+                                         const CORBA::name *&)
+
+  TAO_SYSTEM_EXCEPTION(UNKNOWN);          // the unknown exception
+  TAO_SYSTEM_EXCEPTION(BAD_PARAM);        // an invalid parameter was passed
+  TAO_SYSTEM_EXCEPTION(NO_MEMORY);        // memory allocation failure
+  TAO_SYSTEM_EXCEPTION(IMP_LIMIT);        // violated implementation limit
+  TAO_SYSTEM_EXCEPTION(COMM_FAILURE);     // communication failure
+  TAO_SYSTEM_EXCEPTION(INV_OBJREF);       // invalid object reference
+  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); // no such object
+  TAO_SYSTEM_EXCEPTION(NO_PERMISSION);    // no permission for operation
+  TAO_SYSTEM_EXCEPTION(INTERNAL);         // ORB internal error
+  TAO_SYSTEM_EXCEPTION(MARSHAL);          // error marshaling param/result
+  TAO_SYSTEM_EXCEPTION(INITIALIZE);       // ORB initialization failure
+  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);     // implementation unavailable
+  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);     // bad typecode
+  TAO_SYSTEM_EXCEPTION(BAD_OPERATION);    // invalid operation
+  TAO_SYSTEM_EXCEPTION(NO_RESOURCES);     // out of resources for request
+  TAO_SYSTEM_EXCEPTION(NO_RESPONSE);      // response not yet available
+  TAO_SYSTEM_EXCEPTION(PERSIST_STORE);    // persistent storage failure
+  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);    // routine invocations out of order
+  TAO_SYSTEM_EXCEPTION(TRANSIENT);        // transient error, try again later
+  TAO_SYSTEM_EXCEPTION(FREE_MEM);         // cannot free memory
+  TAO_SYSTEM_EXCEPTION(INV_IDENT);        // invalid identifier syntax
+  TAO_SYSTEM_EXCEPTION(INV_FLAG);         // invalid flag was specified
+  TAO_SYSTEM_EXCEPTION(INTF_REPOS);       // interface repository unavailable
+  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);      // error processing context object
+  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);      // object adapter failure
+  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);  // data conversion error
+  TAO_SYSTEM_EXCEPTION(INV_POLICY);       // invalid policies present
+  TAO_SYSTEM_EXCEPTION(REBIND);           // rebind needed
+  TAO_SYSTEM_EXCEPTION(TIMEOUT);          // operation timed out
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); // no transaction
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE);        // invalid transaction mode
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED);    // operation needs transaction
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK);  // operation was a no-op
+  TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION);     // invalid TP context passed
+  TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE);    // incompatible code set
+  TAO_SYSTEM_EXCEPTION(BAD_QOS);          // bad quality of service
+  TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY);
+  TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED);
+  TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED);
+  TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED);
+
+#undef TAO_SYSTEM_EXCEPTION
+
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
   // Required by C++ mapping.
@@ -243,7 +461,7 @@ public:
                                           ACE_ENV_ARG_DECL);
 
   /// Runtime initialization of all standard exception typecodes.
-  /// Called from @c CORBA::ORB_init.
+  /// Called from <CORBA::ORB_init>.
   static void init (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Runtime finalization of all standard exception typecodes.
@@ -275,8 +493,6 @@ private:
  *
  * @brief This class is only used internally in TAO as an exception
  * that never gets thrown.  Never use this class anywhere.
- *
- * @internal
  */
 class TAO_Export TAO_DONT_CATCH
 {
@@ -293,5 +509,4 @@ TAO_Export void operator<<= (CORBA::Any &, CORBA::Exception *);
 #endif /* __ACE_INLINE__ */
 
 #include /**/"ace/post.h"
-
 #endif /* TAO_EXCEPTION_H */
diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i
index 7fc06f9f2ad..56bf7a1e6a9 100644
--- a/TAO/tao/Exception.i
+++ b/TAO/tao/Exception.i
@@ -2,8 +2,38 @@
 //
 // $Id$
 
-ACE_INLINE CORBA::Exception *
-CORBA::Exception::_downcast (CORBA::Exception * x)
+ACE_INLINE CORBA::Exception*
+CORBA::Exception::_downcast (CORBA::Exception* x)
 {
   return x;
 }
+
+ACE_INLINE
+CORBA::UserException::UserException (const CORBA::UserException &src)
+  : CORBA::Exception (src)
+{
+}
+
+ACE_INLINE CORBA::ULong
+CORBA::SystemException::minor (void) const
+{
+  return this->minor_;
+}
+
+ACE_INLINE void
+CORBA::SystemException::minor (CORBA::ULong m)
+{
+  this->minor_ = m;
+}
+
+ACE_INLINE CORBA::CompletionStatus
+CORBA::SystemException::completed (void) const
+{
+  return this->completed_;
+}
+
+ACE_INLINE void
+CORBA::SystemException::completed (CORBA::CompletionStatus c)
+{
+  this->completed_ = c;
+}
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index d0ba65b8959..197bc1275c1 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -3,7 +3,6 @@
 #include "FILE_Parser.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
-#include "tao/Object.h"
 
 #include "ace/Read_Buffer.h"
 
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 4d02a03d3bf..64cb1090356 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -23,8 +23,6 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
   return cdr << this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_slice, typename S_forany>
 void
 TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
@@ -35,8 +33,6 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S, typename S_slice, typename S_forany>
@@ -57,8 +53,6 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_slice, typename S_forany>
 void
 TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
@@ -69,8 +63,6 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, typename S_slice, typename S_forany>
@@ -82,8 +74,6 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_slice, typename S_forany>
 void
 TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
@@ -94,14 +84,12 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
+template<typename S, 
+         typename S_slice, 
+         typename S_var, 
+         typename S_forany, 
          typename S_tag>
 CORBA::Boolean
 TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
@@ -111,19 +99,17 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
   typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS;
   S_slice * tmp_ptr = 0;
   ACE_ALLOCATOR_RETURN (tmp_ptr,
-                        ARRAY_TRAITS::alloc (),
+                        ARRAY_TRAITS::tao_alloc (),
                         0);
   this->x_ = tmp_ptr;
   S_forany tmp (this->x_.ptr ());
   return cdr >> tmp;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
+template<typename S, 
+         typename S_slice, 
+         typename S_var, 
+         typename S_forany, 
          typename S_tag>
 void
 TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
@@ -132,6 +118,4 @@ interceptor_result (CORBA::Any * any)
   (*any) <<= S_forany (this->x_.ptr ());
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index e4506ec5d8c..e6afe22871e 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -36,9 +36,9 @@ namespace TAO
     In_Fixed_Array_Argument_T (const S_slice * x);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S_slice * arg (void) const;
 
   private:
@@ -59,9 +59,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_slice * arg (void);
 
   private:
@@ -81,9 +81,9 @@ namespace TAO
     Out_Fixed_Array_Argument_T (S_slice *& x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
    S_slice *& arg (void);
 
   private:
@@ -107,9 +107,9 @@ namespace TAO
     Ret_Fixed_Array_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_slice *& arg (void);
 
     S_slice * excp (void);
diff --git a/TAO/tao/Fixed_Array_SArgument_T.cpp b/TAO/tao/Fixed_Array_SArgument_T.cpp
index 48c9cda74c8..cd59b4db789 100644
--- a/TAO/tao/Fixed_Array_SArgument_T.cpp
+++ b/TAO/tao/Fixed_Array_SArgument_T.cpp
@@ -22,8 +22,6 @@ TAO::In_Fixed_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR &cdr)
   return cdr >> tmp;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_forany>
 void
 TAO::In_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param (
@@ -34,8 +32,6 @@ TAO::In_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S, typename S_forany>
@@ -53,8 +49,6 @@ TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR & cdr)
   return cdr >> tmp;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_forany>
 void
 TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param (
@@ -65,8 +59,6 @@ TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, typename S_forany>
@@ -76,8 +68,6 @@ TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::marshal (TAO_OutputCDR &cdr)
   return cdr << S_forany (this->x_);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_forany>
 void
 TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param (
@@ -88,8 +78,6 @@ TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S_slice, typename S_var, typename S_forany>
@@ -101,8 +89,6 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
   return cdr << S_forany (this->x_.inout ());
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_slice, typename S_var, typename S_forany>
 void
 TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
@@ -112,6 +98,4 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
   (*any) <<= S_forany (this->x_.ptr ());
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_FIXED_ARRAY_SARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Array_SArgument_T.h b/TAO/tao/Fixed_Array_SArgument_T.h
index 6e6fb9a52f7..beef979efcb 100644
--- a/TAO/tao/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/Fixed_Array_SArgument_T.h
@@ -36,9 +36,9 @@ namespace TAO
     In_Fixed_Array_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S & arg (void) const;
 
   private:
@@ -59,9 +59,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -81,9 +81,9 @@ namespace TAO
     Out_Fixed_Array_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -103,9 +103,9 @@ namespace TAO
     Ret_Fixed_Array_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_slice *& arg (void);
 
   private:
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
index 0819eabf688..8d13d7f0fe2 100644
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ b/TAO/tao/Fixed_Size_Argument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_Fixed_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
   return cdr << *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -31,8 +29,6 @@ TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S>
@@ -49,8 +45,6 @@ TAO::Inout_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param (
@@ -61,8 +55,6 @@ TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S>
@@ -72,8 +64,6 @@ TAO::Out_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param (
@@ -84,8 +74,6 @@ TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S>
@@ -95,8 +83,6 @@ TAO::Ret_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any)
@@ -104,6 +90,4 @@ TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_FIXED_SIZE_ARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index c2cabced3e4..1ba209d9cf8 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -36,9 +36,9 @@ namespace TAO
     In_Fixed_Size_Argument_T (S const & x);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S & arg (void) const;
 
   private:
@@ -59,9 +59,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -81,9 +81,9 @@ namespace TAO
     Out_Fixed_Size_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -103,9 +103,9 @@ namespace TAO
     Ret_Fixed_Size_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
     S excp (void);
diff --git a/TAO/tao/Fixed_Size_SArgument_T.cpp b/TAO/tao/Fixed_Size_SArgument_T.cpp
index 28408a12af2..cebb409762c 100644
--- a/TAO/tao/Fixed_Size_SArgument_T.cpp
+++ b/TAO/tao/Fixed_Size_SArgument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
   return cdr >> *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -31,8 +29,6 @@ TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S>
@@ -49,8 +45,6 @@ TAO::Inout_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param (
@@ -61,8 +55,6 @@ TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S>
@@ -72,8 +64,6 @@ TAO::Out_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -82,8 +72,6 @@ TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S>
@@ -93,8 +81,6 @@ TAO::Ret_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
   return cdr << *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any)
@@ -102,6 +88,4 @@ TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any)
   (*any) <<= *this->x_;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_FIXED_SIZE_SARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Size_SArgument_T.h b/TAO/tao/Fixed_Size_SArgument_T.h
index 4ba6e2f0bfa..8b485656896 100644
--- a/TAO/tao/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/Fixed_Size_SArgument_T.h
@@ -36,9 +36,9 @@ namespace TAO
     In_Fixed_Size_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S & arg (void) const;
 
   private:
@@ -59,9 +59,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -81,9 +81,9 @@ namespace TAO
     Out_Fixed_Size_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -103,9 +103,9 @@ namespace TAO
     Ret_Fixed_Size_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index 2e08b31438a..f2ec15529f2 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -23,9 +23,6 @@
 //
 // ================================================================
 
-#ifndef TAO_GIOP_PIDL
-#define TAO_GIOP_PIDL
-
 #include "IOP.pidl"
 
 #pragma prefix "omg.org"
@@ -56,5 +53,3 @@ module GIOP
     case ReferenceAddr: IORAddressingInfo ior;
   };
 };
-
-#endif  /* TAO_GIOP_PIDL */
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index dfdd5db0474..45704752f66 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -11,18 +11,15 @@
 #include "LF_Strategy.h"
 #include "Request_Dispatcher.h"
 #include "Codeset_Manager.h"
-#include "SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "GIOP_Message_Base.i"
 #endif /* __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            GIOP_Message_Base,
            "$Id$")
 
-
 TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
                                               size_t /*input_cdr_size*/)
   : orb_core_ (orb_core)
@@ -906,7 +903,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
 
       // Throw an exception if the
       if (parse_error != 0)
-        ACE_TRY_THROW (CORBA::MARSHAL (0,
+        ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                        CORBA::COMPLETED_NO));
       request_id = request.request_id ();
 
@@ -995,7 +992,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
         }
       else if (TAO_debug_level > 0)
         {
-          // It is unfortunate that an exception (probably a system
+          // It is unfotunate that an exception (probably a system
           // exception) was thrown by the upcall code (even by the
           // user) when the client was not expecting a response.
           // However, in this case, we cannot close the connection
@@ -1040,8 +1037,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
               if (TAO_debug_level > 0)
                 {
                   ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_request[3], ")
-                              ACE_TEXT ("%p: ")
+                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
                               ACE_TEXT ("cannot send exception\n"),
                               ACE_TEXT ("process_request ()")));
                   ACE_PRINT_EXCEPTION (
@@ -1097,7 +1093,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
 
       if (parse_error != 0)
         {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
+          ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO));
         }
 
@@ -1126,7 +1122,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
 
       if (parse_error != 0)
         {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
+          ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO));
         }
 
@@ -1144,8 +1140,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
           status_info.status = TAO_GIOP_OBJECT_FORWARD;
           status_info.forward_location_var = forward_to;
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                      ACE_TEXT ("called: forwarding\n")));
+                      ACE_TEXT ("handle_locate has been called: forwarding\n")));
         }
       else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
         {
@@ -1153,8 +1148,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
           status_info.status = TAO_GIOP_OBJECT_HERE;
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                        ACE_TEXT ("found\n")));
+                        ACE_TEXT ("TAO: (%P|%t) handle_locate() : found\n")));
         }
       else
         {
@@ -1164,16 +1158,14 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
             {
               status_info.status = TAO_GIOP_OBJECT_FORWARD;
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                          ACE_TEXT ("forwarding\n")));
+                          ACE_TEXT ("handle_locate has been called: forwarding\n")));
             }
           else
             {
               // Normal exception, so the object is not here
               status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                          ACE_TEXT ("not here\n")));
+                          ACE_TEXT ("handle_locate has been called: not here\n")));
             }
         }
     }
@@ -1184,7 +1176,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
       status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
+                    ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Base::process_locate_request - ")
                     ACE_TEXT ("CORBA exception raised\n")));
     }
 #if defined (TAO_HAS_EXCEPTIONS)
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index 8f844d1437b..eef8198c352 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 class TAO_Operation_Details;
 class TAO_Target_Specification;
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index eae1ef62b41..0166a4baa2c 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -9,7 +9,6 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
-#include "tao/SystemException.h"
 
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 344e84a3388..e9cddab3989 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -13,18 +13,15 @@
 #include "Transport.h"
 #include "Transport_Mux_Strategy.h"
 #include "Codeset_Manager.h"
-#include "SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_Lite.i"
 #endif /* __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            GIOP_Message_Lite,
            "$Id$")
 
-
 static const size_t TAO_GIOP_LITE_HEADER_LEN = 5;
 static const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0;
 static const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4;
@@ -740,7 +737,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
 
       // Throw an exception if the
       if (parse_error != 0)
-        ACE_TRY_THROW (CORBA::MARSHAL (0,
+        ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                        CORBA::COMPLETED_NO));
       request_id = request.request_id ();
 
@@ -925,7 +922,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
 
       if (parse_error != 0)
         {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
+          ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO));
         }
 
@@ -961,7 +958,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
 
       if (parse_error != 0)
         {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
+          ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO));
         }
 
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index 3393e074da0..54c9ff7aea0 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -24,7 +24,7 @@
 
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/GIOP_Utils.h"
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 #include "tao/CDR.h"
 
 class TAO_Operation_Details;
diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc
index 2d2bf2ea84b..cf3cb841bce 100644
--- a/TAO/tao/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client.mpc
@@ -22,8 +22,4 @@ project : taolib, core {
   Resource_Files {
     IFR_Client
   }
-
-  PIDL_Files {
-    IFR_Client
-  }
 }
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 78ed2bb2abf..a2e550c60c8 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -616,7 +616,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::IRObject_ptr
-TAO::Objref_Traits<CORBA::IRObject>::duplicate (
+TAO::Objref_Traits<CORBA::IRObject>::tao_duplicate (
     CORBA::IRObject_ptr p
   )
 {
@@ -625,7 +625,7 @@ TAO::Objref_Traits<CORBA::IRObject>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::IRObject>::release (
+TAO::Objref_Traits<CORBA::IRObject>::tao_release (
     CORBA::IRObject_ptr p
   )
 {
@@ -634,14 +634,14 @@ TAO::Objref_Traits<CORBA::IRObject>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::IRObject_ptr
-TAO::Objref_Traits<CORBA::IRObject>::nil (void)
+TAO::Objref_Traits<CORBA::IRObject>::tao_nil (void)
 {
   return CORBA::IRObject::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::IRObject>::marshal (
+TAO::Objref_Traits<CORBA::IRObject>::tao_marshal (
     CORBA::IRObject_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -851,7 +851,7 @@ CORBA::IRObject::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Contained_ptr
-TAO::Objref_Traits<CORBA::Contained>::duplicate (
+TAO::Objref_Traits<CORBA::Contained>::tao_duplicate (
     CORBA::Contained_ptr p
   )
 {
@@ -860,7 +860,7 @@ TAO::Objref_Traits<CORBA::Contained>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::Contained>::release (
+TAO::Objref_Traits<CORBA::Contained>::tao_release (
     CORBA::Contained_ptr p
   )
 {
@@ -869,14 +869,14 @@ TAO::Objref_Traits<CORBA::Contained>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Contained_ptr
-TAO::Objref_Traits<CORBA::Contained>::nil (void)
+TAO::Objref_Traits<CORBA::Contained>::tao_nil (void)
 {
   return CORBA::Contained::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::Contained>::marshal (
+TAO::Objref_Traits<CORBA::Contained>::tao_marshal (
     CORBA::Contained_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2376,7 +2376,7 @@ void CORBA::EnumMemberSeq::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Container_ptr
-TAO::Objref_Traits<CORBA::Container>::duplicate (
+TAO::Objref_Traits<CORBA::Container>::tao_duplicate (
     CORBA::Container_ptr p
   )
 {
@@ -2385,7 +2385,7 @@ TAO::Objref_Traits<CORBA::Container>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::Container>::release (
+TAO::Objref_Traits<CORBA::Container>::tao_release (
     CORBA::Container_ptr p
   )
 {
@@ -2394,14 +2394,14 @@ TAO::Objref_Traits<CORBA::Container>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Container_ptr
-TAO::Objref_Traits<CORBA::Container>::nil (void)
+TAO::Objref_Traits<CORBA::Container>::tao_nil (void)
 {
   return CORBA::Container::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::Container>::marshal (
+TAO::Objref_Traits<CORBA::Container>::tao_marshal (
     CORBA::Container_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3591,7 +3591,7 @@ CORBA::Container::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::IDLType_ptr
-TAO::Objref_Traits<CORBA::IDLType>::duplicate (
+TAO::Objref_Traits<CORBA::IDLType>::tao_duplicate (
     CORBA::IDLType_ptr p
   )
 {
@@ -3600,7 +3600,7 @@ TAO::Objref_Traits<CORBA::IDLType>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::IDLType>::release (
+TAO::Objref_Traits<CORBA::IDLType>::tao_release (
     CORBA::IDLType_ptr p
   )
 {
@@ -3609,14 +3609,14 @@ TAO::Objref_Traits<CORBA::IDLType>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::IDLType_ptr
-TAO::Objref_Traits<CORBA::IDLType>::nil (void)
+TAO::Objref_Traits<CORBA::IDLType>::tao_nil (void)
 {
   return CORBA::IDLType::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::IDLType>::marshal (
+TAO::Objref_Traits<CORBA::IDLType>::tao_marshal (
     CORBA::IDLType_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3792,7 +3792,7 @@ CORBA::IDLType::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::TypedefDef_ptr
-TAO::Objref_Traits<CORBA::TypedefDef>::duplicate (
+TAO::Objref_Traits<CORBA::TypedefDef>::tao_duplicate (
     CORBA::TypedefDef_ptr p
   )
 {
@@ -3801,7 +3801,7 @@ TAO::Objref_Traits<CORBA::TypedefDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::TypedefDef>::release (
+TAO::Objref_Traits<CORBA::TypedefDef>::tao_release (
     CORBA::TypedefDef_ptr p
   )
 {
@@ -3810,14 +3810,14 @@ TAO::Objref_Traits<CORBA::TypedefDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::TypedefDef_ptr
-TAO::Objref_Traits<CORBA::TypedefDef>::nil (void)
+TAO::Objref_Traits<CORBA::TypedefDef>::tao_nil (void)
 {
   return CORBA::TypedefDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::TypedefDef>::marshal (
+TAO::Objref_Traits<CORBA::TypedefDef>::tao_marshal (
     CORBA::TypedefDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -4104,7 +4104,7 @@ CORBA::Boolean operator<< (
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::InterfaceDef>::marshal (
+            TAO::Objref_Traits<CORBA::InterfaceDef>::tao_marshal (
                 _tao_sequence[i].in (), strm
               );
         }
@@ -4179,7 +4179,7 @@ CORBA::Boolean operator<< (
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ValueDef>::marshal (
+            TAO::Objref_Traits<CORBA::ValueDef>::tao_marshal (
                 _tao_sequence[i].in (), strm
               );
         }
@@ -4254,7 +4254,7 @@ CORBA::Boolean operator<< (
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal (
+            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_marshal (
                 _tao_sequence[i].in (), strm
               );
         }
@@ -4329,7 +4329,7 @@ CORBA::Boolean operator<< (
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal (
+            TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_marshal (
                 _tao_sequence[i].in (), strm
               );
         }
@@ -4404,7 +4404,7 @@ CORBA::Boolean operator<< (
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal (
+            TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_marshal (
                 _tao_sequence[i].in (), strm
               );
         }
@@ -4479,7 +4479,7 @@ CORBA::Boolean operator<< (
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtValueDef>::marshal (
+            TAO::Objref_Traits<CORBA::ExtValueDef>::tao_marshal (
                 _tao_sequence[i].in (), strm
               );
         }
@@ -4554,7 +4554,7 @@ CORBA::Boolean operator<< (
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal (
+            TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_marshal (
                 _tao_sequence[i].in (), strm
               );
         }
@@ -4629,7 +4629,7 @@ CORBA::Boolean operator<< (
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal (
+            TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_marshal (
                 _tao_sequence[i].in (), strm
               );
         }
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index c5f7c5e03bf..7df03151ae5 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -41,7 +41,6 @@
 
 #include "ifr_client_export.h"
 #include "tao/Environment.h"
-#include "tao/SystemException.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
 #include "tao/Any.h"
@@ -74,13 +73,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -90,22 +89,22 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:376
-
+  
   typedef char * ScopedName;
   typedef CORBA::String_var ScopedName_var;
   typedef CORBA::String_out ScopedName_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ScopedName;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum DefinitionKind
   {
     dk_none,
@@ -145,29 +144,29 @@ namespace CORBA
     dk_Uses,
     dk_Event
   };
-
+  
   typedef DefinitionKind &DefinitionKind_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DefinitionKind;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_IROBJECT__VAR_OUT_CH_)
 #define _CORBA_IROBJECT__VAR_OUT_CH_
-
+  
   class IRObject;
   typedef IRObject *IRObject_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         IRObject
       >
     IRObject_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         IRObject
@@ -175,13 +174,13 @@ namespace CORBA
     IRObject_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IROBJECT_CH_)
 #define _CORBA_IROBJECT_CH_
-
+  
   class TAO_IFR_Client_Export IRObject
     : public virtual CORBA::Object
   {
@@ -189,74 +188,74 @@ namespace CORBA
     friend class TAO::Narrow_Utils<IRObject>;
     typedef IRObject_ptr _ptr_type;
     typedef IRObject_var _var_type;
-
+    
     // The static operations.
     static IRObject_ptr _duplicate (IRObject_ptr obj);
-
+    
     static IRObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IRObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IRObject_ptr _nil (void)
     {
       return (IRObject_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     IRObject (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IRObject_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     IRObject (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     IRObject (
         TAO_Stub *objref,
@@ -264,50 +263,50 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~IRObject (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     IRObject (const IRObject &);
-
+    
     void operator= (const IRObject &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IRObject;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:376
-
+  
   typedef char * VersionSpec;
   typedef CORBA::String_var VersionSpec_var;
   typedef CORBA::String_out VersionSpec_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_VersionSpec;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_CONTAINED__VAR_OUT_CH_)
 #define _CORBA_CONTAINED__VAR_OUT_CH_
-
+  
   class Contained;
   typedef Contained *Contained_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Contained
       >
     Contained_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Contained
@@ -315,22 +314,22 @@ namespace CORBA
     Contained_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_)
 #define _CORBA_REPOSITORY__VAR_OUT_CH_
-
+  
   class Repository;
   typedef Repository *Repository_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Repository
       >
     Repository_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Repository
@@ -338,22 +337,22 @@ namespace CORBA
     Repository_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_CONTAINER__VAR_OUT_CH_)
 #define _CORBA_CONTAINER__VAR_OUT_CH_
-
+  
   class Container;
   typedef Container *Container_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Container
       >
     Container_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Container
@@ -361,13 +360,13 @@ namespace CORBA
     Container_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINED_CH_)
 #define _CORBA_CONTAINED_CH_
-
+  
   class TAO_IFR_Client_Export Contained
     : public virtual CORBA::IRObject
   {
@@ -375,40 +374,40 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Contained>;
     typedef Contained_ptr _ptr_type;
     typedef Contained_var _var_type;
-
+    
     // The static operations.
     static Contained_ptr _duplicate (Contained_ptr obj);
-
+    
     static Contained_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Contained_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Contained_ptr _nil (void)
     {
       return (Contained_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void id (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -416,20 +415,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void name (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -437,20 +436,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void version (
         const char * version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -458,85 +457,85 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-
+    
     struct Description;
-
+    
     typedef
       TAO_Var_Var_T<
           Description
         >
       Description_var;
-
+    
     typedef
       TAO_Out_T<
           Description,
           Description_var
         >
       Description_out;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:52
-
+    
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-
+      
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_Description;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void move (
         CORBA::Container_ptr new_container,
         const char * new_name,
@@ -546,34 +545,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Contained (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Contained_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Contained (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Contained (
         TAO_Stub *objref,
@@ -581,38 +580,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Contained (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Contained (const Contained &);
-
+    
     void operator= (const Contained &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Contained;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_)
 #define _CORBA_MODULEDEF__VAR_OUT_CH_
-
+  
   class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ModuleDef
       >
     ModuleDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ModuleDef
@@ -620,22 +619,22 @@ namespace CORBA
     ModuleDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_)
 #define _CORBA_CONSTANTDEF__VAR_OUT_CH_
-
+  
   class ConstantDef;
   typedef ConstantDef *ConstantDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ConstantDef
       >
     ConstantDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ConstantDef
@@ -643,22 +642,22 @@ namespace CORBA
     ConstantDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_IDLTYPE__VAR_OUT_CH_)
 #define _CORBA_IDLTYPE__VAR_OUT_CH_
-
+  
   class IDLType;
   typedef IDLType *IDLType_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         IDLType
       >
     IDLType_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         IDLType
@@ -666,22 +665,22 @@ namespace CORBA
     IDLType_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_)
 #define _CORBA_STRUCTDEF__VAR_OUT_CH_
-
+  
   class StructDef;
   typedef StructDef *StructDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         StructDef
       >
     StructDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         StructDef
@@ -689,22 +688,22 @@ namespace CORBA
     StructDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_)
 #define _CORBA_UNIONDEF__VAR_OUT_CH_
-
+  
   class UnionDef;
   typedef UnionDef *UnionDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         UnionDef
       >
     UnionDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         UnionDef
@@ -712,22 +711,22 @@ namespace CORBA
     UnionDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_)
 #define _CORBA_ENUMDEF__VAR_OUT_CH_
-
+  
   class EnumDef;
   typedef EnumDef *EnumDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         EnumDef
       >
     EnumDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         EnumDef
@@ -735,22 +734,22 @@ namespace CORBA
     EnumDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_)
 #define _CORBA_ALIASDEF__VAR_OUT_CH_
-
+  
   class AliasDef;
   typedef AliasDef *AliasDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         AliasDef
       >
     AliasDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         AliasDef
@@ -758,22 +757,22 @@ namespace CORBA
     AliasDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_INTERFACEDEF__VAR_OUT_CH_
-
+  
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         InterfaceDef
       >
     InterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         InterfaceDef
@@ -781,15 +780,15 @@ namespace CORBA
     InterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
 #define _CORBA_INTERFACEDEFSEQ_CH_
-
+  
   class InterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         InterfaceDefSeq,
@@ -799,7 +798,7 @@ namespace CORBA
           >
       >
     InterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         InterfaceDefSeq,
@@ -810,7 +809,7 @@ namespace CORBA
           >
       >
     InterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export InterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -824,39 +823,39 @@ namespace CORBA
     InterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        InterfaceDef_ptr* buffer,
+        InterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     InterfaceDefSeq (const InterfaceDefSeq &);
     ~InterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef InterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_)
 #define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_
-
+  
   class ExceptionDef;
   typedef ExceptionDef *ExceptionDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExceptionDef
       >
     ExceptionDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExceptionDef
@@ -864,22 +863,22 @@ namespace CORBA
     ExceptionDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_)
 #define _CORBA_NATIVEDEF__VAR_OUT_CH_
-
+  
   class NativeDef;
   typedef NativeDef *NativeDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         NativeDef
       >
     NativeDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         NativeDef
@@ -887,22 +886,22 @@ namespace CORBA
     NativeDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEDEF__VAR_OUT_CH_
-
+  
   class ValueDef;
   typedef ValueDef *ValueDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ValueDef
       >
     ValueDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ValueDef
@@ -910,15 +909,15 @@ namespace CORBA
     ValueDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_VALUEDEFSEQ_CH_)
 #define _CORBA_VALUEDEFSEQ_CH_
-
+  
   class ValueDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ValueDefSeq,
@@ -928,7 +927,7 @@ namespace CORBA
           >
       >
     ValueDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ValueDefSeq,
@@ -939,7 +938,7 @@ namespace CORBA
           >
       >
     ValueDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ValueDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -953,39 +952,39 @@ namespace CORBA
     ValueDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ValueDef_ptr* buffer,
+        ValueDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ValueDefSeq (const ValueDefSeq &);
     ~ValueDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ValueDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDefSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEBOXDEF__VAR_OUT_CH_
-
+  
   class ValueBoxDef;
   typedef ValueBoxDef *ValueBoxDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ValueBoxDef
       >
     ValueBoxDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ValueBoxDef
@@ -993,22 +992,22 @@ namespace CORBA
     ValueBoxDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_
-
+  
   class AbstractInterfaceDef;
   typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         AbstractInterfaceDef
       >
     AbstractInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         AbstractInterfaceDef
@@ -1016,15 +1015,15 @@ namespace CORBA
     AbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-
+  
   class AbstractInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         AbstractInterfaceDefSeq,
@@ -1034,7 +1033,7 @@ namespace CORBA
           >
       >
     AbstractInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         AbstractInterfaceDefSeq,
@@ -1045,7 +1044,7 @@ namespace CORBA
           >
       >
     AbstractInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export AbstractInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1059,39 +1058,39 @@ namespace CORBA
     AbstractInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        AbstractInterfaceDef_ptr* buffer,
+        AbstractInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &);
     ~AbstractInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef AbstractInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AbstractInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_
-
+  
   class LocalInterfaceDef;
   typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         LocalInterfaceDef
       >
     LocalInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         LocalInterfaceDef
@@ -1099,15 +1098,15 @@ namespace CORBA
     LocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ_CH_
-
+  
   class LocalInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         LocalInterfaceDefSeq,
@@ -1117,7 +1116,7 @@ namespace CORBA
           >
       >
     LocalInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         LocalInterfaceDefSeq,
@@ -1128,7 +1127,7 @@ namespace CORBA
           >
       >
     LocalInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export LocalInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1142,39 +1141,39 @@ namespace CORBA
     LocalInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        LocalInterfaceDef_ptr* buffer,
+        LocalInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     LocalInterfaceDefSeq (const LocalInterfaceDefSeq &);
     ~LocalInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef LocalInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LocalInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_
-
+  
   class ExtInterfaceDef;
   typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExtInterfaceDef
       >
     ExtInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExtInterfaceDef
@@ -1182,15 +1181,15 @@ namespace CORBA
     ExtInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTINTERFACEDEFSEQ_CH_
-
+  
   class ExtInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ExtInterfaceDefSeq,
@@ -1200,7 +1199,7 @@ namespace CORBA
           >
       >
     ExtInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ExtInterfaceDefSeq,
@@ -1211,7 +1210,7 @@ namespace CORBA
           >
       >
     ExtInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1225,39 +1224,39 @@ namespace CORBA
     ExtInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtInterfaceDef_ptr* buffer,
+        ExtInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ExtInterfaceDefSeq (const ExtInterfaceDefSeq &);
     ~ExtInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTVALUEDEF__VAR_OUT_CH_
-
+  
   class ExtValueDef;
   typedef ExtValueDef *ExtValueDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExtValueDef
       >
     ExtValueDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExtValueDef
@@ -1265,15 +1264,15 @@ namespace CORBA
     ExtValueDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTVALUEDEFSEQ_CH_)
 #define _CORBA_EXTVALUEDEFSEQ_CH_
-
+  
   class ExtValueDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ExtValueDefSeq,
@@ -1283,7 +1282,7 @@ namespace CORBA
           >
       >
     ExtValueDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ExtValueDefSeq,
@@ -1294,7 +1293,7 @@ namespace CORBA
           >
       >
     ExtValueDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtValueDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1308,39 +1307,39 @@ namespace CORBA
     ExtValueDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtValueDef_ptr* buffer,
+        ExtValueDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ExtValueDefSeq (const ExtValueDefSeq &);
     ~ExtValueDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtValueDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtValueDefSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_
-
+  
   class ExtAbstractInterfaceDef;
   typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExtAbstractInterfaceDef
       >
     ExtAbstractInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExtAbstractInterfaceDef
@@ -1348,15 +1347,15 @@ namespace CORBA
     ExtAbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_
-
+  
   class ExtAbstractInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ExtAbstractInterfaceDefSeq,
@@ -1366,7 +1365,7 @@ namespace CORBA
           >
       >
     ExtAbstractInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ExtAbstractInterfaceDefSeq,
@@ -1377,7 +1376,7 @@ namespace CORBA
           >
       >
     ExtAbstractInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1391,39 +1390,39 @@ namespace CORBA
     ExtAbstractInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtAbstractInterfaceDef_ptr* buffer,
+        ExtAbstractInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &);
     ~ExtAbstractInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtAbstractInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAbstractInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_
-
+  
   class ExtLocalInterfaceDef;
   typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExtLocalInterfaceDef
       >
     ExtLocalInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExtLocalInterfaceDef
@@ -1431,15 +1430,15 @@ namespace CORBA
     ExtLocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEFSEQ_CH_
-
+  
   class ExtLocalInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ExtLocalInterfaceDefSeq,
@@ -1449,7 +1448,7 @@ namespace CORBA
           >
       >
     ExtLocalInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ExtLocalInterfaceDefSeq,
@@ -1460,7 +1459,7 @@ namespace CORBA
           >
       >
     ExtLocalInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1474,32 +1473,32 @@ namespace CORBA
     ExtLocalInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtLocalInterfaceDef_ptr* buffer,
+        ExtLocalInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &);
     ~ExtLocalInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtLocalInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtLocalInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CONTAINEDSEQ_CH_)
 #define _CORBA_CONTAINEDSEQ_CH_
-
+  
   class ContainedSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ContainedSeq,
@@ -1509,7 +1508,7 @@ namespace CORBA
           >
       >
     ContainedSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ContainedSeq,
@@ -1520,7 +1519,7 @@ namespace CORBA
           >
       >
     ContainedSeq_out;
-
+  
   class TAO_IFR_Client_Export ContainedSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1534,75 +1533,75 @@ namespace CORBA
     ContainedSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        Contained_ptr* buffer,
+        Contained_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ContainedSeq (const ContainedSeq &);
     ~ContainedSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ContainedSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContainedSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct StructMember;
-
+  
   typedef
     TAO_Var_Var_T<
         StructMember
       >
     StructMember_var;
-
+  
   typedef
     TAO_Out_T<
         StructMember,
         StructMember_var
       >
     StructMember_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export StructMember
   {
     typedef StructMember_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMember;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
 #define _CORBA_STRUCTMEMBERSEQ_CH_
-
+  
   class StructMemberSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         StructMemberSeq,
         StructMember
       >
     StructMemberSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         StructMemberSeq,
@@ -1610,7 +1609,7 @@ namespace CORBA
         StructMember
       >
     StructMemberSeq_out;
-
+  
   class TAO_IFR_Client_Export StructMemberSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1623,74 +1622,74 @@ namespace CORBA
     StructMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        StructMember* buffer,
+        StructMember* buffer, 
         CORBA::Boolean release = 0
       );
     StructMemberSeq (const StructMemberSeq &);
     ~StructMemberSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef StructMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMemberSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct Initializer;
-
+  
   typedef
     TAO_Var_Var_T<
         Initializer
       >
     Initializer_var;
-
+  
   typedef
     TAO_Out_T<
         Initializer,
         Initializer_var
       >
     Initializer_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export Initializer
   {
     typedef Initializer_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     TAO_String_Manager name;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Initializer;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_INITIALIZERSEQ_CH_)
 #define _CORBA_INITIALIZERSEQ_CH_
-
+  
   class InitializerSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         InitializerSeq,
         Initializer
       >
     InitializerSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         InitializerSeq,
@@ -1698,7 +1697,7 @@ namespace CORBA
         Initializer
       >
     InitializerSeq_out;
-
+  
   class TAO_IFR_Client_Export InitializerSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1711,49 +1710,49 @@ namespace CORBA
     InitializerSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        Initializer* buffer,
+        Initializer* buffer, 
         CORBA::Boolean release = 0
       );
     InitializerSeq (const InitializerSeq &);
     ~InitializerSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef InitializerSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InitializerSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct ExceptionDescription;
-
+  
   typedef
     TAO_Var_Var_T<
         ExceptionDescription
       >
     ExceptionDescription_var;
-
+  
   typedef
     TAO_Out_T<
         ExceptionDescription,
         ExceptionDescription_var
       >
     ExceptionDescription_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export ExceptionDescription
   {
     typedef ExceptionDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -1761,27 +1760,27 @@ namespace CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDescription;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
 #define _CORBA_EXCDESCRIPTIONSEQ_CH_
-
+  
   class ExcDescriptionSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ExcDescriptionSeq,
         ExceptionDescription
       >
     ExcDescriptionSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ExcDescriptionSeq,
@@ -1789,7 +1788,7 @@ namespace CORBA
         ExceptionDescription
       >
     ExcDescriptionSeq_out;
-
+  
   class TAO_IFR_Client_Export ExcDescriptionSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1802,75 +1801,75 @@ namespace CORBA
     ExcDescriptionSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExceptionDescription* buffer,
+        ExceptionDescription* buffer, 
         CORBA::Boolean release = 0
       );
     ExcDescriptionSeq (const ExcDescriptionSeq &);
     ~ExcDescriptionSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExcDescriptionSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct ExtInitializer;
-
+  
   typedef
     TAO_Var_Var_T<
         ExtInitializer
       >
     ExtInitializer_var;
-
+  
   typedef
     TAO_Out_T<
         ExtInitializer,
         ExtInitializer_var
       >
     ExtInitializer_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export ExtInitializer
   {
     typedef ExtInitializer_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     CORBA::ExcDescriptionSeq exceptions;
     TAO_String_Manager name;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInitializer;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ_CH_)
 #define _CORBA_EXTINITIALIZERSEQ_CH_
-
+  
   class ExtInitializerSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ExtInitializerSeq,
         ExtInitializer
       >
     ExtInitializerSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ExtInitializerSeq,
@@ -1878,7 +1877,7 @@ namespace CORBA
         ExtInitializer
       >
     ExtInitializerSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtInitializerSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1891,76 +1890,76 @@ namespace CORBA
     ExtInitializerSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtInitializer* buffer,
+        ExtInitializer* buffer, 
         CORBA::Boolean release = 0
       );
     ExtInitializerSeq (const ExtInitializerSeq &);
     ~ExtInitializerSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtInitializerSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInitializerSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct UnionMember;
-
+  
   typedef
     TAO_Var_Var_T<
         UnionMember
       >
     UnionMember_var;
-
+  
   typedef
     TAO_Out_T<
         UnionMember,
         UnionMember_var
       >
     UnionMember_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export UnionMember
   {
     typedef UnionMember_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::Any label;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMember;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
 #define _CORBA_UNIONMEMBERSEQ_CH_
-
+  
   class UnionMemberSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         UnionMemberSeq,
         UnionMember
       >
     UnionMemberSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         UnionMemberSeq,
@@ -1968,7 +1967,7 @@ namespace CORBA
         UnionMember
       >
     UnionMemberSeq_out;
-
+  
   class TAO_IFR_Client_Export UnionMemberSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1981,39 +1980,39 @@ namespace CORBA
     UnionMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        UnionMember* buffer,
+        UnionMember* buffer, 
         CORBA::Boolean release = 0
       );
     UnionMemberSeq (const UnionMemberSeq &);
     ~UnionMemberSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef UnionMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMemberSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
 #define _CORBA_ENUMMEMBERSEQ_CH_
-
+  
   class EnumMemberSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         EnumMemberSeq,
         TAO_SeqElem_String_Manager
       >
     EnumMemberSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         EnumMemberSeq,
@@ -2021,7 +2020,7 @@ namespace CORBA
         TAO_SeqElem_String_Manager
       >
     EnumMemberSeq_out;
-
+  
   class TAO_IFR_Client_Export EnumMemberSeq
     : public
         TAO_Unbounded_String_Sequence
@@ -2032,30 +2031,30 @@ namespace CORBA
     EnumMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer,
+        char ** buffer, 
         CORBA::Boolean release = 0
       );
     EnumMemberSeq (const EnumMemberSeq &);
     ~EnumMemberSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef EnumMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnumMemberSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINER_CH_)
 #define _CORBA_CONTAINER_CH_
-
+  
   class TAO_IFR_Client_Export Container
     : public virtual CORBA::IRObject
   {
@@ -2063,30 +2062,30 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Container>;
     typedef Container_ptr _ptr_type;
     typedef Container_var _var_type;
-
+    
     // The static operations.
     static Container_ptr _duplicate (Container_ptr obj);
-
+    
     static Container_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Container_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Container_ptr _nil (void)
     {
       return (Container_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2094,10 +2093,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited
@@ -2106,10 +2105,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
         CORBA::Long levels_to_search,
@@ -2120,58 +2119,58 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-
+    
     struct Description;
-
+    
     typedef
       TAO_Var_Var_T<
           Description
         >
       Description_var;
-
+    
     typedef
       TAO_Out_T<
           Description,
           Description_var
         >
       Description_out;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:52
-
+    
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-
+      
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, Contained_var) contained_object;
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_Description;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-
+    
     class DescriptionSeq;
-
+    
     typedef
       TAO_VarSeq_Var_T<
           DescriptionSeq,
           Description
         >
       DescriptionSeq_var;
-
+    
     typedef
       TAO_Seq_Out_T<
           DescriptionSeq,
@@ -2179,7 +2178,7 @@ namespace CORBA
           Description
         >
       DescriptionSeq_out;
-
+    
     class TAO_IFR_Client_Export DescriptionSeq
       : public
           TAO_Unbounded_Sequence<
@@ -2192,27 +2191,27 @@ namespace CORBA
       DescriptionSeq (
           CORBA::ULong max,
           CORBA::ULong length,
-          Description* buffer,
+          Description* buffer, 
           CORBA::Boolean release = 0
         );
       DescriptionSeq (const DescriptionSeq &);
       ~DescriptionSeq (void);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       typedef DescriptionSeq_var _var_type;
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_DescriptionSeq;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
@@ -2222,10 +2221,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ModuleDef_ptr create_module (
         const char * id,
         const char * name,
@@ -2235,10 +2234,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
@@ -2250,10 +2249,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
@@ -2264,10 +2263,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
@@ -2279,10 +2278,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
@@ -2293,10 +2292,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
@@ -2307,10 +2306,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
@@ -2321,10 +2320,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -2341,10 +2340,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
@@ -2355,10 +2354,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
@@ -2369,10 +2368,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::NativeDef_ptr create_native (
         const char * id,
         const char * name,
@@ -2382,10 +2381,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
@@ -2396,10 +2395,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
@@ -2410,10 +2409,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
@@ -2430,34 +2429,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Container (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Container_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Container (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Container (
         TAO_Stub *objref,
@@ -2465,29 +2464,29 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Container (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Container (const Container &);
-
+    
     void operator= (const Container &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Container;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IDLTYPE_CH_)
 #define _CORBA_IDLTYPE_CH_
-
+  
   class TAO_IFR_Client_Export IDLType
     : public virtual CORBA::IRObject
   {
@@ -2495,64 +2494,64 @@ namespace CORBA
     friend class TAO::Narrow_Utils<IDLType>;
     typedef IDLType_ptr _ptr_type;
     typedef IDLType_var _var_type;
-
+    
     // The static operations.
     static IDLType_ptr _duplicate (IDLType_ptr obj);
-
+    
     static IDLType_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IDLType_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IDLType_ptr _nil (void)
     {
       return (IDLType_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     IDLType (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IDLType_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     IDLType (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     IDLType (
         TAO_Stub *objref,
@@ -2560,38 +2559,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~IDLType (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     IDLType (const IDLType &);
-
+    
     void operator= (const IDLType &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDLType;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_TYPEDEFDEF__VAR_OUT_CH_)
 #define _CORBA_TYPEDEFDEF__VAR_OUT_CH_
-
+  
   class TypedefDef;
   typedef TypedefDef *TypedefDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TypedefDef
       >
     TypedefDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TypedefDef
@@ -2599,13 +2598,13 @@ namespace CORBA
     TypedefDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPEDEFDEF_CH_)
 #define _CORBA_TYPEDEFDEF_CH_
-
+  
   class TAO_IFR_Client_Export TypedefDef
     : public virtual CORBA::Contained,
       public virtual CORBA::IDLType
@@ -2614,54 +2613,54 @@ namespace CORBA
     friend class TAO::Narrow_Utils<TypedefDef>;
     typedef TypedefDef_ptr _ptr_type;
     typedef TypedefDef_var _var_type;
-
+    
     // The static operations.
     static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
-
+    
     static TypedefDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypedefDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypedefDef_ptr _nil (void)
     {
       return (TypedefDef_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     TypedefDef (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_TypedefDef_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     TypedefDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     TypedefDef (
         TAO_Stub *objref,
@@ -2669,48 +2668,48 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~TypedefDef (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TypedefDef (const TypedefDef &);
-
+    
     void operator= (const TypedefDef &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypedefDef;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct TypeDescription;
-
+  
   typedef
     TAO_Var_Var_T<
         TypeDescription
       >
     TypeDescription_var;
-
+  
   typedef
     TAO_Out_T<
         TypeDescription,
         TypeDescription_var
       >
     TypeDescription_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export TypeDescription
   {
     typedef TypeDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -2718,10 +2717,10 @@ namespace CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeDescription;
 
 // TAO_IDL - Generated from
@@ -2773,18 +2772,18 @@ namespace TAO
 
 #if !defined (_CORBA_IROBJECT__TRAITS_CH_)
 #define _CORBA_IROBJECT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::IRObject>
   {
-    static CORBA::IRObject_ptr duplicate (
+    static CORBA::IRObject_ptr tao_duplicate (
         CORBA::IRObject_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::IRObject_ptr
       );
-    static CORBA::IRObject_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::IRObject_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::IRObject_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2794,18 +2793,18 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINED__TRAITS_CH_)
 #define _CORBA_CONTAINED__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::Contained>
   {
-    static CORBA::Contained_ptr duplicate (
+    static CORBA::Contained_ptr tao_duplicate (
         CORBA::Contained_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::Contained_ptr
       );
-    static CORBA::Contained_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::Contained_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::Contained_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2815,18 +2814,18 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__TRAITS_CH_)
 #define _CORBA_REPOSITORY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::Repository>
   {
-    static CORBA::Repository_ptr duplicate (
+    static CORBA::Repository_ptr tao_duplicate (
         CORBA::Repository_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::Repository_ptr
       );
-    static CORBA::Repository_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::Repository_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::Repository_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2836,18 +2835,18 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__TRAITS_CH_)
 #define _CORBA_CONTAINER__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::Container>
   {
-    static CORBA::Container_ptr duplicate (
+    static CORBA::Container_ptr tao_duplicate (
         CORBA::Container_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::Container_ptr
       );
-    static CORBA::Container_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::Container_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::Container_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2857,18 +2856,18 @@ namespace TAO
 
 #if !defined (_CORBA_MODULEDEF__TRAITS_CH_)
 #define _CORBA_MODULEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ModuleDef>
   {
-    static CORBA::ModuleDef_ptr duplicate (
+    static CORBA::ModuleDef_ptr tao_duplicate (
         CORBA::ModuleDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ModuleDef_ptr
       );
-    static CORBA::ModuleDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ModuleDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ModuleDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2878,18 +2877,18 @@ namespace TAO
 
 #if !defined (_CORBA_CONSTANTDEF__TRAITS_CH_)
 #define _CORBA_CONSTANTDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ConstantDef>
   {
-    static CORBA::ConstantDef_ptr duplicate (
+    static CORBA::ConstantDef_ptr tao_duplicate (
         CORBA::ConstantDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ConstantDef_ptr
       );
-    static CORBA::ConstantDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ConstantDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ConstantDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2899,18 +2898,18 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__TRAITS_CH_)
 #define _CORBA_IDLTYPE__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::IDLType>
   {
-    static CORBA::IDLType_ptr duplicate (
+    static CORBA::IDLType_ptr tao_duplicate (
         CORBA::IDLType_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::IDLType_ptr
       );
-    static CORBA::IDLType_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::IDLType_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::IDLType_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2920,18 +2919,18 @@ namespace TAO
 
 #if !defined (_CORBA_STRUCTDEF__TRAITS_CH_)
 #define _CORBA_STRUCTDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::StructDef>
   {
-    static CORBA::StructDef_ptr duplicate (
+    static CORBA::StructDef_ptr tao_duplicate (
         CORBA::StructDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::StructDef_ptr
       );
-    static CORBA::StructDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::StructDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::StructDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2941,18 +2940,18 @@ namespace TAO
 
 #if !defined (_CORBA_UNIONDEF__TRAITS_CH_)
 #define _CORBA_UNIONDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::UnionDef>
   {
-    static CORBA::UnionDef_ptr duplicate (
+    static CORBA::UnionDef_ptr tao_duplicate (
         CORBA::UnionDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::UnionDef_ptr
       );
-    static CORBA::UnionDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::UnionDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::UnionDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2962,18 +2961,18 @@ namespace TAO
 
 #if !defined (_CORBA_ENUMDEF__TRAITS_CH_)
 #define _CORBA_ENUMDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::EnumDef>
   {
-    static CORBA::EnumDef_ptr duplicate (
+    static CORBA::EnumDef_ptr tao_duplicate (
         CORBA::EnumDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::EnumDef_ptr
       );
-    static CORBA::EnumDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::EnumDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::EnumDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2983,18 +2982,18 @@ namespace TAO
 
 #if !defined (_CORBA_ALIASDEF__TRAITS_CH_)
 #define _CORBA_ALIASDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::AliasDef>
   {
-    static CORBA::AliasDef_ptr duplicate (
+    static CORBA::AliasDef_ptr tao_duplicate (
         CORBA::AliasDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::AliasDef_ptr
       );
-    static CORBA::AliasDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::AliasDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::AliasDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3004,18 +3003,18 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__TRAITS_CH_)
 #define _CORBA_INTERFACEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceDef>
   {
-    static CORBA::InterfaceDef_ptr duplicate (
+    static CORBA::InterfaceDef_ptr tao_duplicate (
         CORBA::InterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::InterfaceDef_ptr
       );
-    static CORBA::InterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::InterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::InterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3025,18 +3024,18 @@ namespace TAO
 
 #if !defined (_CORBA_EXCEPTIONDEF__TRAITS_CH_)
 #define _CORBA_EXCEPTIONDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExceptionDef>
   {
-    static CORBA::ExceptionDef_ptr duplicate (
+    static CORBA::ExceptionDef_ptr tao_duplicate (
         CORBA::ExceptionDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExceptionDef_ptr
       );
-    static CORBA::ExceptionDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExceptionDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExceptionDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3046,18 +3045,18 @@ namespace TAO
 
 #if !defined (_CORBA_NATIVEDEF__TRAITS_CH_)
 #define _CORBA_NATIVEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::NativeDef>
   {
-    static CORBA::NativeDef_ptr duplicate (
+    static CORBA::NativeDef_ptr tao_duplicate (
         CORBA::NativeDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::NativeDef_ptr
       );
-    static CORBA::NativeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::NativeDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::NativeDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3067,18 +3066,18 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEDEF__TRAITS_CH_)
 #define _CORBA_VALUEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueDef>
   {
-    static CORBA::ValueDef_ptr duplicate (
+    static CORBA::ValueDef_ptr tao_duplicate (
         CORBA::ValueDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ValueDef_ptr
       );
-    static CORBA::ValueDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ValueDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3088,18 +3087,18 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEBOXDEF__TRAITS_CH_)
 #define _CORBA_VALUEBOXDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueBoxDef>
   {
-    static CORBA::ValueBoxDef_ptr duplicate (
+    static CORBA::ValueBoxDef_ptr tao_duplicate (
         CORBA::ValueBoxDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ValueBoxDef_ptr
       );
-    static CORBA::ValueBoxDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ValueBoxDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ValueBoxDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3109,18 +3108,18 @@ namespace TAO
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::AbstractInterfaceDef>
   {
-    static CORBA::AbstractInterfaceDef_ptr duplicate (
+    static CORBA::AbstractInterfaceDef_ptr tao_duplicate (
         CORBA::AbstractInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::AbstractInterfaceDef_ptr
       );
-    static CORBA::AbstractInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::AbstractInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::AbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3130,18 +3129,18 @@ namespace TAO
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_CH_)
 #define _CORBA_LOCALINTERFACEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::LocalInterfaceDef>
   {
-    static CORBA::LocalInterfaceDef_ptr duplicate (
+    static CORBA::LocalInterfaceDef_ptr tao_duplicate (
         CORBA::LocalInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::LocalInterfaceDef_ptr
       );
-    static CORBA::LocalInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::LocalInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::LocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3151,18 +3150,18 @@ namespace TAO
 
 #if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_CH_)
 #define _CORBA_EXTINTERFACEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtInterfaceDef>
   {
-    static CORBA::ExtInterfaceDef_ptr duplicate (
+    static CORBA::ExtInterfaceDef_ptr tao_duplicate (
         CORBA::ExtInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExtInterfaceDef_ptr
       );
-    static CORBA::ExtInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExtInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExtInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3172,18 +3171,18 @@ namespace TAO
 
 #if !defined (_CORBA_EXTVALUEDEF__TRAITS_CH_)
 #define _CORBA_EXTVALUEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtValueDef>
   {
-    static CORBA::ExtValueDef_ptr duplicate (
+    static CORBA::ExtValueDef_ptr tao_duplicate (
         CORBA::ExtValueDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExtValueDef_ptr
       );
-    static CORBA::ExtValueDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExtValueDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExtValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3193,18 +3192,18 @@ namespace TAO
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAbstractInterfaceDef>
   {
-    static CORBA::ExtAbstractInterfaceDef_ptr duplicate (
+    static CORBA::ExtAbstractInterfaceDef_ptr tao_duplicate (
         CORBA::ExtAbstractInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExtAbstractInterfaceDef_ptr
       );
-    static CORBA::ExtAbstractInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExtAbstractInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExtAbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3214,18 +3213,18 @@ namespace TAO
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtLocalInterfaceDef>
   {
-    static CORBA::ExtLocalInterfaceDef_ptr duplicate (
+    static CORBA::ExtLocalInterfaceDef_ptr tao_duplicate (
         CORBA::ExtLocalInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExtLocalInterfaceDef_ptr
       );
-    static CORBA::ExtLocalInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExtLocalInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExtLocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3235,18 +3234,18 @@ namespace TAO
 
 #if !defined (_CORBA_TYPEDEFDEF__TRAITS_CH_)
 #define _CORBA_TYPEDEFDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::TypedefDef>
   {
-    static CORBA::TypedefDef_ptr duplicate (
+    static CORBA::TypedefDef_ptr tao_duplicate (
         CORBA::TypedefDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::TypedefDef_ptr
       );
-    static CORBA::TypedefDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::TypedefDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::TypedefDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4114,3 +4113,4 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index b1b8ba7ad3e..b3dbdb30acc 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -658,7 +658,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Repository_ptr
-TAO::Objref_Traits<CORBA::Repository>::duplicate (
+TAO::Objref_Traits<CORBA::Repository>::tao_duplicate (
     CORBA::Repository_ptr p
   )
 {
@@ -667,7 +667,7 @@ TAO::Objref_Traits<CORBA::Repository>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::Repository>::release (
+TAO::Objref_Traits<CORBA::Repository>::tao_release (
     CORBA::Repository_ptr p
   )
 {
@@ -676,14 +676,14 @@ TAO::Objref_Traits<CORBA::Repository>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Repository_ptr
-TAO::Objref_Traits<CORBA::Repository>::nil (void)
+TAO::Objref_Traits<CORBA::Repository>::tao_nil (void)
 {
   return CORBA::Repository::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::Repository>::marshal (
+TAO::Objref_Traits<CORBA::Repository>::tao_marshal (
     CORBA::Repository_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1190,7 +1190,7 @@ CORBA::Repository::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ModuleDef_ptr
-TAO::Objref_Traits<CORBA::ModuleDef>::duplicate (
+TAO::Objref_Traits<CORBA::ModuleDef>::tao_duplicate (
     CORBA::ModuleDef_ptr p
   )
 {
@@ -1199,7 +1199,7 @@ TAO::Objref_Traits<CORBA::ModuleDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ModuleDef>::release (
+TAO::Objref_Traits<CORBA::ModuleDef>::tao_release (
     CORBA::ModuleDef_ptr p
   )
 {
@@ -1208,14 +1208,14 @@ TAO::Objref_Traits<CORBA::ModuleDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ModuleDef_ptr
-TAO::Objref_Traits<CORBA::ModuleDef>::nil (void)
+TAO::Objref_Traits<CORBA::ModuleDef>::tao_nil (void)
 {
   return CORBA::ModuleDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ModuleDef>::marshal (
+TAO::Objref_Traits<CORBA::ModuleDef>::tao_marshal (
     CORBA::ModuleDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1371,7 +1371,7 @@ CORBA::ModuleDescription::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ConstantDef_ptr
-TAO::Objref_Traits<CORBA::ConstantDef>::duplicate (
+TAO::Objref_Traits<CORBA::ConstantDef>::tao_duplicate (
     CORBA::ConstantDef_ptr p
   )
 {
@@ -1380,7 +1380,7 @@ TAO::Objref_Traits<CORBA::ConstantDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ConstantDef>::release (
+TAO::Objref_Traits<CORBA::ConstantDef>::tao_release (
     CORBA::ConstantDef_ptr p
   )
 {
@@ -1389,14 +1389,14 @@ TAO::Objref_Traits<CORBA::ConstantDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ConstantDef_ptr
-TAO::Objref_Traits<CORBA::ConstantDef>::nil (void)
+TAO::Objref_Traits<CORBA::ConstantDef>::tao_nil (void)
 {
   return CORBA::ConstantDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ConstantDef>::marshal (
+TAO::Objref_Traits<CORBA::ConstantDef>::tao_marshal (
     CORBA::ConstantDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1759,7 +1759,7 @@ CORBA::ConstantDescription::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::StructDef_ptr
-TAO::Objref_Traits<CORBA::StructDef>::duplicate (
+TAO::Objref_Traits<CORBA::StructDef>::tao_duplicate (
     CORBA::StructDef_ptr p
   )
 {
@@ -1768,7 +1768,7 @@ TAO::Objref_Traits<CORBA::StructDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::StructDef>::release (
+TAO::Objref_Traits<CORBA::StructDef>::tao_release (
     CORBA::StructDef_ptr p
   )
 {
@@ -1777,14 +1777,14 @@ TAO::Objref_Traits<CORBA::StructDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::StructDef_ptr
-TAO::Objref_Traits<CORBA::StructDef>::nil (void)
+TAO::Objref_Traits<CORBA::StructDef>::tao_nil (void)
 {
   return CORBA::StructDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::StructDef>::marshal (
+TAO::Objref_Traits<CORBA::StructDef>::tao_marshal (
     CORBA::StructDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2020,7 +2020,7 @@ CORBA::StructDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::UnionDef_ptr
-TAO::Objref_Traits<CORBA::UnionDef>::duplicate (
+TAO::Objref_Traits<CORBA::UnionDef>::tao_duplicate (
     CORBA::UnionDef_ptr p
   )
 {
@@ -2029,7 +2029,7 @@ TAO::Objref_Traits<CORBA::UnionDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::UnionDef>::release (
+TAO::Objref_Traits<CORBA::UnionDef>::tao_release (
     CORBA::UnionDef_ptr p
   )
 {
@@ -2038,14 +2038,14 @@ TAO::Objref_Traits<CORBA::UnionDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::UnionDef_ptr
-TAO::Objref_Traits<CORBA::UnionDef>::nil (void)
+TAO::Objref_Traits<CORBA::UnionDef>::tao_nil (void)
 {
   return CORBA::UnionDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::UnionDef>::marshal (
+TAO::Objref_Traits<CORBA::UnionDef>::tao_marshal (
     CORBA::UnionDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2408,7 +2408,7 @@ CORBA::UnionDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::EnumDef_ptr
-TAO::Objref_Traits<CORBA::EnumDef>::duplicate (
+TAO::Objref_Traits<CORBA::EnumDef>::tao_duplicate (
     CORBA::EnumDef_ptr p
   )
 {
@@ -2417,7 +2417,7 @@ TAO::Objref_Traits<CORBA::EnumDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::EnumDef>::release (
+TAO::Objref_Traits<CORBA::EnumDef>::tao_release (
     CORBA::EnumDef_ptr p
   )
 {
@@ -2426,14 +2426,14 @@ TAO::Objref_Traits<CORBA::EnumDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::EnumDef_ptr
-TAO::Objref_Traits<CORBA::EnumDef>::nil (void)
+TAO::Objref_Traits<CORBA::EnumDef>::tao_nil (void)
 {
   return CORBA::EnumDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::EnumDef>::marshal (
+TAO::Objref_Traits<CORBA::EnumDef>::tao_marshal (
     CORBA::EnumDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2664,7 +2664,7 @@ CORBA::EnumDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::AliasDef_ptr
-TAO::Objref_Traits<CORBA::AliasDef>::duplicate (
+TAO::Objref_Traits<CORBA::AliasDef>::tao_duplicate (
     CORBA::AliasDef_ptr p
   )
 {
@@ -2673,7 +2673,7 @@ TAO::Objref_Traits<CORBA::AliasDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::AliasDef>::release (
+TAO::Objref_Traits<CORBA::AliasDef>::tao_release (
     CORBA::AliasDef_ptr p
   )
 {
@@ -2682,14 +2682,14 @@ TAO::Objref_Traits<CORBA::AliasDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::AliasDef_ptr
-TAO::Objref_Traits<CORBA::AliasDef>::nil (void)
+TAO::Objref_Traits<CORBA::AliasDef>::tao_nil (void)
 {
   return CORBA::AliasDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::AliasDef>::marshal (
+TAO::Objref_Traits<CORBA::AliasDef>::tao_marshal (
     CORBA::AliasDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2920,7 +2920,7 @@ CORBA::AliasDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::NativeDef_ptr
-TAO::Objref_Traits<CORBA::NativeDef>::duplicate (
+TAO::Objref_Traits<CORBA::NativeDef>::tao_duplicate (
     CORBA::NativeDef_ptr p
   )
 {
@@ -2929,7 +2929,7 @@ TAO::Objref_Traits<CORBA::NativeDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::NativeDef>::release (
+TAO::Objref_Traits<CORBA::NativeDef>::tao_release (
     CORBA::NativeDef_ptr p
   )
 {
@@ -2938,14 +2938,14 @@ TAO::Objref_Traits<CORBA::NativeDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::NativeDef_ptr
-TAO::Objref_Traits<CORBA::NativeDef>::nil (void)
+TAO::Objref_Traits<CORBA::NativeDef>::tao_nil (void)
 {
   return CORBA::NativeDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::NativeDef>::marshal (
+TAO::Objref_Traits<CORBA::NativeDef>::tao_marshal (
     CORBA::NativeDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3091,7 +3091,7 @@ CORBA::NativeDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::PrimitiveDef_ptr
-TAO::Objref_Traits<CORBA::PrimitiveDef>::duplicate (
+TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_duplicate (
     CORBA::PrimitiveDef_ptr p
   )
 {
@@ -3100,7 +3100,7 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::PrimitiveDef>::release (
+TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_release (
     CORBA::PrimitiveDef_ptr p
   )
 {
@@ -3109,14 +3109,14 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::PrimitiveDef_ptr
-TAO::Objref_Traits<CORBA::PrimitiveDef>::nil (void)
+TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_nil (void)
 {
   return CORBA::PrimitiveDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::PrimitiveDef>::marshal (
+TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_marshal (
     CORBA::PrimitiveDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3296,7 +3296,7 @@ CORBA::PrimitiveDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::StringDef_ptr
-TAO::Objref_Traits<CORBA::StringDef>::duplicate (
+TAO::Objref_Traits<CORBA::StringDef>::tao_duplicate (
     CORBA::StringDef_ptr p
   )
 {
@@ -3305,7 +3305,7 @@ TAO::Objref_Traits<CORBA::StringDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::StringDef>::release (
+TAO::Objref_Traits<CORBA::StringDef>::tao_release (
     CORBA::StringDef_ptr p
   )
 {
@@ -3314,14 +3314,14 @@ TAO::Objref_Traits<CORBA::StringDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::StringDef_ptr
-TAO::Objref_Traits<CORBA::StringDef>::nil (void)
+TAO::Objref_Traits<CORBA::StringDef>::tao_nil (void)
 {
   return CORBA::StringDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::StringDef>::marshal (
+TAO::Objref_Traits<CORBA::StringDef>::tao_marshal (
     CORBA::StringDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3544,7 +3544,7 @@ CORBA::StringDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::WstringDef_ptr
-TAO::Objref_Traits<CORBA::WstringDef>::duplicate (
+TAO::Objref_Traits<CORBA::WstringDef>::tao_duplicate (
     CORBA::WstringDef_ptr p
   )
 {
@@ -3553,7 +3553,7 @@ TAO::Objref_Traits<CORBA::WstringDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::WstringDef>::release (
+TAO::Objref_Traits<CORBA::WstringDef>::tao_release (
     CORBA::WstringDef_ptr p
   )
 {
@@ -3562,14 +3562,14 @@ TAO::Objref_Traits<CORBA::WstringDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::WstringDef_ptr
-TAO::Objref_Traits<CORBA::WstringDef>::nil (void)
+TAO::Objref_Traits<CORBA::WstringDef>::tao_nil (void)
 {
   return CORBA::WstringDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::WstringDef>::marshal (
+TAO::Objref_Traits<CORBA::WstringDef>::tao_marshal (
     CORBA::WstringDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3792,7 +3792,7 @@ CORBA::WstringDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::SequenceDef_ptr
-TAO::Objref_Traits<CORBA::SequenceDef>::duplicate (
+TAO::Objref_Traits<CORBA::SequenceDef>::tao_duplicate (
     CORBA::SequenceDef_ptr p
   )
 {
@@ -3801,7 +3801,7 @@ TAO::Objref_Traits<CORBA::SequenceDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::SequenceDef>::release (
+TAO::Objref_Traits<CORBA::SequenceDef>::tao_release (
     CORBA::SequenceDef_ptr p
   )
 {
@@ -3810,14 +3810,14 @@ TAO::Objref_Traits<CORBA::SequenceDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::SequenceDef_ptr
-TAO::Objref_Traits<CORBA::SequenceDef>::nil (void)
+TAO::Objref_Traits<CORBA::SequenceDef>::tao_nil (void)
 {
   return CORBA::SequenceDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::SequenceDef>::marshal (
+TAO::Objref_Traits<CORBA::SequenceDef>::tao_marshal (
     CORBA::SequenceDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -4167,7 +4167,7 @@ CORBA::SequenceDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ArrayDef_ptr
-TAO::Objref_Traits<CORBA::ArrayDef>::duplicate (
+TAO::Objref_Traits<CORBA::ArrayDef>::tao_duplicate (
     CORBA::ArrayDef_ptr p
   )
 {
@@ -4176,7 +4176,7 @@ TAO::Objref_Traits<CORBA::ArrayDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ArrayDef>::release (
+TAO::Objref_Traits<CORBA::ArrayDef>::tao_release (
     CORBA::ArrayDef_ptr p
   )
 {
@@ -4185,14 +4185,14 @@ TAO::Objref_Traits<CORBA::ArrayDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ArrayDef_ptr
-TAO::Objref_Traits<CORBA::ArrayDef>::nil (void)
+TAO::Objref_Traits<CORBA::ArrayDef>::tao_nil (void)
 {
   return CORBA::ArrayDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ArrayDef>::marshal (
+TAO::Objref_Traits<CORBA::ArrayDef>::tao_marshal (
     CORBA::ArrayDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -4542,7 +4542,7 @@ CORBA::ArrayDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExceptionDef_ptr
-TAO::Objref_Traits<CORBA::ExceptionDef>::duplicate (
+TAO::Objref_Traits<CORBA::ExceptionDef>::tao_duplicate (
     CORBA::ExceptionDef_ptr p
   )
 {
@@ -4551,7 +4551,7 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ExceptionDef>::release (
+TAO::Objref_Traits<CORBA::ExceptionDef>::tao_release (
     CORBA::ExceptionDef_ptr p
   )
 {
@@ -4560,14 +4560,14 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExceptionDef_ptr
-TAO::Objref_Traits<CORBA::ExceptionDef>::nil (void)
+TAO::Objref_Traits<CORBA::ExceptionDef>::tao_nil (void)
 {
   return CORBA::ExceptionDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExceptionDef>::marshal (
+TAO::Objref_Traits<CORBA::ExceptionDef>::tao_marshal (
     CORBA::ExceptionDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -4893,7 +4893,7 @@ void CORBA::ExceptionDefSeq::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::AttributeDef_ptr
-TAO::Objref_Traits<CORBA::AttributeDef>::duplicate (
+TAO::Objref_Traits<CORBA::AttributeDef>::tao_duplicate (
     CORBA::AttributeDef_ptr p
   )
 {
@@ -4902,7 +4902,7 @@ TAO::Objref_Traits<CORBA::AttributeDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::AttributeDef>::release (
+TAO::Objref_Traits<CORBA::AttributeDef>::tao_release (
     CORBA::AttributeDef_ptr p
   )
 {
@@ -4911,14 +4911,14 @@ TAO::Objref_Traits<CORBA::AttributeDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::AttributeDef_ptr
-TAO::Objref_Traits<CORBA::AttributeDef>::nil (void)
+TAO::Objref_Traits<CORBA::AttributeDef>::tao_nil (void)
 {
   return CORBA::AttributeDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::AttributeDef>::marshal (
+TAO::Objref_Traits<CORBA::AttributeDef>::tao_marshal (
     CORBA::AttributeDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -5294,7 +5294,7 @@ CORBA::ExtAttributeDescription::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtAttributeDef_ptr
-TAO::Objref_Traits<CORBA::ExtAttributeDef>::duplicate (
+TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_duplicate (
     CORBA::ExtAttributeDef_ptr p
   )
 {
@@ -5303,7 +5303,7 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ExtAttributeDef>::release (
+TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_release (
     CORBA::ExtAttributeDef_ptr p
   )
 {
@@ -5312,14 +5312,14 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtAttributeDef_ptr
-TAO::Objref_Traits<CORBA::ExtAttributeDef>::nil (void)
+TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_nil (void)
 {
   return CORBA::ExtAttributeDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtAttributeDef>::marshal (
+TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_marshal (
     CORBA::ExtAttributeDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -5786,7 +5786,7 @@ void CORBA::ContextIdSeq::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::OperationDef_ptr
-TAO::Objref_Traits<CORBA::OperationDef>::duplicate (
+TAO::Objref_Traits<CORBA::OperationDef>::tao_duplicate (
     CORBA::OperationDef_ptr p
   )
 {
@@ -5795,7 +5795,7 @@ TAO::Objref_Traits<CORBA::OperationDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::OperationDef>::release (
+TAO::Objref_Traits<CORBA::OperationDef>::tao_release (
     CORBA::OperationDef_ptr p
   )
 {
@@ -5804,14 +5804,14 @@ TAO::Objref_Traits<CORBA::OperationDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::OperationDef_ptr
-TAO::Objref_Traits<CORBA::OperationDef>::nil (void)
+TAO::Objref_Traits<CORBA::OperationDef>::tao_nil (void)
 {
   return CORBA::OperationDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::OperationDef>::marshal (
+TAO::Objref_Traits<CORBA::OperationDef>::tao_marshal (
     CORBA::OperationDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -6635,7 +6635,7 @@ void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::InterfaceDef_ptr
-TAO::Objref_Traits<CORBA::InterfaceDef>::duplicate (
+TAO::Objref_Traits<CORBA::InterfaceDef>::tao_duplicate (
     CORBA::InterfaceDef_ptr p
   )
 {
@@ -6644,7 +6644,7 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::InterfaceDef>::release (
+TAO::Objref_Traits<CORBA::InterfaceDef>::tao_release (
     CORBA::InterfaceDef_ptr p
   )
 {
@@ -6653,14 +6653,14 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::InterfaceDef_ptr
-TAO::Objref_Traits<CORBA::InterfaceDef>::nil (void)
+TAO::Objref_Traits<CORBA::InterfaceDef>::tao_nil (void)
 {
   return CORBA::InterfaceDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::InterfaceDef>::marshal (
+TAO::Objref_Traits<CORBA::InterfaceDef>::tao_marshal (
     CORBA::InterfaceDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -7129,7 +7129,7 @@ CORBA::InterfaceDescription::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::InterfaceAttrExtension_ptr
-TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::duplicate (
+TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_duplicate (
     CORBA::InterfaceAttrExtension_ptr p
   )
 {
@@ -7138,7 +7138,7 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::release (
+TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_release (
     CORBA::InterfaceAttrExtension_ptr p
   )
 {
@@ -7147,14 +7147,14 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::InterfaceAttrExtension_ptr
-TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::nil (void)
+TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_nil (void)
 {
   return CORBA::InterfaceAttrExtension::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::marshal (
+TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_marshal (
     CORBA::InterfaceAttrExtension_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -7400,7 +7400,7 @@ CORBA::InterfaceAttrExtension::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtInterfaceDef>::duplicate (
+TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_duplicate (
     CORBA::ExtInterfaceDef_ptr p
   )
 {
@@ -7409,7 +7409,7 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ExtInterfaceDef>::release (
+TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_release (
     CORBA::ExtInterfaceDef_ptr p
   )
 {
@@ -7418,14 +7418,14 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtInterfaceDef>::nil (void)
+TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_nil (void)
 {
   return CORBA::ExtInterfaceDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal (
+TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_marshal (
     CORBA::ExtInterfaceDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -7580,7 +7580,7 @@ CORBA::ExtInterfaceDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::AbstractInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::duplicate (
+TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_duplicate (
     CORBA::AbstractInterfaceDef_ptr p
   )
 {
@@ -7589,7 +7589,7 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::release (
+TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_release (
     CORBA::AbstractInterfaceDef_ptr p
   )
 {
@@ -7598,14 +7598,14 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::AbstractInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::nil (void)
+TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_nil (void)
 {
   return CORBA::AbstractInterfaceDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal (
+TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_marshal (
     CORBA::AbstractInterfaceDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -7755,7 +7755,7 @@ CORBA::AbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtAbstractInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::duplicate (
+TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_duplicate (
     CORBA::ExtAbstractInterfaceDef_ptr p
   )
 {
@@ -7764,7 +7764,7 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::release (
+TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_release (
     CORBA::ExtAbstractInterfaceDef_ptr p
   )
 {
@@ -7773,14 +7773,14 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtAbstractInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::nil (void)
+TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_nil (void)
 {
   return CORBA::ExtAbstractInterfaceDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal (
+TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_marshal (
     CORBA::ExtAbstractInterfaceDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -7939,7 +7939,7 @@ CORBA::ExtAbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::LocalInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::LocalInterfaceDef>::duplicate (
+TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_duplicate (
     CORBA::LocalInterfaceDef_ptr p
   )
 {
@@ -7948,7 +7948,7 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::LocalInterfaceDef>::release (
+TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_release (
     CORBA::LocalInterfaceDef_ptr p
   )
 {
@@ -7957,14 +7957,14 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::LocalInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::LocalInterfaceDef>::nil (void)
+TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_nil (void)
 {
   return CORBA::LocalInterfaceDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal (
+TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_marshal (
     CORBA::LocalInterfaceDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -8114,7 +8114,7 @@ CORBA::LocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtLocalInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::duplicate (
+TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_duplicate (
     CORBA::ExtLocalInterfaceDef_ptr p
   )
 {
@@ -8123,7 +8123,7 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::release (
+TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_release (
     CORBA::ExtLocalInterfaceDef_ptr p
   )
 {
@@ -8132,14 +8132,14 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtLocalInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::nil (void)
+TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_nil (void)
 {
   return CORBA::ExtLocalInterfaceDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal (
+TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_marshal (
     CORBA::ExtLocalInterfaceDef_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 31319ba79cc..b1bf2abe16e 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -4459,14 +4459,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::Repository>
   {
-    static CORBA::Repository_ptr duplicate (
+    static CORBA::Repository_ptr tao_duplicate (
         CORBA::Repository_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::Repository_ptr
       );
-    static CORBA::Repository_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::Repository_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::Repository_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4480,14 +4480,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ModuleDef>
   {
-    static CORBA::ModuleDef_ptr duplicate (
+    static CORBA::ModuleDef_ptr tao_duplicate (
         CORBA::ModuleDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ModuleDef_ptr
       );
-    static CORBA::ModuleDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ModuleDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ModuleDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4501,14 +4501,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ConstantDef>
   {
-    static CORBA::ConstantDef_ptr duplicate (
+    static CORBA::ConstantDef_ptr tao_duplicate (
         CORBA::ConstantDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ConstantDef_ptr
       );
-    static CORBA::ConstantDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ConstantDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ConstantDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4522,14 +4522,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::StructDef>
   {
-    static CORBA::StructDef_ptr duplicate (
+    static CORBA::StructDef_ptr tao_duplicate (
         CORBA::StructDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::StructDef_ptr
       );
-    static CORBA::StructDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::StructDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::StructDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4543,14 +4543,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::UnionDef>
   {
-    static CORBA::UnionDef_ptr duplicate (
+    static CORBA::UnionDef_ptr tao_duplicate (
         CORBA::UnionDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::UnionDef_ptr
       );
-    static CORBA::UnionDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::UnionDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::UnionDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4564,14 +4564,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::EnumDef>
   {
-    static CORBA::EnumDef_ptr duplicate (
+    static CORBA::EnumDef_ptr tao_duplicate (
         CORBA::EnumDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::EnumDef_ptr
       );
-    static CORBA::EnumDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::EnumDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::EnumDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4585,14 +4585,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::AliasDef>
   {
-    static CORBA::AliasDef_ptr duplicate (
+    static CORBA::AliasDef_ptr tao_duplicate (
         CORBA::AliasDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::AliasDef_ptr
       );
-    static CORBA::AliasDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::AliasDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::AliasDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4606,14 +4606,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceDef>
   {
-    static CORBA::InterfaceDef_ptr duplicate (
+    static CORBA::InterfaceDef_ptr tao_duplicate (
         CORBA::InterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::InterfaceDef_ptr
       );
-    static CORBA::InterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::InterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::InterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4627,14 +4627,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExceptionDef>
   {
-    static CORBA::ExceptionDef_ptr duplicate (
+    static CORBA::ExceptionDef_ptr tao_duplicate (
         CORBA::ExceptionDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExceptionDef_ptr
       );
-    static CORBA::ExceptionDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExceptionDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExceptionDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4648,14 +4648,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::NativeDef>
   {
-    static CORBA::NativeDef_ptr duplicate (
+    static CORBA::NativeDef_ptr tao_duplicate (
         CORBA::NativeDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::NativeDef_ptr
       );
-    static CORBA::NativeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::NativeDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::NativeDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4669,14 +4669,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::AbstractInterfaceDef>
   {
-    static CORBA::AbstractInterfaceDef_ptr duplicate (
+    static CORBA::AbstractInterfaceDef_ptr tao_duplicate (
         CORBA::AbstractInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::AbstractInterfaceDef_ptr
       );
-    static CORBA::AbstractInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::AbstractInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::AbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4690,14 +4690,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::LocalInterfaceDef>
   {
-    static CORBA::LocalInterfaceDef_ptr duplicate (
+    static CORBA::LocalInterfaceDef_ptr tao_duplicate (
         CORBA::LocalInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::LocalInterfaceDef_ptr
       );
-    static CORBA::LocalInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::LocalInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::LocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4711,14 +4711,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtInterfaceDef>
   {
-    static CORBA::ExtInterfaceDef_ptr duplicate (
+    static CORBA::ExtInterfaceDef_ptr tao_duplicate (
         CORBA::ExtInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExtInterfaceDef_ptr
       );
-    static CORBA::ExtInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExtInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExtInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4732,14 +4732,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAbstractInterfaceDef>
   {
-    static CORBA::ExtAbstractInterfaceDef_ptr duplicate (
+    static CORBA::ExtAbstractInterfaceDef_ptr tao_duplicate (
         CORBA::ExtAbstractInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExtAbstractInterfaceDef_ptr
       );
-    static CORBA::ExtAbstractInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExtAbstractInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExtAbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4753,14 +4753,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtLocalInterfaceDef>
   {
-    static CORBA::ExtLocalInterfaceDef_ptr duplicate (
+    static CORBA::ExtLocalInterfaceDef_ptr tao_duplicate (
         CORBA::ExtLocalInterfaceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExtLocalInterfaceDef_ptr
       );
-    static CORBA::ExtLocalInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExtLocalInterfaceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExtLocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4774,14 +4774,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::PrimitiveDef>
   {
-    static CORBA::PrimitiveDef_ptr duplicate (
+    static CORBA::PrimitiveDef_ptr tao_duplicate (
         CORBA::PrimitiveDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::PrimitiveDef_ptr
       );
-    static CORBA::PrimitiveDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::PrimitiveDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::PrimitiveDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4795,14 +4795,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::StringDef>
   {
-    static CORBA::StringDef_ptr duplicate (
+    static CORBA::StringDef_ptr tao_duplicate (
         CORBA::StringDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::StringDef_ptr
       );
-    static CORBA::StringDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::StringDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::StringDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4816,14 +4816,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::SequenceDef>
   {
-    static CORBA::SequenceDef_ptr duplicate (
+    static CORBA::SequenceDef_ptr tao_duplicate (
         CORBA::SequenceDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::SequenceDef_ptr
       );
-    static CORBA::SequenceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::SequenceDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::SequenceDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4837,14 +4837,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ArrayDef>
   {
-    static CORBA::ArrayDef_ptr duplicate (
+    static CORBA::ArrayDef_ptr tao_duplicate (
         CORBA::ArrayDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ArrayDef_ptr
       );
-    static CORBA::ArrayDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ArrayDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ArrayDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4858,14 +4858,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::WstringDef>
   {
-    static CORBA::WstringDef_ptr duplicate (
+    static CORBA::WstringDef_ptr tao_duplicate (
         CORBA::WstringDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::WstringDef_ptr
       );
-    static CORBA::WstringDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::WstringDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::WstringDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4879,14 +4879,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::FixedDef>
   {
-    static CORBA::FixedDef_ptr duplicate (
+    static CORBA::FixedDef_ptr tao_duplicate (
         CORBA::FixedDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::FixedDef_ptr
       );
-    static CORBA::FixedDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::FixedDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::FixedDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4900,14 +4900,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::AttributeDef>
   {
-    static CORBA::AttributeDef_ptr duplicate (
+    static CORBA::AttributeDef_ptr tao_duplicate (
         CORBA::AttributeDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::AttributeDef_ptr
       );
-    static CORBA::AttributeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::AttributeDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::AttributeDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4921,14 +4921,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAttributeDef>
   {
-    static CORBA::ExtAttributeDef_ptr duplicate (
+    static CORBA::ExtAttributeDef_ptr tao_duplicate (
         CORBA::ExtAttributeDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExtAttributeDef_ptr
       );
-    static CORBA::ExtAttributeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExtAttributeDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExtAttributeDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4942,14 +4942,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::OperationDef>
   {
-    static CORBA::OperationDef_ptr duplicate (
+    static CORBA::OperationDef_ptr tao_duplicate (
         CORBA::OperationDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::OperationDef_ptr
       );
-    static CORBA::OperationDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::OperationDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::OperationDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -4963,14 +4963,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceAttrExtension>
   {
-    static CORBA::InterfaceAttrExtension_ptr duplicate (
+    static CORBA::InterfaceAttrExtension_ptr tao_duplicate (
         CORBA::InterfaceAttrExtension_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::InterfaceAttrExtension_ptr
       );
-    static CORBA::InterfaceAttrExtension_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::InterfaceAttrExtension_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::InterfaceAttrExtension_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index a41531e4f0e..fc1c6142e55 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -599,7 +599,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::EventDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_duplicate (
     CORBA::ComponentIR::EventDef_ptr p
   )
 {
@@ -608,7 +608,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_release (
     CORBA::ComponentIR::EventDef_ptr p
   )
 {
@@ -617,14 +617,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::EventDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::EventDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_marshal (
     CORBA::ComponentIR::EventDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -778,7 +778,7 @@ CORBA::ComponentIR::EventDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::Container_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::Container>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_duplicate (
     CORBA::ComponentIR::Container_ptr p
   )
 {
@@ -787,7 +787,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::Container>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_release (
     CORBA::ComponentIR::Container_ptr p
   )
 {
@@ -796,14 +796,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::Container_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::Container>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_nil (void)
 {
   return CORBA::ComponentIR::Container::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::Container>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_marshal (
     CORBA::ComponentIR::Container_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1133,7 +1133,7 @@ CORBA::ComponentIR::Container::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::ModuleDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_duplicate (
     CORBA::ComponentIR::ModuleDef_ptr p
   )
 {
@@ -1142,7 +1142,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_release (
     CORBA::ComponentIR::ModuleDef_ptr p
   )
 {
@@ -1151,14 +1151,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::ModuleDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::ModuleDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_marshal (
     CORBA::ComponentIR::ModuleDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1309,7 +1309,7 @@ CORBA::ComponentIR::ModuleDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::Repository_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::Repository>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_duplicate (
     CORBA::ComponentIR::Repository_ptr p
   )
 {
@@ -1318,7 +1318,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::Repository>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_release (
     CORBA::ComponentIR::Repository_ptr p
   )
 {
@@ -1327,14 +1327,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::Repository_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::Repository>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_nil (void)
 {
   return CORBA::ComponentIR::Repository::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::Repository>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_marshal (
     CORBA::ComponentIR::Repository_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1481,7 +1481,7 @@ CORBA::ComponentIR::Repository::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::ProvidesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_duplicate (
     CORBA::ComponentIR::ProvidesDef_ptr p
   )
 {
@@ -1490,7 +1490,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_release (
     CORBA::ComponentIR::ProvidesDef_ptr p
   )
 {
@@ -1499,14 +1499,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::ProvidesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::ProvidesDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_marshal (
     CORBA::ComponentIR::ProvidesDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1742,7 +1742,7 @@ CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::UsesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_duplicate (
     CORBA::ComponentIR::UsesDef_ptr p
   )
 {
@@ -1751,7 +1751,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_release (
     CORBA::ComponentIR::UsesDef_ptr p
   )
 {
@@ -1760,14 +1760,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::UsesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::UsesDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_marshal (
     CORBA::ComponentIR::UsesDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2088,7 +2088,7 @@ CORBA::ComponentIR::UsesDescription::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::EventPortDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_duplicate (
     CORBA::ComponentIR::EventPortDef_ptr p
   )
 {
@@ -2097,7 +2097,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_release (
     CORBA::ComponentIR::EventPortDef_ptr p
   )
 {
@@ -2106,14 +2106,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::EventPortDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::EventPortDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_marshal (
     CORBA::ComponentIR::EventPortDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2394,7 +2394,7 @@ CORBA::ComponentIR::EventPortDescription::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::EmitsDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_duplicate (
     CORBA::ComponentIR::EmitsDef_ptr p
   )
 {
@@ -2403,7 +2403,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_release (
     CORBA::ComponentIR::EmitsDef_ptr p
   )
 {
@@ -2412,14 +2412,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::EmitsDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::EmitsDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_marshal (
     CORBA::ComponentIR::EmitsDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2561,7 +2561,7 @@ CORBA::ComponentIR::EmitsDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::PublishesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_duplicate (
     CORBA::ComponentIR::PublishesDef_ptr p
   )
 {
@@ -2570,7 +2570,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_release (
     CORBA::ComponentIR::PublishesDef_ptr p
   )
 {
@@ -2579,14 +2579,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::PublishesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::PublishesDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_marshal (
     CORBA::ComponentIR::PublishesDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2728,7 +2728,7 @@ CORBA::ComponentIR::PublishesDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::ConsumesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_duplicate (
     CORBA::ComponentIR::ConsumesDef_ptr p
   )
 {
@@ -2737,7 +2737,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_release (
     CORBA::ComponentIR::ConsumesDef_ptr p
   )
 {
@@ -2746,14 +2746,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::ConsumesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::ConsumesDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_marshal (
     CORBA::ComponentIR::ConsumesDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2895,7 +2895,7 @@ CORBA::ComponentIR::ConsumesDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::ComponentDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_duplicate (
     CORBA::ComponentIR::ComponentDef_ptr p
   )
 {
@@ -2904,7 +2904,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_release (
     CORBA::ComponentIR::ComponentDef_ptr p
   )
 {
@@ -2913,14 +2913,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::ComponentDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::ComponentDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_marshal (
     CORBA::ComponentIR::ComponentDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3693,7 +3693,7 @@ CORBA::ComponentIR::ComponentDescription::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::FactoryDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_duplicate (
     CORBA::ComponentIR::FactoryDef_ptr p
   )
 {
@@ -3702,7 +3702,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_release (
     CORBA::ComponentIR::FactoryDef_ptr p
   )
 {
@@ -3711,14 +3711,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::FactoryDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::FactoryDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_marshal (
     CORBA::ComponentIR::FactoryDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3860,7 +3860,7 @@ CORBA::ComponentIR::FactoryDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::FinderDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_duplicate (
     CORBA::ComponentIR::FinderDef_ptr p
   )
 {
@@ -3869,7 +3869,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_release (
     CORBA::ComponentIR::FinderDef_ptr p
   )
 {
@@ -3878,14 +3878,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::FinderDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::FinderDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_marshal (
     CORBA::ComponentIR::FinderDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -4027,7 +4027,7 @@ CORBA::ComponentIR::FinderDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::HomeDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::duplicate (
+TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_duplicate (
     CORBA::ComponentIR::HomeDef_ptr p
   )
 {
@@ -4036,7 +4036,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::release (
+TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_release (
     CORBA::ComponentIR::HomeDef_ptr p
   )
 {
@@ -4045,14 +4045,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ComponentIR::HomeDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::nil (void)
+TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_nil (void)
 {
   return CORBA::ComponentIR::HomeDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::marshal (
+TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_marshal (
     CORBA::ComponentIR::HomeDef_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index a4f9abf3170..1acd22d6ed5 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -2462,14 +2462,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ComponentDef>
   {
-    static CORBA::ComponentIR::ComponentDef_ptr duplicate (
+    static CORBA::ComponentIR::ComponentDef_ptr tao_duplicate (
         CORBA::ComponentIR::ComponentDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::ComponentDef_ptr
       );
-    static CORBA::ComponentIR::ComponentDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::ComponentDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::ComponentDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2483,14 +2483,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::HomeDef>
   {
-    static CORBA::ComponentIR::HomeDef_ptr duplicate (
+    static CORBA::ComponentIR::HomeDef_ptr tao_duplicate (
         CORBA::ComponentIR::HomeDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::HomeDef_ptr
       );
-    static CORBA::ComponentIR::HomeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::HomeDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::HomeDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2504,14 +2504,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EventDef>
   {
-    static CORBA::ComponentIR::EventDef_ptr duplicate (
+    static CORBA::ComponentIR::EventDef_ptr tao_duplicate (
         CORBA::ComponentIR::EventDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::EventDef_ptr
       );
-    static CORBA::ComponentIR::EventDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::EventDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::EventDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2525,14 +2525,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::Container>
   {
-    static CORBA::ComponentIR::Container_ptr duplicate (
+    static CORBA::ComponentIR::Container_ptr tao_duplicate (
         CORBA::ComponentIR::Container_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::Container_ptr
       );
-    static CORBA::ComponentIR::Container_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::Container_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::Container_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2546,14 +2546,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ModuleDef>
   {
-    static CORBA::ComponentIR::ModuleDef_ptr duplicate (
+    static CORBA::ComponentIR::ModuleDef_ptr tao_duplicate (
         CORBA::ComponentIR::ModuleDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::ModuleDef_ptr
       );
-    static CORBA::ComponentIR::ModuleDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::ModuleDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::ModuleDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2567,14 +2567,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::Repository>
   {
-    static CORBA::ComponentIR::Repository_ptr duplicate (
+    static CORBA::ComponentIR::Repository_ptr tao_duplicate (
         CORBA::ComponentIR::Repository_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::Repository_ptr
       );
-    static CORBA::ComponentIR::Repository_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::Repository_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::Repository_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2588,14 +2588,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ProvidesDef>
   {
-    static CORBA::ComponentIR::ProvidesDef_ptr duplicate (
+    static CORBA::ComponentIR::ProvidesDef_ptr tao_duplicate (
         CORBA::ComponentIR::ProvidesDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::ProvidesDef_ptr
       );
-    static CORBA::ComponentIR::ProvidesDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::ProvidesDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::ProvidesDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2609,14 +2609,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::UsesDef>
   {
-    static CORBA::ComponentIR::UsesDef_ptr duplicate (
+    static CORBA::ComponentIR::UsesDef_ptr tao_duplicate (
         CORBA::ComponentIR::UsesDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::UsesDef_ptr
       );
-    static CORBA::ComponentIR::UsesDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::UsesDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::UsesDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2630,14 +2630,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EventPortDef>
   {
-    static CORBA::ComponentIR::EventPortDef_ptr duplicate (
+    static CORBA::ComponentIR::EventPortDef_ptr tao_duplicate (
         CORBA::ComponentIR::EventPortDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::EventPortDef_ptr
       );
-    static CORBA::ComponentIR::EventPortDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::EventPortDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::EventPortDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2651,14 +2651,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EmitsDef>
   {
-    static CORBA::ComponentIR::EmitsDef_ptr duplicate (
+    static CORBA::ComponentIR::EmitsDef_ptr tao_duplicate (
         CORBA::ComponentIR::EmitsDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::EmitsDef_ptr
       );
-    static CORBA::ComponentIR::EmitsDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::EmitsDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::EmitsDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2672,14 +2672,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::PublishesDef>
   {
-    static CORBA::ComponentIR::PublishesDef_ptr duplicate (
+    static CORBA::ComponentIR::PublishesDef_ptr tao_duplicate (
         CORBA::ComponentIR::PublishesDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::PublishesDef_ptr
       );
-    static CORBA::ComponentIR::PublishesDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::PublishesDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::PublishesDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2693,14 +2693,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ConsumesDef>
   {
-    static CORBA::ComponentIR::ConsumesDef_ptr duplicate (
+    static CORBA::ComponentIR::ConsumesDef_ptr tao_duplicate (
         CORBA::ComponentIR::ConsumesDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::ConsumesDef_ptr
       );
-    static CORBA::ComponentIR::ConsumesDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::ConsumesDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::ConsumesDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2714,14 +2714,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::FactoryDef>
   {
-    static CORBA::ComponentIR::FactoryDef_ptr duplicate (
+    static CORBA::ComponentIR::FactoryDef_ptr tao_duplicate (
         CORBA::ComponentIR::FactoryDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::FactoryDef_ptr
       );
-    static CORBA::ComponentIR::FactoryDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::FactoryDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::FactoryDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2735,14 +2735,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::FinderDef>
   {
-    static CORBA::ComponentIR::FinderDef_ptr duplicate (
+    static CORBA::ComponentIR::FinderDef_ptr tao_duplicate (
         CORBA::ComponentIR::FinderDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ComponentIR::FinderDef_ptr
       );
-    static CORBA::ComponentIR::FinderDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ComponentIR::FinderDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ComponentIR::FinderDef_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 444a2cfab77..838d54cf154 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -518,7 +518,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::FixedDef_ptr
-TAO::Objref_Traits<CORBA::FixedDef>::duplicate (
+TAO::Objref_Traits<CORBA::FixedDef>::tao_duplicate (
     CORBA::FixedDef_ptr p
   )
 {
@@ -527,7 +527,7 @@ TAO::Objref_Traits<CORBA::FixedDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::FixedDef>::release (
+TAO::Objref_Traits<CORBA::FixedDef>::tao_release (
     CORBA::FixedDef_ptr p
   )
 {
@@ -536,14 +536,14 @@ TAO::Objref_Traits<CORBA::FixedDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::FixedDef_ptr
-TAO::Objref_Traits<CORBA::FixedDef>::nil (void)
+TAO::Objref_Traits<CORBA::FixedDef>::tao_nil (void)
 {
   return CORBA::FixedDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::FixedDef>::marshal (
+TAO::Objref_Traits<CORBA::FixedDef>::tao_marshal (
     CORBA::FixedDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -917,7 +917,7 @@ void CORBA::ValueMemberSeq::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ValueMemberDef_ptr
-TAO::Objref_Traits<CORBA::ValueMemberDef>::duplicate (
+TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_duplicate (
     CORBA::ValueMemberDef_ptr p
   )
 {
@@ -926,7 +926,7 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ValueMemberDef>::release (
+TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_release (
     CORBA::ValueMemberDef_ptr p
   )
 {
@@ -935,14 +935,14 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ValueMemberDef_ptr
-TAO::Objref_Traits<CORBA::ValueMemberDef>::nil (void)
+TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_nil (void)
 {
   return CORBA::ValueMemberDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ValueMemberDef>::marshal (
+TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_marshal (
     CORBA::ValueMemberDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1292,7 +1292,7 @@ CORBA::ValueMemberDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ValueDef_ptr
-TAO::Objref_Traits<CORBA::ValueDef>::duplicate (
+TAO::Objref_Traits<CORBA::ValueDef>::tao_duplicate (
     CORBA::ValueDef_ptr p
   )
 {
@@ -1301,7 +1301,7 @@ TAO::Objref_Traits<CORBA::ValueDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ValueDef>::release (
+TAO::Objref_Traits<CORBA::ValueDef>::tao_release (
     CORBA::ValueDef_ptr p
   )
 {
@@ -1310,14 +1310,14 @@ TAO::Objref_Traits<CORBA::ValueDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ValueDef_ptr
-TAO::Objref_Traits<CORBA::ValueDef>::nil (void)
+TAO::Objref_Traits<CORBA::ValueDef>::tao_nil (void)
 {
   return CORBA::ValueDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ValueDef>::marshal (
+TAO::Objref_Traits<CORBA::ValueDef>::tao_marshal (
     CORBA::ValueDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2353,7 +2353,7 @@ CORBA::ValueDescription::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtValueDef_ptr
-TAO::Objref_Traits<CORBA::ExtValueDef>::duplicate (
+TAO::Objref_Traits<CORBA::ExtValueDef>::tao_duplicate (
     CORBA::ExtValueDef_ptr p
   )
 {
@@ -2362,7 +2362,7 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ExtValueDef>::release (
+TAO::Objref_Traits<CORBA::ExtValueDef>::tao_release (
     CORBA::ExtValueDef_ptr p
   )
 {
@@ -2371,14 +2371,14 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ExtValueDef_ptr
-TAO::Objref_Traits<CORBA::ExtValueDef>::nil (void)
+TAO::Objref_Traits<CORBA::ExtValueDef>::tao_nil (void)
 {
   return CORBA::ExtValueDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtValueDef>::marshal (
+TAO::Objref_Traits<CORBA::ExtValueDef>::tao_marshal (
     CORBA::ExtValueDef_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2731,7 +2731,7 @@ CORBA::ExtValueDef::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ValueBoxDef_ptr
-TAO::Objref_Traits<CORBA::ValueBoxDef>::duplicate (
+TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_duplicate (
     CORBA::ValueBoxDef_ptr p
   )
 {
@@ -2740,7 +2740,7 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::ValueBoxDef>::release (
+TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_release (
     CORBA::ValueBoxDef_ptr p
   )
 {
@@ -2749,14 +2749,14 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::ValueBoxDef_ptr
-TAO::Objref_Traits<CORBA::ValueBoxDef>::nil (void)
+TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_nil (void)
 {
   return CORBA::ValueBoxDef::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::ValueBoxDef>::marshal (
+TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_marshal (
     CORBA::ValueBoxDef_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index 61c72d2bbc8..2b62a2bede4 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -1297,14 +1297,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueDef>
   {
-    static CORBA::ValueDef_ptr duplicate (
+    static CORBA::ValueDef_ptr tao_duplicate (
         CORBA::ValueDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ValueDef_ptr
       );
-    static CORBA::ValueDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ValueDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1318,14 +1318,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueBoxDef>
   {
-    static CORBA::ValueBoxDef_ptr duplicate (
+    static CORBA::ValueBoxDef_ptr tao_duplicate (
         CORBA::ValueBoxDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ValueBoxDef_ptr
       );
-    static CORBA::ValueBoxDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ValueBoxDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ValueBoxDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1339,14 +1339,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtValueDef>
   {
-    static CORBA::ExtValueDef_ptr duplicate (
+    static CORBA::ExtValueDef_ptr tao_duplicate (
         CORBA::ExtValueDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ExtValueDef_ptr
       );
-    static CORBA::ExtValueDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ExtValueDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ExtValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1360,14 +1360,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::FixedDef>
   {
-    static CORBA::FixedDef_ptr duplicate (
+    static CORBA::FixedDef_ptr tao_duplicate (
         CORBA::FixedDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::FixedDef_ptr
       );
-    static CORBA::FixedDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::FixedDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::FixedDef_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1381,14 +1381,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueMemberDef>
   {
-    static CORBA::ValueMemberDef_ptr duplicate (
+    static CORBA::ValueMemberDef_ptr tao_duplicate (
         CORBA::ValueMemberDef_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::ValueMemberDef_ptr
       );
-    static CORBA::ValueMemberDef_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::ValueMemberDef_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::ValueMemberDef_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index c48e62962c8..cd8aa272822 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -15,6 +15,7 @@
 
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
+#include "ace/os_include/netinet/os_tcp.h"
 
 ACE_RCSID (tao,
            IIOP_Connection_Handler,
@@ -140,11 +141,9 @@ TAO_IIOP_Connection_Handler::open (void*)
                   client, this->peer ().get_handle ()));
     }
 
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
+  // Set the id in the transport now that we're active.
+  // Use C-style cast b/c otherwise we get warnings on lots of compilers
+  this->transport ()->id ((size_t) this->get_handle ());
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS);
 
@@ -166,7 +165,16 @@ TAO_IIOP_Connection_Handler::close_connection (void)
 int
 TAO_IIOP_Connection_Handler::handle_input (ACE_HANDLE h)
 {
-  return this->handle_input_eh (h, this);
+  const int result =
+    this->handle_input_eh (h, this);
+
+  if (result == -1)
+    {
+      this->close_connection ();
+      return 0;
+    }
+
+  return result;
 }
 
 int
@@ -205,7 +213,9 @@ TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE,
 int
 TAO_IIOP_Connection_Handler::close (u_long)
 {
-  return this->close_handler ();
+  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
+  this->transport ()->remove_reference ();
+  return 0;
 }
 
 int
@@ -246,14 +256,6 @@ TAO_IIOP_Connection_Handler::process_listen_point_list (
   // Get the size of the list
   const CORBA::ULong len = listen_list.length ();
 
-  if (TAO_debug_level > 0 && len == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::")
-                  ACE_TEXT("process_listen_point_list, ")
-                  ACE_TEXT("Received list of size 0, check client config.\n")));
-    }
-
   for (CORBA::ULong i = 0; i < len; ++i)
     {
       IIOP::ListenPoint listen_point = listen_list[i];
@@ -282,9 +284,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list (
 
       // The property for this handler has changed. Recache the
       // handler with this property
-      int retval =
-        this->transport ()->recache_transport (&prop);
-
+      int retval = this->transport ()->recache_transport (&prop);
       if (retval == -1)
         return retval;
 
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 8deb1c31355..618ff481ad7 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -6,10 +6,8 @@
 #include "Protocols_Hooks.h"
 #include "Connect_Strategy.h"
 #include "Thread_Lane_Resources.h"
-#include "Profile_Transport_Resolver.h"
 #include "Transport.h"
 #include "Wait_Strategy.h"
-#include "SystemException.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
@@ -56,7 +54,7 @@ int
 TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
   // @@todo: The functionality of the following two statements could
-  // be done in the constructor, but that involves changing the
+  // be  done in the constructor, but that involves changing the
   // interface of the pluggable transport factory.
 
   // Set the ORB Core
@@ -134,42 +132,32 @@ TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 }
 
 TAO_Transport *
-TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
+TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
                                      TAO_Transport_Descriptor_Interface &desc,
-                                     ACE_Time_Value *timeout)
+                                     ACE_Time_Value *max_wait_time)
 {
-  TAO_IIOP_Endpoint *iiop_endpoint =
-    this->remote_endpoint (desc.endpoint ());
+  TAO_IIOP_Endpoint *iiop_endpoint = this->remote_endpoint (desc.endpoint ());
 
   if (iiop_endpoint == 0)
     return 0;
 
-  const ACE_INET_Addr &remote_address =
-    iiop_endpoint->object_addr ();
+  const ACE_INET_Addr &remote_address = iiop_endpoint->object_addr ();
 
   if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - IIOP_Connector::make_connection, "
-                "to <%s:%d> which should %s\n",
-                ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()),
-                iiop_endpoint->port(),
-                r->blocked () ? ACE_TEXT("block") : ACE_TEXT("nonblock")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                  "to <%s:%d>\n",
+                  ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()),
+                  iiop_endpoint->port()));
+    }
 
   // Get the right synch options
   ACE_Synch_Options synch_options;
 
-  this->active_connect_strategy_->synch_options (timeout,
+  this->active_connect_strategy_->synch_options (max_wait_time,
                                                  synch_options);
 
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked ())
-    {
-      synch_options.timeout (ACE_Time_Value::zero);
-      timeout = &tmp_zero;
-    }
-
   TAO_IIOP_Connection_Handler *svc_handler = 0;
 
   // Connect.
@@ -179,14 +167,13 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
                                    synch_options);
 
   // The connect() method creates the service handler and bumps the
-  // #REFCOUNT# up one extra.  There are four possibilities from
+  // #REFCOUNT# up one extra.  There are three possibilities from
   // calling connect(): (a) connection succeeds immediately - in this
   // case, the #REFCOUNT# on the handler is two; (b) connection
   // completion is pending - in this case, the #REFCOUNT# on the
   // handler is also two; (c) connection fails immediately - in this
   // case, the #REFCOUNT# on the handler is one since close() gets
-  // called on the handler; (d) the connect immediately returns when we
-  // have specified that it shouldn't block.
+  // called on the handler.
   //
   // The extra reference count in
   // TAO_Connect_Creation_Strategy::make_svc_handler() is needed in
@@ -197,67 +184,118 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
   // another thread pick up the completion and potentially deletes the
   // handler before we get a chance to increment the reference count.
 
-  // Make sure that we always do a remove_reference
-  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
+  // No immediate result.  Wait for completion.
+  if (result == -1 && errno == EWOULDBLOCK)
+    {
+      if (TAO_debug_level > 2)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                      "going to wait for connection completion on local"
+                      "handle [%d]\n",
+                      svc_handler->get_handle ()));
+        }
 
-  TAO_Transport *transport =
-    svc_handler->transport ();
+      // Wait for connection completion.
+      result =
+        this->active_connect_strategy_->wait (svc_handler,
+                                              max_wait_time);
 
-  if (result == -1)
-    {
-      // No immediate result, wait for completion
-      if (errno == EWOULDBLOCK)
+      if (TAO_debug_level > 2)
         {
-          // Try to wait until connection completion. Incase we block, then we
-          // get a connected transport or not. In case of non block we get
-          // a connected or not connected transport
-          if (!this->wait_for_connection_completion (r,
-                                                     transport,
-                                                     timeout))
-            {
-              if (TAO_debug_level > 2)
-                ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_Connector::"
-                                      "make_connection, "
-                                      "wait for completion failed\n"));
-            }
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - IIOP_Connector::make_connection"
+                      "wait done for handle[%d], result = %d\n",
+                      svc_handler->get_handle (), result));
         }
-      else
+
+      // There are three possibilities when wait() returns: (a)
+      // connection succeeded; (b) connection failed; (c) wait()
+      // failed because of some other error.  It is easy to deal with
+      // (a) and (b).  (c) is tricky since the connection is still
+      // pending and may get completed by some other thread.  The
+      // following code deals with (c).
+
+      // Check if the handler has been closed.
+      int closed =
+        svc_handler->is_closed ();
+
+      // In case of failures and close() has not be called.
+      if (result == -1 && !closed)
         {
-          // Transport is not usable
-          transport = 0;
+          // First, cancel from connector.
+          this->base_connector_.cancel (svc_handler);
+
+          // Double check to make sure the handler has not been closed
+          // yet.  This double check is required to ensure that the
+          // connection handler was not closed yet by some other
+          // thread since it was still registered with the connector.
+          // Once connector.cancel() has been processed, we are
+          // assured that the connector will no longer open/close this
+          // handler.
+          closed = svc_handler->is_closed ();
+
+          // If closed, there is nothing to do here.  If not closed,
+          // it was either opened or is still pending.
+          if (!closed)
+            {
+              // Check if the handler has been opened.
+              const int open = svc_handler->is_open ();
+
+              // Some other thread was able to open the handler even
+              // though wait failed for this thread.
+              if (open)
+                // Overwrite <result>.
+                result = 0;
+              else
+                {
+                  // Assert that it is still connecting.
+                  ACE_ASSERT (svc_handler->is_connecting ());
+
+                  // Force close the handler now.
+                  svc_handler->close ();
+                }
+            }
         }
     }
 
-  // In case of errors transport is zero
-  if (transport == 0)
+  // Irrespective of success or failure, remove the extra #REFCOUNT#.
+  svc_handler->remove_reference ();
+
+  // In case of errors.
+  if (result == -1)
     {
       // Give users a clue to the problem.
-      if (TAO_debug_level > 3)
+      if (TAO_debug_level)
+        {
           ACE_DEBUG ((LM_ERROR,
                       "TAO (%P|%t) - IIOP_Connector::make_connection, "
                       "connection to <%s:%d> failed (%p)\n",
-                      iiop_endpoint->host (), iiop_endpoint->port (),
+                      ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host ()), iiop_endpoint->port (),
                       ACE_TEXT("errno")));
+        }
 
       return 0;
     }
 
-  // At this point, the connection has be successfully created
-  // connected or not connected, but we have a connection.
+  // At this point, the connection has be successfully connected.
+  // #REFCOUNT# is one.
   if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - IIOP_Connector::make_connection, "
-                "new %s connection to <%s:%d> on Transport[%d]\n",
-                transport->is_connected() ? "connected" : "not connected",
-                iiop_endpoint->host (),
-                iiop_endpoint->port (),
-                svc_handler->peer ().get_handle ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                  "new connection to <%s:%d> on Transport[%d]\n",
+                  ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host ()),
+                  iiop_endpoint->port (),
+                  svc_handler->peer ().get_handle ()));
+    }
+
+  TAO_Transport *transport = svc_handler->transport ();
 
   // Add the handler to Cache
   int retval =
-    this->orb_core ()->lane_resources ().transport_cache ().cache_transport (
-      &desc,
-      transport);
+    this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&desc,
+                                                                             transport);
 
   // Failure in adding to cache.
   if (retval != 0)
@@ -275,24 +313,26 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (transport->is_connected () &&
-      transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
+  // If the wait strategy wants us to be registered with the reactor
+  // then we do so. If registeration is required and it succeeds,
+  // #REFCOUNT# becomes two.
+  retval =  transport->wait_strategy ()->register_handler ();
 
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) transport->purge_entry ();
+  // Registration failures.
+  if (retval != 0)
+    {
+      // Purge from the connection cache.
+      transport->purge_entry ();
 
       // Close the handler.
-      (void) transport->close_connection ();
+      svc_handler->close ();
 
       if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - IIOP_Connector [%d]::make_connection, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    transport->id ()));
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                      "could not register the new connection in the reactor\n"));
+        }
 
       return 0;
     }
@@ -303,7 +343,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
 TAO_Profile *
 TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr)
 {
-  TAO_Profile *pfile = 0;
+  TAO_Profile *pfile;
   ACE_NEW_RETURN (pfile,
                   TAO_IIOP_Profile (this->orb_core ()),
                   0);
@@ -331,7 +371,7 @@ TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_IIOP_Profile (this->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -395,8 +435,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
   int no_delay = this->orb_core ()->orb_params ()->nodelay ();
   int enable_network_priority = 0;
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (tph != 0)
@@ -443,23 +482,3 @@ TAO_IIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
 
   return iiop_endpoint;
 }
-
-int
-TAO_IIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  TAO_IIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_IIOP_Connection_Handler*>(svc_handler);
-
-  if (handler)
-    {
-      // Cancel from the connector
-      this->base_connector_.cancel (handler);
-
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 8b2bcefb164..d8dac4ba098 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -99,9 +99,6 @@ protected:
   /// initialize <tcp_properties_>.
   int init_tcp_properties (void);
 
-  /// Cancel the passed cvs handler from the connector
-  virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
-
 protected:
 
   /// TCP configuration properties to be used for all
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 724fcd451fc..a19999c8d7f 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -4,7 +4,6 @@
 #include "tao/debug.h"
 #include "tao/IIOP_EndpointsC.h"
 #include "tao/CDR.h"
-#include "tao/SystemException.h"
 
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
@@ -124,7 +123,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
       // No object key delimiter or no hostname specified.
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     0,
+                     TAO_DEFAULT_MINOR_CODE,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -139,7 +138,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
       // No hostname specified!  It is required by the spec.
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     0,
+                     TAO_DEFAULT_MINOR_CODE,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -165,7 +164,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
             {
               ACE_THROW (CORBA::INV_OBJREF (
                              CORBA::SystemException::_tao_minor_code (
-                               0,
+                               TAO_DEFAULT_MINOR_CODE,
                                EINVAL),
                              CORBA::COMPLETED_NO));
             }
@@ -211,7 +210,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
           // @@ What's the right exception to throw here?
           ACE_THROW (CORBA::INV_OBJREF (
                        CORBA::SystemException::_tao_minor_code (
-                         0,
+                         TAO_DEFAULT_MINOR_CODE,
                          EINVAL),
                        CORBA::COMPLETED_NO));
         }
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index cc77eb99222..3151824b184 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -320,25 +320,14 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
             {
               if (TAO_debug_level > 0)
                 ACE_ERROR ((LM_ERROR,
-                            "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, "
-                            "error getting listen_point\n"));
+                            "TAO (%P|%t) - IIOP_Transport::set_bidir_info, "
+                            "error getting listen_point \n"));
 
               return;
             }
         }
     }
 
-  if (listen_point_list.length () == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, "
-                    "listen_point list is empty, client should send a list "
-                    "with at least one point\n"));
-
-      return;
-    }
-
   // We have the ListenPointList at this point. Create a output CDR
   // stream at this point
   TAO_OutputCDR cdr;
@@ -381,8 +370,9 @@ TAO_IIOP_Transport::get_listen_point (
       == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ")
-                         ACE_TEXT ("could not resolve local host address\n")),
+                         ACE_TEXT ("(%P|%t) Could not resolve local ")
+                         ACE_TEXT ("host address in ")
+                         ACE_TEXT ("get_listen_point()\n")),
                         -1);
     }
 
@@ -397,8 +387,8 @@ TAO_IIOP_Transport::get_listen_point (
                                local_interface.out ()) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ")
-                         ACE_TEXT ("could not resolve local host name\n")),
+                         ACE_TEXT ("(%P|%t) Could not resolve local host ")
+                         ACE_TEXT ("name \n")),
                         -1);
     }
 
@@ -406,7 +396,7 @@ TAO_IIOP_Transport::get_listen_point (
        index < count;
        ++index)
     {
-      if (local_addr.get_ip_address ()
+      if (local_addr.get_ip_address()
           == endpoint_addr[index].get_ip_address ())
         {
           // Get the count of the number of elements
diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp
index 3a6a8dbddaa..5a99e777ab4 100644
--- a/TAO/tao/IOP_CodecC.cpp
+++ b/TAO/tao/IOP_CodecC.cpp
@@ -30,7 +30,6 @@
 
 
 #include "IOP_CodecC.h"
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -58,7 +57,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IOP::Codec_ptr
-TAO::Objref_Traits<IOP::Codec>::duplicate (
+TAO::Objref_Traits<IOP::Codec>::tao_duplicate (
     IOP::Codec_ptr p
   )
 {
@@ -67,7 +66,7 @@ TAO::Objref_Traits<IOP::Codec>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<IOP::Codec>::release (
+TAO::Objref_Traits<IOP::Codec>::tao_release (
     IOP::Codec_ptr p
   )
 {
@@ -76,14 +75,14 @@ TAO::Objref_Traits<IOP::Codec>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IOP::Codec_ptr
-TAO::Objref_Traits<IOP::Codec>::nil (void)
+TAO::Objref_Traits<IOP::Codec>::tao_nil (void)
 {
   return IOP::Codec::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<IOP::Codec>::marshal (
+TAO::Objref_Traits<IOP::Codec>::tao_marshal (
     IOP::Codec_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -662,7 +661,7 @@ IOP::Encoding::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IOP::CodecFactory_ptr
-TAO::Objref_Traits<IOP::CodecFactory>::duplicate (
+TAO::Objref_Traits<IOP::CodecFactory>::tao_duplicate (
     IOP::CodecFactory_ptr p
   )
 {
@@ -671,7 +670,7 @@ TAO::Objref_Traits<IOP::CodecFactory>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<IOP::CodecFactory>::release (
+TAO::Objref_Traits<IOP::CodecFactory>::tao_release (
     IOP::CodecFactory_ptr p
   )
 {
@@ -680,14 +679,14 @@ TAO::Objref_Traits<IOP::CodecFactory>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IOP::CodecFactory_ptr
-TAO::Objref_Traits<IOP::CodecFactory>::nil (void)
+TAO::Objref_Traits<IOP::CodecFactory>::tao_nil (void)
 {
   return IOP::CodecFactory::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<IOP::CodecFactory>::marshal (
+TAO::Objref_Traits<IOP::CodecFactory>::tao_marshal (
     IOP::CodecFactory_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h
index 6b08d0a6a4b..3c05765c8d8 100644
--- a/TAO/tao/IOP_CodecC.h
+++ b/TAO/tao/IOP_CodecC.h
@@ -46,7 +46,6 @@
 #include "tao/Any.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
-#include "tao/SystemException.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -71,13 +70,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -87,22 +86,22 @@ namespace TAO
 
 namespace IOP
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_IOP_CODEC__VAR_OUT_CH_)
 #define _IOP_CODEC__VAR_OUT_CH_
-
+  
   class Codec;
   typedef Codec *Codec_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Codec
       >
     Codec_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Codec
@@ -110,58 +109,58 @@ namespace IOP
     Codec_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODEC_CH_)
 #define _IOP_CODEC_CH_
-
+  
   class TAO_Export Codec
     : public virtual CORBA::Object
   {
   public:
     typedef Codec_ptr _ptr_type;
     typedef Codec_var _var_type;
-
+    
     // The static operations.
     static Codec_ptr _duplicate (Codec_ptr obj);
-
+    
     static Codec_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Codec_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Codec_ptr _nil (void)
     {
       return (Codec_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_)
 #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_
-
+    
     class TAO_Export InvalidTypeForEncoding : public CORBA::UserException
     {
     public:
-
+      
       InvalidTypeForEncoding (void);
       InvalidTypeForEncoding (const InvalidTypeForEncoding &);
       ~InvalidTypeForEncoding (void);
 
       InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -173,43 +172,43 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_)
 #define _IOP_CODEC_FORMATMISMATCH_CH_
-
+    
     class TAO_Export FormatMismatch : public CORBA::UserException
     {
     public:
-
+      
       FormatMismatch (void);
       FormatMismatch (const FormatMismatch &);
       ~FormatMismatch (void);
 
       FormatMismatch &operator= (const FormatMismatch &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static FormatMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -221,43 +220,43 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_FormatMismatch;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
 #define _IOP_CODEC_TYPEMISMATCH_CH_
-
+    
     class TAO_Export TypeMismatch : public CORBA::UserException
     {
     public:
-
+      
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static TypeMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -269,28 +268,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * encode (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -299,10 +298,10 @@ namespace IOP
         CORBA::SystemException
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Any * decode (
         const CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -311,10 +310,10 @@ namespace IOP
         CORBA::SystemException
         , IOP::Codec::FormatMismatch
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * encode_value (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -323,10 +322,10 @@ namespace IOP
         CORBA::SystemException
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Any * decode_value (
         const CORBA::OctetSeq & data,
         CORBA::TypeCode_ptr tc
@@ -337,102 +336,102 @@ namespace IOP
         , IOP::Codec::FormatMismatch
         , IOP::Codec::TypeMismatch
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Codec (void);
-
+    
     virtual ~Codec (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Codec (const Codec &);
-
+    
     void operator= (const Codec &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::Short EncodingFormat;
   typedef CORBA::Short_out EncodingFormat_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct Encoding;
-
+  
   typedef
     TAO_Fixed_Var_T<
         Encoding
       >
     Encoding_var;
-
+  
   typedef
     Encoding &
     Encoding_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_Export Encoding
   {
     typedef Encoding_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     IOP::EncodingFormat format;
     CORBA::Octet major_version;
     CORBA::Octet minor_version;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_)
 #define _IOP_CODECFACTORY__VAR_OUT_CH_
-
+  
   class CodecFactory;
   typedef CodecFactory *CodecFactory_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         CodecFactory
       >
     CodecFactory_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         CodecFactory
@@ -440,58 +439,58 @@ namespace IOP
     CodecFactory_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODECFACTORY_CH_)
 #define _IOP_CODECFACTORY_CH_
-
+  
   class TAO_Export CodecFactory
     : public virtual CORBA::Object
   {
   public:
     typedef CodecFactory_ptr _ptr_type;
     typedef CodecFactory_var _var_type;
-
+    
     // The static operations.
     static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
-
+    
     static CodecFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static CodecFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static CodecFactory_ptr _nil (void)
     {
       return (CodecFactory_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
 #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
-
+    
     class TAO_Export UnknownEncoding : public CORBA::UserException
     {
     public:
-
+      
       UnknownEncoding (void);
       UnknownEncoding (const UnknownEncoding &);
       ~UnknownEncoding (void);
 
       UnknownEncoding &operator= (const UnknownEncoding &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static UnknownEncoding *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -503,28 +502,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_UnknownEncoding;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::Codec_ptr create_codec (
         const IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -533,36 +532,36 @@ namespace IOP
         CORBA::SystemException
         , IOP::CodecFactory::UnknownEncoding
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     CodecFactory (void);
-
+    
     virtual ~CodecFactory (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     CodecFactory (const CodecFactory &);
-
+    
     void operator= (const CodecFactory &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory;
 
 // TAO_IDL - Generated from
@@ -579,18 +578,18 @@ namespace TAO
 
 #if !defined (_IOP_CODEC__TRAITS_CH_)
 #define _IOP_CODEC__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<IOP::Codec>
   {
-    static IOP::Codec_ptr duplicate (
+    static IOP::Codec_ptr tao_duplicate (
         IOP::Codec_ptr
       );
-    static void release (
+    static void tao_release (
         IOP::Codec_ptr
       );
-    static IOP::Codec_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static IOP::Codec_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         IOP::Codec_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -600,18 +599,18 @@ namespace TAO
 
 #if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
 #define _IOP_CODECFACTORY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<IOP::CodecFactory>
   {
-    static IOP::CodecFactory_ptr duplicate (
+    static IOP::CodecFactory_ptr tao_duplicate (
         IOP::CodecFactory_ptr
       );
-    static void release (
+    static void tao_release (
         IOP::CodecFactory_ptr
       );
-    static IOP::CodecFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static IOP::CodecFactory_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         IOP::CodecFactory_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -698,3 +697,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc
index 5141059d624..ae14f21d80e 100644
--- a/TAO/tao/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, portableserver, objreftemplate, core {
+project : taolib, objreftemplate, core {
   sharedname    = TAO_IORInterceptor
   dynamicflags  = TAO_IORINTERCEPTOR_BUILD_DLL
 
@@ -22,8 +22,4 @@ project : taolib, portableserver, objreftemplate, core {
   Resource_Files {
     IORInterceptor
   }
-
-  PIDL_Files {
-    IORInterceptor
-  }
 }
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl
index 1013e104599..2c466dd0e49 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor.pidl
+++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl
@@ -10,7 +10,7 @@
  *
  * The following is from orbos/99-12-02 Portable Interceptors spec,
  * the full IDL is downloadable from orbos/99-12-02. This file contains
- * interfaces from PortableInterceptor.idl that depend on
+ * interfaces from PortableInterceptor.idl that depend on 
  * ObjectReferenceFactory and ObjectReferenceTemplate, which inherit
  * directly or indirectly from CORBA::ValueBase. This separate file
  * has been created to remove the dependency from the rest of module
@@ -27,6 +27,9 @@
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          IORInterceptor.pidl
+ *
+ * Patches for changes to the generated code are available in the
+ * `diffs' directory.
  */
 
 // File: IORInterceptor.idl
@@ -34,21 +37,40 @@
 #define _IOR_INTERCEPTOR_IDL_
 
 #include "tao/PortableInterceptor.pidl"
-#include "tao/IORInterceptor/IORInfo.pidl"
 #include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
 
-module PortableInterceptor
+module PortableInterceptor 
 {
   typeprefix PortableInterceptor "omg.org";
 
-  local interface IORInterceptor : Interceptor
+  local interface IORInfo 
+  {
+    CORBA::Policy get_effective_policy (in CORBA::PolicyType type);
+
+    void add_ior_component (in IOP::TaggedComponent a_component);
+
+    void add_ior_component_to_profile (
+        in IOP::TaggedComponent a_component,
+        in IOP::ProfileId profile_id
+      );
+
+    readonly attribute AdapterManagerId manager_id;
+
+    readonly attribute AdapterState state;
+
+    readonly attribute ObjectReferenceTemplate adapter_template;
+
+    attribute ObjectReferenceFactory current_factory;
+  };
+
+  local interface IORInterceptor : Interceptor 
   {
     void establish_components (in IORInfo info);
 
     void components_established (in IORInfo info);
 
     void adapter_manager_state_changed (
-        in AdapterManagerId id,
+        in AdapterManagerId id, 
         in AdapterState state
       );
     void adapter_state_changed (
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index be51db89f4b..c839e820eac 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -26,11 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303
+// be\be_codegen.cpp:323
 
 
 #include "IORInterceptorC.h"
 #include "tao/CDR.h"
+#include "tao/Object_Argument_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -38,26 +39,180 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IORInterceptorC.inl"
+#include "IORInterceptorC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
 {
+
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceFactory>
+    : public
+        Object_Arg_Traits_T<
+            PortableInterceptor::ObjectReferenceFactory *,
+            PortableInterceptor::ObjectReferenceFactory_var,
+            PortableInterceptor::ObjectReferenceFactory_out,
+            TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
 }
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableInterceptor::IORInfo.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableInterceptor::IORInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_duplicate (
+    PortableInterceptor::IORInfo_ptr p
+  )
+{
+  return PortableInterceptor::IORInfo::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_release (
+    PortableInterceptor::IORInfo_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableInterceptor::IORInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_nil (void)
+{
+  return PortableInterceptor::IORInfo::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_marshal (
+    PortableInterceptor::IORInfo_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableInterceptor__TAO_IORInfo_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+PortableInterceptor::IORInfo::IORInfo (void)
+{}
+
+PortableInterceptor::IORInfo::~IORInfo (void)
+{}
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return IORInfo::_nil ();
+    }
+  
+  IORInfo_ptr proxy =
+    dynamic_cast<IORInfo_ptr> (_tao_objref);
+  
+  return IORInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return IORInfo::_nil ();
+    }
+  
+  IORInfo_ptr proxy =
+    dynamic_cast<IORInfo_ptr> (_tao_objref);
+  
+  return IORInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableInterceptor::IORInfo::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableInterceptor/IORInfo:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/IORInfo:1.0";
+}
+
+CORBA::Boolean
+PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::IORInterceptor.
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::IORInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_duplicate (
     PortableInterceptor::IORInterceptor_ptr p
   )
 {
@@ -66,7 +221,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::release (
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_release (
     PortableInterceptor::IORInterceptor_ptr p
   )
 {
@@ -75,14 +230,14 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::IORInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_nil (void)
 {
   return PortableInterceptor::IORInterceptor::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal (
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_marshal (
     PortableInterceptor::IORInterceptor_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -91,7 +246,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*PortableInterceptor__TAO_IORInterceptor_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -112,10 +267,10 @@ PortableInterceptor::IORInterceptor::_narrow (
     {
       return IORInterceptor::_nil ();
     }
-
+  
   IORInterceptor_ptr proxy =
     dynamic_cast<IORInterceptor_ptr> (_tao_objref);
-
+  
   return IORInterceptor::_duplicate (proxy);
 }
 
@@ -129,10 +284,10 @@ PortableInterceptor::IORInterceptor::_unchecked_narrow (
     {
       return IORInterceptor::_nil ();
     }
-
+  
   IORInterceptor_ptr proxy =
     dynamic_cast<IORInterceptor_ptr> (_tao_objref);
-
+  
   return IORInterceptor::_duplicate (proxy);
 }
 
@@ -143,7 +298,7 @@ PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -192,7 +347,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -205,12 +360,45 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         PortableInterceptor::IORInterceptor
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::IORInterceptor
       >;
 
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_
+
+  template class
+     TAO::Arg_Traits<
+        PortableInterceptor::ObjectReferenceFactory
+      >;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableInterceptor::ObjectReferenceFactory *,
+        PortableInterceptor::ObjectReferenceFactory_var,
+        PortableInterceptor::ObjectReferenceFactory_out,
+        TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> 
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Objref_Traits<
+        PortableInterceptor::IORInfo
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::IORInfo
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::IORInfo
+      >;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -222,10 +410,44 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         PortableInterceptor::IORInterceptor
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::IORInterceptor
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate \
+     TAO::Arg_Traits< \
+        PortableInterceptor::ObjectReferenceFactory \
+      >
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableInterceptor::ObjectReferenceFactory *, \
+        PortableInterceptor::ObjectReferenceFactory_var, \
+        PortableInterceptor::ObjectReferenceFactory_out, \
+        TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory>  \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableInterceptor::IORInfo \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::IORInfo
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::IORInfo
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index e7e07e8f806..8dce343deac 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -26,28 +26,25 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_
 #define _TAO_IDL_ORIG_IORINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
-
-#include "ace/config-all.h"
+#include "tao/ORB.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "iorinterceptor_export.h"
-#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PortableInterceptorC.h"
-#include "tao/IORInterceptor/IORInfoC.h"
 #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -73,38 +70,205 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:611
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_
+  
+  class IORInfo;
+  typedef IORInfo *IORInfo_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        IORInfo
+      >
+    IORInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        IORInfo
+      >
+    IORInfo_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
+#define _PORTABLEINTERCEPTOR_IORINFO_CH_
+  
+  class TAO_IORInterceptor_Export IORInfo
+    : public virtual CORBA::Object
+  {
+  public:
+    typedef IORInfo_ptr _ptr_type;
+    typedef IORInfo_var _var_type;
+    
+    // The static operations.
+    static IORInfo_ptr _duplicate (IORInfo_ptr obj);
+    
+    static IORInfo_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static IORInfo_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static IORInfo_ptr _nil (void)
+    {
+      return (IORInfo_ptr)0;
+    }
+    
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr get_effective_policy (
+        CORBA::PolicyType type
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void add_ior_component (
+        const IOP::TaggedComponent & a_component
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void add_ior_component_to_profile (
+        const IOP::TaggedComponent & a_component,
+        IOP::ProfileId profile_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual PortableInterceptor::AdapterManagerId manager_id (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual PortableInterceptor::AdapterState state (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void current_factory (
+        PortableInterceptor::ObjectReferenceFactory * current_factory
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
+  protected:
+    // Abstract or local interface only.
+    IORInfo (void);
+    
+    virtual ~IORInfo (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    IORInfo (const IORInfo &);
+    
+    void operator= (const IORInfo &);
+  };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613
+  // be\be_interface.cpp:611
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
-
+  
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         IORInterceptor
       >
     IORInterceptor_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         IORInterceptor
@@ -112,119 +276,119 @@ namespace PortableInterceptor
     IORInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
-
+  
   class TAO_IORInterceptor_Export IORInterceptor
-    : public virtual ::PortableInterceptor::Interceptor
+    : public virtual PortableInterceptor::Interceptor
   {
   public:
     typedef IORInterceptor_ptr _ptr_type;
     typedef IORInterceptor_var _var_type;
-
+    
     // The static operations.
     static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
-
+    
     static IORInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInterceptor_ptr _nil (void)
     {
       return (IORInterceptor_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void establish_components (
-        ::PortableInterceptor::IORInfo_ptr info
+        PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void components_established (
-        ::PortableInterceptor::IORInfo_ptr info
+        PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void adapter_manager_state_changed (
-        ::PortableInterceptor::AdapterManagerId id,
-        ::PortableInterceptor::AdapterState state
+        PortableInterceptor::AdapterManagerId id,
+        PortableInterceptor::AdapterState state
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void adapter_state_changed (
-        const ::PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-        ::PortableInterceptor::AdapterState state
+        const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
+        PortableInterceptor::AdapterState state
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     IORInterceptor (void);
-
+    
     virtual ~IORInterceptor (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     IORInterceptor (const IORInterceptor &);
-
+    
     void operator= (const IORInterceptor &);
   };
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -232,19 +396,40 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_IORInterceptor_Export Objref_Traits<PortableInterceptor::IORInterceptor>
+  {
+    static PortableInterceptor::IORInterceptor_ptr tao_duplicate (
+        PortableInterceptor::IORInterceptor_ptr
+      );
+    static void tao_release (
+        PortableInterceptor::IORInterceptor_ptr
+      );
+    static PortableInterceptor::IORInterceptor_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        PortableInterceptor::IORInterceptor_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
 
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
+  struct TAO_IORInterceptor_Export Objref_Traits<PortableInterceptor::IORInfo>
   {
-    static ::PortableInterceptor::IORInterceptor_ptr duplicate (
-        ::PortableInterceptor::IORInterceptor_ptr
+    static PortableInterceptor::IORInfo_ptr tao_duplicate (
+        PortableInterceptor::IORInfo_ptr
       );
-    static void release (
-        ::PortableInterceptor::IORInterceptor_ptr
+    static void tao_release (
+        PortableInterceptor::IORInfo_ptr
       );
-    static ::PortableInterceptor::IORInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::IORInterceptor_ptr p,
+    static PortableInterceptor::IORInfo_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        PortableInterceptor::IORInfo_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -253,10 +438,10 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
-#include "IORInterceptorC.inl"
+#include "IORInterceptorC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -270,3 +455,4 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.i b/TAO/tao/IORInterceptor/IORInterceptorC.i
new file mode 100644
index 00000000000..38aa32569ba
--- /dev/null
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.i
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index 39bf2af372e..2fa56bf2766 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -16,7 +16,7 @@ TAO_IORInterceptor_Adapter * TAO_IORInterceptor_Adapter_Factory_Impl::create (
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_IORInterceptor_Adapter_Impl * new_iorinterceptor_adapter = 0;
+  TAO_IORInterceptor_Adapter_Impl * new_iorinterceptor_adapter;
   ACE_NEW_RETURN (new_iorinterceptor_adapter,
                   TAO_IORInterceptor_Adapter_Impl,
                   0);
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index ecd898772e8..727319bb0e7 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -1,10 +1,7 @@
 // $Id$
 
 #include "IORInterceptor_Adapter_Impl.h"
-#include "IORInfo.h"
 #include "tao/debug.h"
-#include "tao/ORB_Constants.h"
-#include "tao/PortableServer/POA.h"
 
 ACE_RCSID (IORInterceptor,
            IORInterceptor_Adapter_Impl,
@@ -80,162 +77,3 @@ TAO_IORInterceptor_Adapter_Impl::interceptor_list (void)
 {
   return &this->ior_interceptor_list_;
 }
-
-void
-TAO_IORInterceptor_Adapter_Impl::establish_components (
-  TAO_POA* poa
-  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_IORInterceptor_List::TYPE & interceptors =
-    this->ior_interceptor_list_.interceptors ();
-
-  const size_t interceptor_count = interceptors.size ();
-
-  if (interceptor_count == 0)
-    return;
-
-  TAO_IORInfo *tao_info = 0;
-  ACE_NEW_THROW_EX (tao_info,
-                    TAO_IORInfo (poa),
-                    CORBA::NO_MEMORY (
-                       CORBA::SystemException::_tao_minor_code (
-                          TAO_DEFAULT_MINOR_CODE,
-                          ENOMEM),
-                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  PortableInterceptor::IORInfo_var info = tao_info;
-
-  // Release the POA during IORInterceptor calls to avoid potential
-  // deadlocks.
-  TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*poa);
-  ACE_UNUSED_ARG (non_servant_upcall);
-
-  for (size_t i = 0; i < interceptor_count; ++i)
-    {
-      ACE_TRY
-        {
-          interceptors[i]->establish_components (info.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          // According to the Portable Interceptors specification,
-          // IORInterceptor::establish_components() must not throw an
-          // exception.  If it does, then the ORB is supposed to
-          // ignore it and continue processing the remaining
-          // IORInterceptors.
-          if (TAO_debug_level > 1)
-            {
-              CORBA::String_var name = interceptors[i]->name (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-              // @@ What do we do if we get an exception here?
-
-              if (name.in () != 0)
-                {
-                  ACE_DEBUG ((LM_WARNING,
-                              "(%P|%t) Exception thrown while processing "
-                              "IORInterceptor \"%s\">\n",
-                              ACE_TEXT_CHAR_TO_TCHAR (name.in ())));
-                }
-
-              ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "Ignoring exception in "
-                                       "IORInterceptor::establish_components");
-            }
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-
-  tao_info->components_established ();
-
-  this->components_established (info.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // The IORInfo instance is no longer valid.  Invalidate it to
-  // prevent the user from peforming "illegal" operations.
-  tao_info->invalidate ();
-}
-
-void
-TAO_IORInterceptor_Adapter_Impl::components_established (
-  PortableInterceptor::IORInfo_ptr info
-  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Iterate over the registered IOR interceptors so that they may be
-  // given the opportunity to add tagged components to the profiles
-  // for this servant.
-  TAO_IORInterceptor_List::TYPE & interceptors =
-    this->ior_interceptor_list_.interceptors ();
-
-  const size_t interceptor_count = interceptors.size ();
-
-  // All the establish_components() interception points have been
-  // invoked. Now call the components_established() interception point
-  // on all the IORInterceptors.
-  for (size_t j = 0; j < interceptor_count; ++j)
-    {
-      ACE_TRY
-        {
-          interceptors[j]->components_established (
-            info
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6,
-                                         CORBA::COMPLETED_NO));
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
-      const TAO_ObjectReferenceTemplate_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->ior_interceptor_list_.adapter_state_changed (
-    array_obj_ref_template,
-    state
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
-      PortableInterceptor::AdapterManagerId id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  /// Whenever the POAManager state is changed, the
-  /// adapter_manager_state_changed method is to be invoked on all the IOR
-  ///  Interceptors.
-  TAO_IORInterceptor_List::TYPE & interceptors =
-    this->ior_interceptor_list_.interceptors ();
-
-  const size_t interceptor_count = interceptors.size ();
-
-  if (interceptor_count == 0)
-    return;
-
-  for (size_t i = 0; i < interceptor_count; ++i)
-    {
-      interceptors[i]->adapter_manager_state_changed (
-        id,
-        state
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 8a4a7f82b6f..160476a9949 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -27,8 +27,6 @@
 #include "ace/Service_Config.h"
 #include "IORInterceptor_List.h"
 
-class TAO_POA;
-
 /**
  * @class TAO_IORInterceptor_Adapter_Impl
  *
@@ -44,6 +42,7 @@ class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Impl
 public:
   virtual ~TAO_IORInterceptor_Adapter_Impl (void);
 
+
   virtual void add_interceptor (PortableInterceptor::IORInterceptor_ptr interceptor
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -54,28 +53,8 @@ public:
   virtual TAO_IORInterceptor_List *interceptor_list (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void establish_components (TAO_POA *poa ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Call the IORInterceptor::components_established() method on all
-  /// registered IORInterceptors.
-  virtual void components_established (PortableInterceptor::IORInfo_ptr info
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void adapter_state_changed (
-      const TAO_ObjectReferenceTemplate_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void adapter_manager_state_changed (
-      PortableInterceptor::AdapterManagerId id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
 private:
+
   /// List of IOR interceptors maintained
   TAO_IORInterceptor_List ior_interceptor_list_;
 };
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_List.cpp b/TAO/tao/IORInterceptor/IORInterceptor_List.cpp
index debefc5ac8b..d31f6348adc 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_List.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_List.cpp
@@ -52,41 +52,6 @@ TAO_IORInterceptor_List::add_interceptor (
     PortableInterceptor::IORInterceptor::_duplicate (interceptor);
 }
 
-void
-TAO_IORInterceptor_List::adapter_state_changed (
-  const TAO::ORT_Array &array_obj_ref_template,
-  PortableInterceptor::AdapterState state
-  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  const size_t interceptor_count = this->interceptors_.size ();
-
-  if (interceptor_count == 0)
-    return;
-
-  PortableInterceptor::ObjectReferenceTemplateSeq seq_obj_ref_template;
-
-  seq_obj_ref_template.length (array_obj_ref_template.size());
-
-  for (size_t counter = 0; counter < array_obj_ref_template.size(); ++counter)
-    {
-      PortableInterceptor::ObjectReferenceTemplate *member =
-        array_obj_ref_template[counter];
-
-      CORBA::add_ref (member);
-
-      seq_obj_ref_template[counter] = member;
-    }
-
-  for (size_t i = 0; i < interceptor_count; ++i)
-    {
-      this->interceptors_[i]->adapter_state_changed (seq_obj_ref_template,
-                                                     state
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_List.h b/TAO/tao/IORInterceptor/IORInterceptor_List.h
index 05bd4f9d3c5..3d77e7aec7a 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_List.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_List.h
@@ -24,7 +24,6 @@
 #include "IORInterceptorC.h"
 
 #include "tao/Interceptor_List.h"
-#include "tao/PortableServer/ORT_Adapter.h"
 
 /**
  * @class TAO_IORInterceptor_List
@@ -54,12 +53,6 @@ public:
   /// Return reference to the underlying Portable Interceptor array.
   TYPE & interceptors (void);
 
-  void adapter_state_changed (
-      const TAO::ORT_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
 protected:
 
   /// Return the length of the underlying interceptor array.
@@ -68,13 +61,14 @@ protected:
   /// Set the length of the underlying interceptor array.
   virtual void length (size_t);
 
-  /// Return the interceptor in array element @a index.
-  virtual PortableInterceptor::Interceptor_ptr interceptor (size_t index);
+  /// Return the interceptor in array element <index>.
+  virtual PortableInterceptor::Interceptor_ptr interceptor (size_t);
 
 private:
 
   /// Dynamic array of registered IOR interceptors.
   TYPE interceptors_;
+
 };
 
 
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index 8ab77cbb616..786e0e14141 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -16,14 +16,12 @@
 
 #include /**/ "ace/pre.h"
 #include "ace/Service_Object.h"
-#include "ace/Array_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
-#include "tao/PI_ForwardC.h"
+#include "tao/Exception.h"
 
 namespace PortableInterceptor
 {
@@ -31,17 +29,9 @@ namespace PortableInterceptor
   typedef Interceptor *Interceptor_ptr;
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
-  class IORInfo;
-  typedef IORInfo *IORInfo_ptr;
-  class ObjectReferenceTemplate;
 }
 
-typedef
-ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*>
-    TAO_ObjectReferenceTemplate_Array;
-
 class TAO_IORInterceptor_List;
-class TAO_POA;
 
 /**
  * @class TAO_IORInterceptor_Adapter
@@ -71,34 +61,6 @@ public:
   virtual TAO_IORInterceptor_List *interceptor_list (void)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
-  /// Call the IORInterceptor::establish_components() method on all
-  /// registered IORInterceptors.
-  /**
-   * This method calls IORInterceptor::establish_components() method
-   * on all registered IORInterceptors, and
-   * IORInterceptor::components_established() once the former is
-   * completed.
-   */
-  virtual void establish_components (TAO_POA *poa ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  /// Call the IORInterceptor::components_established() method on all
-  /// registered IORInterceptors.
-  virtual void components_established (PortableInterceptor::IORInfo_ptr info
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual void adapter_state_changed (
-      const TAO_ObjectReferenceTemplate_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual void adapter_manager_state_changed (
-      PortableInterceptor::AdapterManagerId id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h
index e56e7994296..5b030bd87af 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.h
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 class TAO_IORInterceptor_Adapter;
 
@@ -34,7 +34,7 @@ class TAO_IORInterceptor_Adapter;
  * ORB on the ORB's first usage of its ior_interceptor_adapter_. This is a base
  * class for the actual implementation in the TAO_IORInterceptor library.
  */
-class TAO_Export TAO_IORInterceptor_Adapter_Factory
+class TAO_Export TAO_IORInterceptor_Adapter_Factory 
   : public ACE_Service_Object
 {
 public:
diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc
index 37f3b5cead9..91ff9430e0a 100644
--- a/TAO/tao/IORManipulation.mpc
+++ b/TAO/tao/IORManipulation.mpc
@@ -22,8 +22,4 @@ project : taolib, core {
   Resource_Files {
     IORManipulation
   }
-
-  PIDL_Files {
-    IORManipulation
-  }
 }
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index d579c25af93..420a5348e22 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -613,7 +613,7 @@ CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 TAO_IOP::TAO_IOR_Property_ptr
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::duplicate (
+TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_duplicate (
     TAO_IOP::TAO_IOR_Property_ptr p
   )
 {
@@ -622,7 +622,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::release (
+TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_release (
     TAO_IOP::TAO_IOR_Property_ptr p
   )
 {
@@ -631,14 +631,14 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 TAO_IOP::TAO_IOR_Property_ptr
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::nil (void)
+TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_nil (void)
 {
   return TAO_IOP::TAO_IOR_Property::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::marshal (
+TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_marshal (
     TAO_IOP::TAO_IOR_Property_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -758,7 +758,7 @@ TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::duplicate (
+TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_duplicate (
     TAO_IOP::TAO_IOR_Manipulation_ptr p
   )
 {
@@ -767,7 +767,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::release (
+TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_release (
     TAO_IOP::TAO_IOR_Manipulation_ptr p
   )
 {
@@ -776,14 +776,14 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::nil (void)
+TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_nil (void)
 {
   return TAO_IOP::TAO_IOR_Manipulation::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::marshal (
+TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_marshal (
     TAO_IOP::TAO_IOR_Manipulation_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1207,3 +1207,4 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 6ff36e7447c..eab5475bb6d 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -74,13 +74,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -90,25 +90,25 @@ namespace TAO
 
 namespace TAO_IOP
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_)
 #define _TAO_IOP_EMPTYPROFILELIST_CH_
-
+  
   class TAO_IORManip_Export EmptyProfileList : public CORBA::UserException
   {
   public:
-
+    
     EmptyProfileList (void);
     EmptyProfileList (const EmptyProfileList &);
     ~EmptyProfileList (void);
 
     EmptyProfileList &operator= (const EmptyProfileList &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static EmptyProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -120,43 +120,43 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmptyProfileList;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_NOTFOUND_CH_)
 #define _TAO_IOP_NOTFOUND_CH_
-
+  
   class TAO_IORManip_Export NotFound : public CORBA::UserException
   {
   public:
-
+    
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -168,43 +168,43 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_DUPLICATE_CH_)
 #define _TAO_IOP_DUPLICATE_CH_
-
+  
   class TAO_IORManip_Export Duplicate : public CORBA::UserException
   {
   public:
-
+    
     Duplicate (void);
     Duplicate (const Duplicate &);
     ~Duplicate (void);
 
     Duplicate &operator= (const Duplicate &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static Duplicate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -216,43 +216,43 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Duplicate;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_INVALID_IOR_CH_)
 #define _TAO_IOP_INVALID_IOR_CH_
-
+  
   class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException
   {
   public:
-
+    
     Invalid_IOR (void);
     Invalid_IOR (const Invalid_IOR &);
     ~Invalid_IOR (void);
 
     Invalid_IOR &operator= (const Invalid_IOR &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static Invalid_IOR *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -264,43 +264,43 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Invalid_IOR;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
 #define _TAO_IOP_MULTIPROFILELIST_CH_
-
+  
   class TAO_IORManip_Export MultiProfileList : public CORBA::UserException
   {
   public:
-
+    
     MultiProfileList (void);
     MultiProfileList (const MultiProfileList &);
     ~MultiProfileList (void);
 
     MultiProfileList &operator= (const MultiProfileList &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static MultiProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -312,40 +312,40 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_
-
+  
   class TAO_IOR_Property;
   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TAO_IOR_Property
       >
     TAO_IOR_Property_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TAO_IOR_Property
@@ -353,43 +353,43 @@ namespace TAO_IOP
     TAO_IOR_Property_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Property
     : public virtual CORBA::Object
   {
   public:
     typedef TAO_IOR_Property_ptr _ptr_type;
     typedef TAO_IOR_Property_var _var_type;
-
+    
     // The static operations.
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
-
+    
     static TAO_IOR_Property_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _nil (void)
     {
       return (TAO_IOR_Property_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_property (
         CORBA::Object_ptr & ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -398,10 +398,10 @@ namespace TAO_IOP
         CORBA::SystemException
         , TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_primary (
         CORBA::Object_ptr & ior1,
         CORBA::Object_ptr ior2
@@ -412,10 +412,10 @@ namespace TAO_IOP
         , TAO_IOP::Duplicate
         , TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr get_primary (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -424,10 +424,10 @@ namespace TAO_IOP
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean is_primary_set (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -435,10 +435,10 @@ namespace TAO_IOP
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean remove_primary_tag (
         CORBA::Object_ptr & iogr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -447,53 +447,53 @@ namespace TAO_IOP
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     TAO_IOR_Property (void);
-
+    
     virtual ~TAO_IOR_Property (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TAO_IOR_Property (const TAO_IOR_Property &);
-
+    
     void operator= (const TAO_IOR_Property &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Property;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_
-
+  
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TAO_IOR_Manipulation
       >
     TAO_IOR_Manipulation_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TAO_IOR_Manipulation
@@ -501,48 +501,48 @@ namespace TAO_IOP
     TAO_IOR_Manipulation_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Manipulation
     : public virtual CORBA::Object
   {
   public:
     typedef TAO_IOR_Manipulation_ptr _ptr_type;
     typedef TAO_IOR_Manipulation_var _var_type;
-
+    
     // The static operations.
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-
+    
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _nil (void)
     {
       return (TAO_IOR_Manipulation_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-
+    
     class IORList;
-
+    
     typedef
       TAO_MngSeq_Var_T<
           IORList,
@@ -551,7 +551,7 @@ namespace TAO_IOP
             >
         >
       IORList_var;
-
+    
     typedef
       TAO_MngSeq_Out_T<
           IORList,
@@ -561,7 +561,7 @@ namespace TAO_IOP
             >
         >
       IORList_out;
-
+    
     class TAO_IORManip_Export IORList
       : public
           TAO_Unbounded_Pseudo_Sequence<
@@ -574,27 +574,27 @@ namespace TAO_IOP
       IORList (
           CORBA::ULong max,
           CORBA::ULong length,
-          CORBA::Object_ptr* buffer,
+          CORBA::Object_ptr* buffer, 
           CORBA::Boolean release = 0
         );
       IORList (const IORList &);
       ~IORList (void);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       typedef IORList_var _var_type;
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_IORList;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr merge_iors (
         const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -605,10 +605,10 @@ namespace TAO_IOP
         , TAO_IOP::Duplicate
         , TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr add_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -620,10 +620,10 @@ namespace TAO_IOP
         , TAO_IOP::Duplicate
         , TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr remove_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -635,10 +635,10 @@ namespace TAO_IOP
         , TAO_IOP::EmptyProfileList
         , TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_property (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -649,10 +649,10 @@ namespace TAO_IOP
         , TAO_IOP::Invalid_IOR
         , TAO_IOP::Duplicate
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior1,
@@ -666,10 +666,10 @@ namespace TAO_IOP
         , TAO_IOP::MultiProfileList
         , TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean remove_primary_tag (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -678,10 +678,10 @@ namespace TAO_IOP
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr get_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -691,10 +691,10 @@ namespace TAO_IOP
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean is_primary_set (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -703,10 +703,10 @@ namespace TAO_IOP
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::ULong is_in_ior (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -716,10 +716,10 @@ namespace TAO_IOP
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::ULong get_profile_count (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -728,36 +728,36 @@ namespace TAO_IOP
         CORBA::SystemException
         , TAO_IOP::EmptyProfileList
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     TAO_IOR_Manipulation (void);
-
+    
     virtual ~TAO_IOR_Manipulation (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
-
+    
     void operator= (const TAO_IOR_Manipulation &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation;
 
 // TAO_IDL - Generated from
@@ -774,18 +774,18 @@ namespace TAO
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IORManip_Export Objref_Traits<TAO_IOP::TAO_IOR_Property>
   {
-    static TAO_IOP::TAO_IOR_Property_ptr duplicate (
+    static TAO_IOP::TAO_IOR_Property_ptr tao_duplicate (
         TAO_IOP::TAO_IOR_Property_ptr
       );
-    static void release (
+    static void tao_release (
         TAO_IOP::TAO_IOR_Property_ptr
       );
-    static TAO_IOP::TAO_IOR_Property_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static TAO_IOP::TAO_IOR_Property_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         TAO_IOP::TAO_IOR_Property_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -795,18 +795,18 @@ namespace TAO
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IORManip_Export Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>
   {
-    static TAO_IOP::TAO_IOR_Manipulation_ptr duplicate (
+    static TAO_IOP::TAO_IOR_Manipulation_ptr tao_duplicate (
         TAO_IOP::TAO_IOR_Manipulation_ptr
       );
-    static void release (
+    static void tao_release (
         TAO_IOP::TAO_IOR_Manipulation_ptr
       );
-    static TAO_IOP::TAO_IOR_Manipulation_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static TAO_IOP::TAO_IOR_Manipulation_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         TAO_IOP::TAO_IOR_Manipulation_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -925,3 +925,4 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc
index 439e11e52a5..7ad2b70055b 100644
--- a/TAO/tao/IORTable.mpc
+++ b/TAO/tao/IORTable.mpc
@@ -22,8 +22,4 @@ project : taolib, core {
   Resource_Files {
     IORTable
   }
-
-  PIDL_Files {
-    IORTable
-  }
 }
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index 2ee31f9dcb2..1984a986857 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -31,7 +31,6 @@
 
 #include "IORTableC.h"
 #include "tao/CDR.h"
-#include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -51,7 +50,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IORTable::AlreadyBound::AlreadyBound (void)
@@ -127,7 +126,7 @@ void IORTable::AlreadyBound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -140,13 +139,13 @@ void IORTable::AlreadyBound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IORTable::NotFound::NotFound (void)
@@ -222,7 +221,7 @@ void IORTable::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -235,7 +234,7 @@ void IORTable::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -248,7 +247,7 @@ void IORTable::NotFound::_tao_decode (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IORTable::Table_ptr
-TAO::Objref_Traits<IORTable::Table>::duplicate (
+TAO::Objref_Traits<IORTable::Table>::tao_duplicate (
     IORTable::Table_ptr p
   )
 {
@@ -257,7 +256,7 @@ TAO::Objref_Traits<IORTable::Table>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<IORTable::Table>::release (
+TAO::Objref_Traits<IORTable::Table>::tao_release (
     IORTable::Table_ptr p
   )
 {
@@ -266,14 +265,14 @@ TAO::Objref_Traits<IORTable::Table>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IORTable::Table_ptr
-TAO::Objref_Traits<IORTable::Table>::nil (void)
+TAO::Objref_Traits<IORTable::Table>::tao_nil (void)
 {
   return IORTable::Table::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<IORTable::Table>::marshal (
+TAO::Objref_Traits<IORTable::Table>::tao_marshal (
     IORTable::Table_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -282,7 +281,7 @@ TAO::Objref_Traits<IORTable::Table>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*IORTable__TAO_Table_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -303,10 +302,10 @@ IORTable::Table::_narrow (
     {
       return Table::_nil ();
     }
-
+  
   Table_ptr proxy =
     dynamic_cast<Table_ptr> (_tao_objref);
-
+  
   return Table::_duplicate (proxy);
 }
 
@@ -320,10 +319,10 @@ IORTable::Table::_unchecked_narrow (
     {
       return Table::_nil ();
     }
-
+  
   Table_ptr proxy =
     dynamic_cast<Table_ptr> (_tao_objref);
-
+  
   return Table::_duplicate (proxy);
 }
 
@@ -334,7 +333,7 @@ IORTable::Table::_duplicate (Table_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -385,7 +384,7 @@ IORTable::Table::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IORTable::Locator_ptr
-TAO::Objref_Traits<IORTable::Locator>::duplicate (
+TAO::Objref_Traits<IORTable::Locator>::tao_duplicate (
     IORTable::Locator_ptr p
   )
 {
@@ -394,7 +393,7 @@ TAO::Objref_Traits<IORTable::Locator>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<IORTable::Locator>::release (
+TAO::Objref_Traits<IORTable::Locator>::tao_release (
     IORTable::Locator_ptr p
   )
 {
@@ -403,14 +402,14 @@ TAO::Objref_Traits<IORTable::Locator>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IORTable::Locator_ptr
-TAO::Objref_Traits<IORTable::Locator>::nil (void)
+TAO::Objref_Traits<IORTable::Locator>::tao_nil (void)
 {
   return IORTable::Locator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<IORTable::Locator>::marshal (
+TAO::Objref_Traits<IORTable::Locator>::tao_marshal (
     IORTable::Locator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -419,7 +418,7 @@ TAO::Objref_Traits<IORTable::Locator>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*IORTable__TAO_Locator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -440,10 +439,10 @@ IORTable::Locator::_narrow (
     {
       return Locator::_nil ();
     }
-
+  
   Locator_ptr proxy =
     dynamic_cast<Locator_ptr> (_tao_objref);
-
+  
   return Locator::_duplicate (proxy);
 }
 
@@ -457,10 +456,10 @@ IORTable::Locator::_unchecked_narrow (
     {
       return Locator::_nil ();
     }
-
+  
   Locator_ptr proxy =
     dynamic_cast<Locator_ptr> (_tao_objref);
-
+  
   return Locator::_duplicate (proxy);
 }
 
@@ -471,7 +470,7 @@ IORTable::Locator::_duplicate (Locator_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -583,7 +582,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         IORTable::Locator
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         IORTable::Locator
@@ -598,7 +597,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         IORTable::Table
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         IORTable::Table
@@ -615,7 +614,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         IORTable::Locator
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         IORTable::Locator
@@ -630,10 +629,11 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         IORTable::Table
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         IORTable::Table
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index 8b22ddb0d82..4db02def81f 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -41,8 +41,7 @@
 
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/SystemException.h"
-#include "tao/UserException.h"
+#include "tao/Exception.h"
 #include "tao/Objref_VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -68,13 +67,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -84,22 +83,22 @@ namespace TAO
 
 namespace IORTable
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_IORTABLE_LOCATOR__VAR_OUT_CH_)
 #define _IORTABLE_LOCATOR__VAR_OUT_CH_
-
+  
   class Locator;
   typedef Locator *Locator_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Locator
       >
     Locator_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Locator
@@ -107,23 +106,23 @@ namespace IORTable
     Locator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IORTABLE_ALREADYBOUND_CH_)
 #define _IORTABLE_ALREADYBOUND_CH_
-
+  
   class TAO_IORTable_Export AlreadyBound : public CORBA::UserException
   {
   public:
-
+    
     AlreadyBound (void);
     AlreadyBound (const AlreadyBound &);
     ~AlreadyBound (void);
 
     AlreadyBound &operator= (const AlreadyBound &);
-
+    
     static AlreadyBound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -135,34 +134,34 @@ namespace IORTable
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IORTABLE_NOTFOUND_CH_)
 #define _IORTABLE_NOTFOUND_CH_
-
+  
   class TAO_IORTable_Export NotFound : public CORBA::UserException
   {
   public:
-
+    
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -174,33 +173,33 @@ namespace IORTable
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_IORTABLE_TABLE__VAR_OUT_CH_)
 #define _IORTABLE_TABLE__VAR_OUT_CH_
-
+  
   class Table;
   typedef Table *Table_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Table
       >
     Table_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Table
@@ -208,43 +207,43 @@ namespace IORTable
     Table_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IORTABLE_TABLE_CH_)
 #define _IORTABLE_TABLE_CH_
-
+  
   class TAO_IORTable_Export Table
     : public virtual CORBA::Object
   {
   public:
     typedef Table_ptr _ptr_type;
     typedef Table_var _var_type;
-
+    
     // The static operations.
     static Table_ptr _duplicate (Table_ptr obj);
-
+    
     static Table_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Table_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Table_ptr _nil (void)
     {
       return (Table_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void bind (
         const char * object_key,
         const char * IOR
@@ -254,10 +253,10 @@ namespace IORTable
         CORBA::SystemException
         , IORTable::AlreadyBound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void rebind (
         const char * object_key,
         const char * IOR
@@ -266,10 +265,10 @@ namespace IORTable
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void unbind (
         const char * object_key
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -278,10 +277,10 @@ namespace IORTable
         CORBA::SystemException
         , IORTable::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_locator (
         IORTable::Locator_ptr the_locator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -289,69 +288,69 @@ namespace IORTable
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Table (void);
-
+    
     virtual ~Table (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Table (const Table &);
-
+    
     void operator= (const Table &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IORTABLE_LOCATOR_CH_)
 #define _IORTABLE_LOCATOR_CH_
-
+  
   class TAO_IORTable_Export Locator
     : public virtual CORBA::Object
   {
   public:
     typedef Locator_ptr _ptr_type;
     typedef Locator_var _var_type;
-
+    
     // The static operations.
     static Locator_ptr _duplicate (Locator_ptr obj);
-
+    
     static Locator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _nil (void)
     {
       return (Locator_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * locate (
         const char * object_key
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -360,28 +359,28 @@ namespace IORTable
         CORBA::SystemException
         , IORTable::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Locator (void);
-
+    
     virtual ~Locator (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Locator (const Locator &);
-
+    
     void operator= (const Locator &);
   };
 
@@ -401,18 +400,18 @@ namespace TAO
 
 #if !defined (_IORTABLE_LOCATOR__TRAITS_CH_)
 #define _IORTABLE_LOCATOR__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IORTable_Export Objref_Traits<IORTable::Locator>
   {
-    static IORTable::Locator_ptr duplicate (
+    static IORTable::Locator_ptr tao_duplicate (
         IORTable::Locator_ptr
       );
-    static void release (
+    static void tao_release (
         IORTable::Locator_ptr
       );
-    static IORTable::Locator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static IORTable::Locator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         IORTable::Locator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -422,18 +421,18 @@ namespace TAO
 
 #if !defined (_IORTABLE_TABLE__TRAITS_CH_)
 #define _IORTABLE_TABLE__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IORTable_Export Objref_Traits<IORTable::Table>
   {
-    static IORTable::Table_ptr duplicate (
+    static IORTable::Table_ptr tao_duplicate (
         IORTable::Table_ptr
       );
-    static void release (
+    static void tao_release (
         IORTable::Table_ptr
       );
-    static IORTable::Table_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static IORTable::Table_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         IORTable::Table_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -472,3 +471,4 @@ TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFoun
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
index 9fa4bbb727a..7ddcb6b28a3 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 namespace CORBA
 {
@@ -47,12 +47,12 @@ public:
   /// The destructor
   virtual ~TAO_IOR_Parser (void);
 
-  /// Return 1 if @a ior_string starts with a prefix known to this IOR
+  /// Return 1 if <ior_string> starts with a prefix known to this IOR
   /// parser
   virtual int match_prefix (const char *ior_string) const = 0;
 
   /**
-   * Parse the @a ior argument and return an object reference.
+   * Parse the <ior> argument and return an object reference.
    * The call may raise the standard system exceptions (NO_MEMORY,
    * INV_OBJREF, etc.)
    */
diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp
index 39bf41fe752..d8d2f4ca80b 100644
--- a/TAO/tao/Interceptor_List.cpp
+++ b/TAO/tao/Interceptor_List.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/Interceptor_List.h"
-#include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
 #include "ace/os_include/os_stddef.h"
 #include "ace/OS_NS_string.h"
@@ -89,7 +88,7 @@ TAO_Interceptor_List::add_interceptor_i (
       ACE_THROW_RETURN (
           CORBA::INV_OBJREF (
               CORBA::SystemException::_tao_minor_code (
-                  0,
+                  TAO_DEFAULT_MINOR_CODE,
                   EINVAL
                 ),
               CORBA::COMPLETED_NO
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 6331f852eca..173782f5ee5 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -1,5 +1,4 @@
 //$Id$
-
 #include "Invocation_Adapter.h"
 #include "Profile_Transport_Resolver.h"
 #include "operation_details.h"
@@ -21,6 +20,7 @@ ACE_RCSID (tao,
            Invocation_Adapter,
            "$Id$")
 
+
 namespace TAO
 {
   void
@@ -163,10 +163,9 @@ namespace TAO
                                     details,
                                     this->type_ == TAO_TWOWAY_INVOCATION);
 
-    status =
-      coll_inv.invoke (this->cpb_,
-                       strat
-                       ACE_ENV_ARG_PARAMETER);
+    status = coll_inv.invoke (this->cpb_,
+                              strat
+                              ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
     if (status == TAO_INVOKE_RESTART &&
@@ -184,41 +183,6 @@ namespace TAO
     return status;
   }
 
-  void
-  Invocation_Adapter::set_response_flags (
-    TAO_Stub *stub,
-    TAO_Operation_Details &details)
-  {
-    switch (this->type_)
-      {
-      case TAO_ONEWAY_INVOCATION:
-        {
-          // Grab the syncscope policy from the ORB.
-          Messaging::SyncScope sync_scope;
-    
-          bool has_synchronization = false;
-
-          stub->orb_core ()->call_sync_scope_hook (stub,
-                                                   has_synchronization,
-                                                   sync_scope);
-          if (has_synchronization)
-            details.response_flags (CORBA::Octet (sync_scope));
-          else
-            details.response_flags (
-              CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT));
-          break;
-        }
-      case TAO_TWOWAY_INVOCATION:
-        {
-          // @@note: Need to change this to something better. Too many
-          // hash defines meaning the same things.
-          details.response_flags (TAO_TWOWAY_RESPONSE_FLAG);
-          break;
-        }
-      }
-
-    return;
-  }
 
   Invocation_Status
   Invocation_Adapter::invoke_remote_i (TAO_Stub *stub,
@@ -235,15 +199,10 @@ namespace TAO
     if (is_timeout)
       max_wait_time = &tmp_wait_time;
 
-    (void) this->set_response_flags (stub,
-                                     details);
-
     // Create the resolver which will pick (or create) for us a
     // transport and a profile from the effective_target.
-    Profile_Transport_Resolver resolver (
-      effective_target.in (),
-      stub,
-      (details.response_flags () != Messaging::SYNC_NONE));
+    Profile_Transport_Resolver resolver (effective_target.in (),
+                                         stub);
 
     resolver.resolve (max_wait_time
                       ACE_ENV_ARG_PARAMETER);
@@ -264,6 +223,9 @@ namespace TAO
       }
     else if (this->type_ == TAO_TWOWAY_INVOCATION)
       {
+        // @@ NOTE:Need to change this to something better. Too many
+        // hash defines meaning the same  thing..
+        details.response_flags (TAO_TWOWAY_RESPONSE_FLAG);
         return this->invoke_twoway (details,
                                     effective_target,
                                     resolver,
@@ -275,7 +237,7 @@ namespace TAO
   }
 
   Invocation_Status
-  Invocation_Adapter::invoke_twoway (TAO_Operation_Details &details,
+  Invocation_Adapter::invoke_twoway (TAO_Operation_Details &op,
                                      CORBA::Object_var &effective_target,
                                      Profile_Transport_Resolver &r,
                                      ACE_Time_Value *&max_wait_time
@@ -295,7 +257,7 @@ namespace TAO
 
     TAO::Synch_Twoway_Invocation synch (this->target_,
                                         r,
-                                        details);
+                                        op);
 
     Invocation_Status status =
       synch.remote_twoway (max_wait_time
@@ -305,8 +267,7 @@ namespace TAO
     if (status == TAO_INVOKE_RESTART &&
         synch.is_forwarded ())
       {
-        effective_target =
-          synch.steal_forwarded_reference ();
+        effective_target = synch.steal_forwarded_reference ();
 
         this->object_forwarded (effective_target,
                                 r.stub ()
@@ -318,15 +279,28 @@ namespace TAO
   }
 
   Invocation_Status
-  Invocation_Adapter::invoke_oneway (TAO_Operation_Details &details,
+  Invocation_Adapter::invoke_oneway (TAO_Operation_Details &op,
                                      CORBA::Object_var &effective_target,
                                      Profile_Transport_Resolver &r,
                                      ACE_Time_Value *&max_wait_time
                                      ACE_ENV_ARG_DECL)
   {
+    // Grab the syncscope policy from the ORB.
+    bool has_synchronization = false;
+    Messaging::SyncScope sync_scope;
+
+    r.stub ()->orb_core ()->call_sync_scope_hook (r.stub (),
+                                                  has_synchronization,
+                                                  sync_scope);
+
+    if (has_synchronization)
+      op.response_flags (CORBA::Octet (sync_scope));
+    else
+      op.response_flags (CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT));
+
     TAO::Synch_Oneway_Invocation synch (this->target_,
                                         r,
-                                        details);
+                                        op);
 
     Invocation_Status s =
       synch.remote_oneway (max_wait_time
@@ -336,8 +310,7 @@ namespace TAO
     if (s == TAO_INVOKE_RESTART &&
         synch.is_forwarded ())
       {
-        effective_target =
-          synch.steal_forwarded_reference ();
+        effective_target = synch.steal_forwarded_reference ();
 
         this->object_forwarded (effective_target,
                                 r.stub ()
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index 23e75c89b8a..c134d991b5d 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -201,7 +201,7 @@ namespace TAO
      * is forwarded to a new location.
      */
     virtual Invocation_Status invoke_twoway (
-        TAO_Operation_Details &details,
+        TAO_Operation_Details &op,
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
         ACE_Time_Value *&max_wait_time
@@ -215,7 +215,7 @@ namespace TAO
      * is forwarded to a new location to take appropriate action.
      */
     virtual Invocation_Status invoke_oneway (
-        TAO_Operation_Details &details,
+        TAO_Operation_Details &op,
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
         ACE_Time_Value *&max_wait_time
@@ -235,11 +235,6 @@ namespace TAO
     void object_forwarded (CORBA::Object_var &effective_target,
                            TAO_Stub *stub
                            ACE_ENV_ARG_DECL);
-
-    /// Helper method to set the response flags within @a details
-    void set_response_flags (TAO_Stub *stub,
-                             TAO_Operation_Details &details);
-
   protected:
 
     /// The target object on which this invocation is carried out.
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index 08b0253c9fe..66beadddff8 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -4,7 +4,6 @@
 #include "ORB_Core.h"
 #include "Typecode.h"
 #include "DynamicC.h"
-#include "SystemException.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "RequestInfo_Util.h"
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 42a2075a302..14ce667c411 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -6,7 +6,6 @@
 #include "Base_Transport_Property.h"
 #include "Profile_Transport_Resolver.h"
 #include "ORB_Constants.h"
-#include "SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Invocation_Endpoint_Selectors.i"
@@ -44,34 +43,28 @@ TAO_Default_Endpoint_Selector::select_endpoint (
     {
       r->profile (r->stub ()->profile_in_use ());
 
-      // Check whether we need to do a blocked wait or we have a
-      // non-blocked wait and we support that.  If this is not the
-      // case we can't use this profile so try the next.
-      if (r->blocked () ||
-         (!r->blocked () && r->profile ()->supports_non_blocking_oneways ()))
-        {
-          const size_t endpoint_count =
-            r->profile ()->endpoint_count ();
+      const size_t endpoint_count =
+        r->profile ()->endpoint_count ();
+
+      TAO_Endpoint *ep =
+        r->profile ()->endpoint ();
 
-          TAO_Endpoint *ep =
-            r->profile ()->endpoint ();
+      for (size_t i = 0; i < endpoint_count; ++i)
+        {
+          TAO_Base_Transport_Property desc (ep);
 
-          for (size_t i = 0; i < endpoint_count; ++i)
-            {
-              TAO_Base_Transport_Property desc (ep);
-              const bool retval =
-                r->try_connect (&desc,
-                                max_wait_time
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+          bool retval =
+            r->try_connect (&desc,
+                            max_wait_time
+                            ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
 
-              // Check if the connect has completed.
-              if (retval)
-                return;
+          // Check if the connect has completed.
+          if (retval)
+            return;
 
-              // Go to the next endpoint in this profile.
-              ep = ep->next ();
-            }
+          // Go to the next endpoint in this profile.
+          ep = ep->next ();
         }
     }
   while (r->stub ()->next_profile_retry () != 0);
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp
index 3acdc624452..d1aa0d78b8c 100644
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ b/TAO/tao/LF_Connect_Strategy.cpp
@@ -2,7 +2,7 @@
 #include "Connection_Handler.h"
 #include "LF_Follower.h"
 #include "Leader_Follower.h"
-#include "Transport.h"
+
 #include "ace/Synch_Options.h"
 
 ACE_RCSID(tao,
@@ -40,24 +40,19 @@ int
 TAO_LF_Connect_Strategy::wait (TAO_Connection_Handler *ch,
                                ACE_Time_Value *max_wait_time)
 {
-  ACE_ASSERT (ch != 0);
+  ACE_ASSERT(ch != 0);
 
-  return this->wait (ch->transport (),
-                     max_wait_time);
-}
+  // @@todo We need to use a auto_ptr<>-like object here!
+  // TAO_Transport * transport = ch->get_transport_locked();
+  TAO_Transport *transport = ch->transport ();
 
-int
-TAO_LF_Connect_Strategy::wait (TAO_Transport *transport,
-                               ACE_Time_Value *max_wait_time)
-{
   // Basically the connection was EINPROGRESS, but before we could
   // wait for it some other thread detected a failure and cleaned up
   // the connection handler.
-  if (transport == 0)
-    return -1;
-
-  TAO_Connection_Handler *ch =
-    transport->connection_handler ();
+  if(transport == 0)
+    {
+      return -1;
+    }
 
   TAO_Leader_Follower &leader_follower =
     this->orb_core_->leader_follower ();
diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h
index 5ca99679939..f2e02fc5f8b 100644
--- a/TAO/tao/LF_Connect_Strategy.h
+++ b/TAO/tao/LF_Connect_Strategy.h
@@ -51,10 +51,6 @@ public:
   virtual int wait (TAO_Connection_Handler *ch,
                     ACE_Time_Value *val);
 
-  virtual int wait (TAO_Transport *ch,
-                    ACE_Time_Value *val);
-
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index f561d37ae0d..3d752b69478 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -8,7 +8,7 @@
 # include "LocalObject.i"
 #endif /* ! __ACE_INLINE__ */
 
-#include "SystemException.h"
+#include "Exception.h"
 #include "debug.h"
 #include "ORB_Constants.h"
 
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index 45e7c44dae7..58e27158601 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -3,6 +3,7 @@
 #include "operation_details.h"
 #include "Stub.h"
 #include "Bind_Dispatcher_Guard.h"
+#include "Pluggable_Messaging.h"
 #include "Transport.h"
 #include "Synch_Reply_Dispatcher.h"
 #include "GIOP_Utils.h"
@@ -61,7 +62,7 @@ namespace TAO
       this->resolver_.transport ();
 
     TAO_OutputCDR &cdr =
-      transport->out_stream ();
+      transport->messaging_object ()->out_stream ();
 
     int retval =
       transport->generate_locate_request (tspec,
diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h
index 9006ada4f05..8585342818a 100644
--- a/TAO/tao/LocateRequest_Invocation.h
+++ b/TAO/tao/LocateRequest_Invocation.h
@@ -37,7 +37,7 @@ namespace TAO
   /**
    * @class LocateRequest_Invocation
    *
-   * @brief Object created by TAO::LocateRequest_Invocation_Adapter to
+   * @brief Object created bu TAO::LocateRequest_Invocation_Adapter to
    * create and send LocateRequest invocation.
    *
    */
@@ -46,7 +46,7 @@ namespace TAO
   {
   public:
     /**
-     * @param otarget The target on which this invocation was
+     * @param target The target on which this invocation was
      *  started.
      *
      * @param resolver Container of the profile and transport on
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
index 527999bff53..20dd2f48720 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
@@ -30,7 +30,7 @@ namespace TAO
     if (stub == 0)
       ACE_THROW (CORBA::INTERNAL (
                      CORBA::SystemException::_tao_minor_code (
-                       0,
+                       TAO_DEFAULT_MINOR_CODE,
                          EINVAL),
                         CORBA::COMPLETED_NO));
 
@@ -49,8 +49,7 @@ namespace TAO
            s == TAO_INVOKE_RESTART)
       {
         Profile_Transport_Resolver resolver (effective_target,
-                                             stub,
-                                             true);
+                                             stub);
 
         ACE_TRY
           {
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index 6e761046cc3..3dd6957803d 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -6,7 +6,6 @@
 #include "tao/Profile.h"
 #include "tao/PolicyC.h"
 #include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
@@ -313,7 +312,7 @@ TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->policy_list_,
                     CORBA::PolicyList,
-                    CORBA::NO_MEMORY (0,
+                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                       CORBA::COMPLETED_NO)
                     );
 }
@@ -353,7 +352,7 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::PolicyList *ret_val = 0;
   ACE_NEW_THROW_EX (ret_val,
                     CORBA::PolicyList (*this->policy_list_),
-                    CORBA::NO_MEMORY (0,
+                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index a7fdce409fd..694a123dc22 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -1,9 +1,5 @@
-## $Id$
-##
 ##  Process this file with automake to create Makefile.in
 
-includedir = @includedir@/tao
-
 ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
 TAO_ROOT = $(top_srcdir)
@@ -12,286 +8,284 @@ TAO_BUILDDIR = $(top_builddir)
 ## Makefile.TAO.am 
 
 ORB_Core = \
-  Abstract_Servant_Base.cpp \
-  Adapter.cpp \
+  ServicesC.cpp \
+  NVList.cpp \
+  Dynamic_Adapter.cpp \
+  Policy_Manager.cpp \
+  Buffering_Constraint_Policy.cpp \
+  Messaging_PolicyValueC.cpp \
   Any.cpp \
-  AnySeqA.cpp \
-  AnySeqC.cpp \
   Any_Basic_Impl.cpp \
   Any_Impl.cpp \
-  Any_SystemException.cpp \
   Any_Unknown_IDL_Type.cpp \
-  Argument.cpp \
-  Asynch_Queued_Message.cpp \
-  Asynch_Reply_Dispatcher_Base.cpp \
-  Base_Transport_Property.cpp \
-  Basic_Arguments.cpp \
-  BiDir_Adapter.cpp \
-  Bind_Dispatcher_Guard.cpp \
-  Block_Flushing_Strategy.cpp \
-  Blocked_Connect_Strategy.cpp \
-  BooleanSeqA.cpp \
-  BooleanSeqC.cpp \
-  BoundsA.cpp \
-  BoundsC.cpp \
-  Buffering_Constraint_Policy.cpp \
-  CDR.cpp \
-  CDR_Encaps_Codec.cpp \
-  CONV_FRAMEA.cpp \
-  CONV_FRAMEC.cpp \
-  CORBALOC_Parser.cpp \
-  CORBANAME_Parser.cpp \
+  Any_SystemException.cpp \
   CORBA_String.cpp \
-  Cache_Entries.cpp \
-  CharSeqA.cpp \
-  CharSeqC.cpp \
-  Cleanup_Func_Registry.cpp \
+  CurrentC.cpp \
+  CurrentA.cpp \
+  Exception.cpp \
+  WrongTransactionC.cpp \
+  WrongTransactionA.cpp \
+  Environment.cpp \
+  Object.cpp \
+  LocalObject.cpp \
+  ObjectIdListC.cpp \
+  ORB.cpp \
+  Policy_ForwardC.cpp \
+  Policy_ForwardA.cpp \
+  PolicyC.cpp \
+  PolicyA.cpp \
+  Policy_Validator.cpp \
+  Encodable.cpp \
+  Abstract_Servant_Base.cpp \
+  Object_Proxy_Broker.cpp \
+  Remote_Object_Proxy_Broker.cpp \
+  Object_Proxy_Impl.cpp \
+  DomainC.cpp \
+  DomainA.cpp \
+  TimeBaseC.cpp \
+  TimeBaseA.cpp \
+  Principal.cpp \
+  Sequence.cpp \
+  MProfile.cpp \
+  Stub.cpp \
+  Typecode.cpp \
+  CDR.cpp \
+  Client_Strategy_Factory.cpp \
+  debug.cpp \
+  Object_KeyC.cpp \
+  Protocols_Hooks.cpp \
+  Default_Protocols_Hooks.cpp \
+  Messaging_SyncScopeC.cpp \
+  Invocation_Base.cpp \
+  Invocation_Adapter.cpp \
+  LocateRequest_Invocation_Adapter.cpp \
+  Profile_Transport_Resolver.cpp \
+  Remote_Invocation.cpp \
+  Collocated_Invocation.cpp \
+  Synch_Invocation.cpp \
+  LocateRequest_Invocation.cpp \
+  Invocation_Endpoint_Selectors.cpp \
+  operation_details.cpp \
   ClientRequestInfo.cpp \
   ClientRequestInfo_i.cpp \
+  RequestInfo_Util.cpp \
   ClientRequestInterceptor_Adapter.cpp \
-  Client_Strategy_Factory.cpp \
-  CodecFactory.cpp \
-  CodecFactory_ORBInitializer.cpp \
-  Codeset_Manager.cpp \
-  Codeset_Translator_Factory.cpp \
-  Collocated_Invocation.cpp \
-  Collocation_Resolver.cpp \
-  Connect_Strategy.cpp \
-  Connection_Purging_Strategy.cpp \
-  CurrentA.cpp \
-  CurrentC.cpp \
-  DLL_Parser.cpp \
-  Default_Collocation_Resolver.cpp \
-  Default_Endpoint_Selector_Factory.cpp \
-  Default_Protocols_Hooks.cpp \
-  Default_Stub_Factory.cpp \
-  Default_Thread_Lane_Resources_Manager.cpp \
-  DomainA.cpp \
-  DomainC.cpp \
-  DoubleSeqA.cpp \
-  DoubleSeqC.cpp \
-  DynamicA.cpp \
+  PI_ForwardC.cpp \
+  PortableInterceptorC.cpp \
+  PortableInterceptorA.cpp \
+  PICurrent.cpp \
+  PICurrent_Copy_Callback.cpp \
+  PICurrent_ORBInitializer.cpp \
   DynamicC.cpp \
-  Dynamic_Adapter.cpp \
-  Dynamic_ParameterA.cpp \
+  DynamicA.cpp \
   Dynamic_ParameterC.cpp \
-  Encodable.cpp \
-  Endpoint_Selector_Factory.cpp \
-  Environment.cpp \
-  Exception.cpp \
-  Exclusive_TMS.cpp \
-  FILE_Parser.cpp \
-  Fault_Tolerance_Service.cpp \
+  Dynamic_ParameterA.cpp \
+  ParameterMode.cpp \
+  AnySeqA.cpp \
+  AnySeqC.cpp \
+  BooleanSeqA.cpp \
+  BooleanSeqC.cpp \
+  CharSeqA.cpp \
+  CharSeqC.cpp \
+  DoubleSeqA.cpp \
+  DoubleSeqC.cpp \
   FloatSeqA.cpp \
   FloatSeqC.cpp \
-  Flushing_Strategy.cpp \
-  GIOPA.cpp \
-  GIOPC.cpp \
-  IFR_Client_Adapter.cpp \
-  IOPC.cpp \
-  IOP_CodecA.cpp \
-  IOP_CodecC.cpp \
-  IOP_IORA.cpp \
-  IOP_IORC.cpp \
-  IORInterceptor_Adapter.cpp \
-  IORInterceptor_Adapter_Factory.cpp \
-  IOR_Parser.cpp \
-  Interceptor_List.cpp \
-  Invocation_Adapter.cpp \
-  Invocation_Base.cpp \
-  Invocation_Endpoint_Selectors.cpp \
-  LF_CH_Event.cpp \
-  LF_Connect_Strategy.cpp \
-  LF_Event.cpp \
-  LF_Event_Binder.cpp \
-  LF_Event_Loop_Thread_Helper.cpp \
-  LF_Follower.cpp \
-  LF_Follower_Auto_Adder.cpp \
-  LF_Follower_Auto_Ptr.cpp \
-  LF_Invocation_Event.cpp \
-  LF_Strategy.cpp \
-  LF_Strategy_Complete.cpp \
-  LRU_Connection_Purging_Strategy.cpp \
-  Leader_Follower.cpp \
-  Leader_Follower_Flushing_Strategy.cpp \
-  LocalObject.cpp \
-  LocateRequest_Invocation.cpp \
-  LocateRequest_Invocation_Adapter.cpp \
   LongDoubleSeqA.cpp \
   LongDoubleSeqC.cpp \
   LongLongSeqA.cpp \
   LongLongSeqC.cpp \
   LongSeqA.cpp \
   LongSeqC.cpp \
-  MCAST_Parser.cpp \
-  MProfile.cpp \
-  Messaging_PolicyValueC.cpp \
-  Messaging_SyncScopeC.cpp \
-  Muxed_TMS.cpp \
-  NVList.cpp \
-  ORB.cpp \
-  ORBInitInfo.cpp \
-  ORBInitializer_Registry.cpp \
-  ORB_Core.cpp \
-  ORB_Core_Auto_Ptr.cpp \
-  ORB_Table.cpp \
-  Object.cpp \
-  ObjectIdListC.cpp \
-  ObjectKey_Table.cpp \
-  Object_KeyC.cpp \
-  Object_Loader.cpp \
-  Object_Proxy_Broker.cpp \
-  Object_Proxy_Impl.cpp \
-  Object_Ref_Table.cpp \
   OctetSeqA.cpp \
   OctetSeqC.cpp \
-  PICurrent.cpp \
-  PICurrent_Copy_Callback.cpp \
-  PICurrent_ORBInitializer.cpp \
-  PI_ForwardC.cpp \
-  ParameterMode.cpp \
-  Parser_Registry.cpp \
-  PolicyA.cpp \
-  PolicyC.cpp \
-  PolicyFactory_Registry.cpp \
-  Policy_ForwardA.cpp \
-  Policy_ForwardC.cpp \
-  Policy_Manager.cpp \
-  Policy_Set.cpp \
-  Policy_Validator.cpp \
-  PollableC.cpp \
-  PortableInterceptorA.cpp \
-  PortableInterceptorC.cpp \
-  PredefinedType_Seq_Tmplinst.cpp \
-  Principal.cpp \
-  Profile_Transport_Resolver.cpp \
-  Protocols_Hooks.cpp \
-  Queued_Message.cpp \
-  Reactive_Connect_Strategy.cpp \
-  Reactive_Flushing_Strategy.cpp \
-  Refcounted_ObjectKey.cpp \
-  Remote_Invocation.cpp \
-  Remote_Object_Proxy_Broker.cpp \
-  Reply_Dispatcher.cpp \
-  RequestInfo_Util.cpp \
-  Request_Dispatcher.cpp \
-  Resource_Factory.cpp \
-  Sequence.cpp \
-  Server_Strategy_Factory.cpp \
-  Service_Callbacks.cpp \
-  Service_Context.cpp \
-  ServicesC.cpp \
-  Services_Activate.cpp \
   ShortSeqA.cpp \
   ShortSeqC.cpp \
-  Special_Basic_Arguments.cpp \
   StringSeqA.cpp \
   StringSeqC.cpp \
-  Stub.cpp \
-  Stub_Factory.cpp \
-  Sync_Strategies.cpp \
-  Synch_Invocation.cpp \
-  Synch_Queued_Message.cpp \
-  Synch_Refcountable.cpp \
-  Synch_Reply_Dispatcher.cpp \
-  SystemException.cpp \
-  TAOA.cpp \
-  TAOC.cpp \
-  TAO_Internal.cpp \
-  TAO_Server_Request.cpp \
-  TAO_Singleton_Manager.cpp \
-  TSS_Resources.cpp \
-  Tagged_Components.cpp \
-  Thread_Lane_Resources.cpp \
-  Thread_Lane_Resources_Manager.cpp \
-  TimeBaseA.cpp \
-  TimeBaseC.cpp \
-  Transport_Cache_Manager.cpp \
-  Transport_Descriptor_Interface.cpp \
-  Transport_Mux_Strategy.cpp \
-  Transport_Timer.cpp \
-  TypeCodeFactory_Adapter.cpp \
-  Typecode.cpp \
-  Typecode_Constants.cpp \
   ULongLongSeqA.cpp \
   ULongLongSeqC.cpp \
   ULongSeqA.cpp \
   ULongSeqC.cpp \
   UShortSeqA.cpp \
   UShortSeqC.cpp \
-  UTF16_BOM_Factory.cpp \
-  UTF16_BOM_Translator.cpp \
-  UserException.cpp \
-  Valuetype_Adapter.cpp \
   WCharSeqA.cpp \
   WCharSeqC.cpp \
   WStringSeqA.cpp \
   WStringSeqC.cpp \
-  Wait_On_LF_No_Upcall.cpp \
-  Wait_On_Leader_Follower.cpp \
-  Wait_On_Reactor.cpp \
-  Wait_On_Read.cpp \
+  Codeset_Manager.cpp \
+  Codeset_Translator_Factory.cpp \
+  UTF16_BOM_Translator.cpp \
+  UTF16_BOM_Factory.cpp \
+  ORB_Core.cpp \
+  ORB_Core_Auto_Ptr.cpp \
+  Collocation_Resolver.cpp \
+  Default_Collocation_Resolver.cpp \
+  Stub_Factory.cpp \
+  ORB_Table.cpp \
+  LF_Follower.cpp \
+  LF_Follower_Auto_Ptr.cpp \
+  LF_Follower_Auto_Adder.cpp \
+  Leader_Follower.cpp \
+  Leader_Follower_Flushing_Strategy.cpp \
+  LF_Event.cpp \
+  LF_Invocation_Event.cpp \
+  LF_CH_Event.cpp \
+  LF_Event_Binder.cpp \
+  LF_Event_Loop_Thread_Helper.cpp \
+  LF_Strategy.cpp \
+  LF_Strategy_Complete.cpp \
+  params.cpp \
+  Resource_Factory.cpp \
+  Server_Strategy_Factory.cpp \
+  Sync_Strategies.cpp \
+  TAO_Internal.cpp \
+  TAO_Server_Request.cpp \
+  Typecode_Constants.cpp \
+  PredefinedType_Seq_Tmplinst.cpp \
+  TypeCodeFactory_Adapter.cpp \
   Wait_Strategy.cpp \
-  WrongTransactionA.cpp \
-  WrongTransactionC.cpp \
-  debug.cpp \
-  operation_details.cpp \
-  params.cpp
+  Wait_On_Read.cpp \
+  Wait_On_Reactor.cpp \
+  Wait_On_Leader_Follower.cpp \
+  Transport_Mux_Strategy.cpp \
+  Exclusive_TMS.cpp \
+  Muxed_TMS.cpp \
+  Reply_Dispatcher.cpp \
+  Synch_Reply_Dispatcher.cpp \
+  Synch_Refcountable.cpp \
+  Asynch_Reply_Dispatcher_Base.cpp \
+  IOP_IORC.cpp \
+  IOP_IORA.cpp \
+  IOP_CodecC.cpp \
+  IOP_CodecA.cpp \
+  IOPC.cpp \
+  PollableC.cpp \
+  CONV_FRAMEC.cpp \
+  CONV_FRAMEA.cpp \
+  Tagged_Components.cpp \
+  Service_Context.cpp \
+  GIOPC.cpp \
+  GIOPA.cpp \
+  BoundsC.cpp \
+  BoundsA.cpp \
+  TAOC.cpp \
+  TAOA.cpp \
+  Object_Loader.cpp \
+  TAO_Singleton_Manager.cpp \
+  DLL_ORB.cpp \
+  Adapter.cpp \
+  Services_Activate.cpp \
+  Service_Callbacks.cpp \
+  Parser_Registry.cpp \
+  IOR_Parser.cpp \
+  DLL_Parser.cpp \
+  FILE_Parser.cpp \
+  CORBALOC_Parser.cpp \
+  CORBANAME_Parser.cpp \
+  MCAST_Parser.cpp \
+  Bind_Dispatcher_Guard.cpp \
+  Fault_Tolerance_Service.cpp \
+  Interceptor_List.cpp \
+  IORInterceptor_Adapter.cpp \
+  IORInterceptor_Adapter_Factory.cpp \
+  IFR_Client_Adapter.cpp \
+  ORBInitInfo.cpp \
+  ORBInitializer_Registry.cpp \
+  PolicyFactory_Registry.cpp \
+  Cache_Entries.cpp \
+  Base_Transport_Property.cpp \
+  Transport_Cache_Manager.cpp \
+  Cleanup_Func_Registry.cpp \
+  Transport_Descriptor_Interface.cpp \
+  Object_Ref_Table.cpp \
+  BiDir_Adapter.cpp \
+  CodecFactory.cpp \
+  CodecFactory_ORBInitializer.cpp \
+  CDR_Encaps_Codec.cpp \
+  Endpoint_Selector_Factory.cpp \
+  Flushing_Strategy.cpp \
+  Block_Flushing_Strategy.cpp \
+  Reactive_Flushing_Strategy.cpp \
+  Connect_Strategy.cpp \
+  Blocked_Connect_Strategy.cpp \
+  Reactive_Connect_Strategy.cpp \
+  LF_Connect_Strategy.cpp \
+  Queued_Message.cpp \
+  Synch_Queued_Message.cpp \
+  Asynch_Queued_Message.cpp \
+  Transport_Timer.cpp \
+  Connection_Purging_Strategy.cpp \
+  LRU_Connection_Purging_Strategy.cpp \
+  Policy_Set.cpp \
+  Default_Endpoint_Selector_Factory.cpp \
+  Thread_Lane_Resources.cpp \
+  Thread_Lane_Resources_Manager.cpp \
+  Default_Thread_Lane_Resources_Manager.cpp \
+  Default_Stub_Factory.cpp \
+  Request_Dispatcher.cpp \
+  Valuetype_Adapter.cpp \
+  ObjectKey_Table.cpp \
+  Refcounted_ObjectKey.cpp \
+  TSS_Resources.cpp \
+  Argument.cpp \
+  Basic_Arguments.cpp \
+  Special_Basic_Arguments.cpp
 
 Pluggable_Protocols = \
-  Acceptor_Filter.cpp \
-  Acceptor_Registry.cpp \
-  Connection_Handler.cpp \
-  Connector_Registry.cpp \
+  Transport_Acceptor.cpp \
+  Transport_Connector.cpp \
+  Transport.cpp \
+  Incoming_Message_Queue.cpp \
+  Resume_Handle.cpp \
+  Profile.cpp \
   Endpoint.cpp \
-  IIOPA.cpp \
-  IIOPC.cpp \
-  IIOP_Acceptor.cpp \
-  IIOP_Connection_Handler.cpp \
-  IIOP_Connector.cpp \
-  IIOP_Endpoint.cpp \
-  IIOP_EndpointsA.cpp \
-  IIOP_EndpointsC.cpp \
+  Connector_Registry.cpp \
+  Connection_Handler.cpp \
+  Thread_Per_Connection_Handler.cpp \
+  Acceptor_Registry.cpp \
+  Protocol_Factory.cpp \
+  Acceptor_Filter.cpp \
   IIOP_Factory.cpp \
   IIOP_Lite_Factory.cpp \
   IIOP_Profile.cpp \
   IIOP_Transport.cpp \
-  Incoming_Message_Queue.cpp \
-  Profile.cpp \
-  Protocol_Factory.cpp \
-  Resume_Handle.cpp \
-  Thread_Per_Connection_Handler.cpp \
-  Transport.cpp \
-  Transport_Acceptor.cpp \
-  Transport_Connector.cpp
+  IIOP_Connector.cpp \
+  IIOP_Acceptor.cpp \
+  IIOP_Connection_Handler.cpp \
+  IIOP_Endpoint.cpp \
+  IIOP_EndpointsC.cpp \
+  IIOP_EndpointsA.cpp \
+  IIOPC.cpp \
+  IIOPA.cpp
 
 Pluggable_Messaging = \
+  Pluggable_Messaging.cpp \
+  Pluggable_Messaging_Utils.cpp \
   GIOP_Message_Base.cpp \
+  GIOP_Message_Lite.cpp \
   GIOP_Message_Generator_Parser.cpp \
   GIOP_Message_Generator_Parser_10.cpp \
   GIOP_Message_Generator_Parser_11.cpp \
   GIOP_Message_Generator_Parser_12.cpp \
   GIOP_Message_Generator_Parser_Impl.cpp \
-  GIOP_Message_Lite.cpp \
+  GIOP_Utils.cpp \
   GIOP_Message_Locate_Header.cpp \
+  target_specification.cpp \
   GIOP_Message_State.cpp \
   GIOP_Message_Version.cpp \
-  GIOP_Utils.cpp \
-  Pluggable_Messaging.cpp \
-  Pluggable_Messaging_Utils.cpp \
-  Tagged_Profile.cpp \
-  target_specification.cpp
+  Tagged_Profile.cpp
 
 Default_Resources = \
   default_client.cpp \
-  default_resource.cpp \
   default_server.cpp \
-  qt_resource.cpp \
-  xt_resource.cpp
+  default_resource.cpp \
+  xt_resource.cpp \
+  qt_resource.cpp
 
 Interpretive_Marshaling = \
-  Marshal.cpp \
   append.cpp \
+  Marshal.cpp \
   skip.cpp
 
 IDL_Compiler = \
@@ -318,9 +312,9 @@ libTAO_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS = \
+nobase_pkginclude_HEADERS = \
   Abstract_Servant_Base.h \
   Acceptor_Filter.h \
   Acceptor_Impl.h \
@@ -328,8 +322,6 @@ nobase_include_HEADERS = \
   Adapter.h \
   Allocator.h \
   Any.h \
-  AnySeqC.h \
-  AnySeqS.h \
   Any_Array_Impl_T.h \
   Any_Basic_Impl.h \
   Any_Basic_Impl_T.h \
@@ -339,20 +331,22 @@ nobase_include_HEADERS = \
   Any_Special_Impl_T.h \
   Any_SystemException.h \
   Any_Unknown_IDL_Type.h \
+  AnySeqC.h \
+  AnySeqS.h \
   Arg_Traits_T.h \
   Argument.h \
   Array_VarOut_T.h \
   Asynch_Queued_Message.h \
   Asynch_Reply_Dispatcher_Base.h \
   Auto_Functor.h \
-  BD_String_Argument_T.h \
-  BD_String_SArgument_T.h \
   Base_Transport_Property.h \
   Basic_Argument_T.h \
   Basic_Arguments.h \
   Basic_SArgument_T.h \
   Basic_SArguments.h \
   Basic_Types.h \
+  BD_String_Argument_T.h \
+  BD_String_SArgument_T.h \
   BiDir_Adapter.h \
   Bind_Dispatcher_Guard.h \
   Block_Flushing_Strategy.h \
@@ -362,23 +356,16 @@ nobase_include_HEADERS = \
   BoundsC.h \
   Buffer_Allocator_T.h \
   Buffering_Constraint_Policy.h \
+  Cache_Entries.h \
   CDR.h \
   CDR_Encaps_Codec.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMES.h \
-  CONV_FRAMES_T.h \
-  CORBALOC_Parser.h \
-  CORBANAME_Parser.h \
-  CORBA_String.h \
-  CORBA_methods.h \
-  Cache_Entries.h \
   CharSeqC.h \
   CharSeqS.h \
   Cleanup_Func_Registry.h \
+  Client_Strategy_Factory.h \
   ClientRequestInfo.h \
   ClientRequestInfo_i.h \
   ClientRequestInterceptor_Adapter.h \
-  Client_Strategy_Factory.h \
   CodecFactory.h \
   CodecFactory_ORBInitializer.h \
   Codeset_Manager.h \
@@ -394,19 +381,35 @@ nobase_include_HEADERS = \
   Connection_Purging_Strategy.h \
   Connector_Impl.h \
   Connector_Registry.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMES.h \
+  CONV_FRAMES_T.h \
+  corba.h \
+  CORBA_methods.h \
+  CORBA_String.h \
+  corbafwd.h \
+  CORBALOC_Parser.h \
+  CORBANAME_Parser.h \
   CurrentC.h \
-  DLL_Parser.h \
+  debug.h \
+  default_client.h \
   Default_Collocation_Resolver.h \
   Default_Endpoint_Selector_Factory.h \
+  default_environment.h \
+  default_ports.h \
   Default_Protocols_Hooks.h \
+  default_resource.h \
+  default_server.h \
   Default_Stub_Factory.h \
   Default_Thread_Lane_Resources_Manager.h \
+  DLL_ORB.h \
+  DLL_Parser.h \
   DomainC.h \
   DoubleSeqC.h \
   DoubleSeqS.h \
-  DynamicC.h \
   Dynamic_Adapter.h \
   Dynamic_ParameterC.h \
+  DynamicC.h \
   Encodable.h \
   Endpoint.h \
   Endpoint_Selector_Factory.h \
@@ -414,8 +417,8 @@ nobase_include_HEADERS = \
   Exception.h \
   Exception_Data.h \
   Exclusive_TMS.h \
-  FILE_Parser.h \
   Fault_Tolerance_Service.h \
+  FILE_Parser.h \
   Fixed_Array_Argument_T.h \
   Fixed_Array_SArgument_T.h \
   Fixed_Size_Argument_T.h \
@@ -423,9 +426,6 @@ nobase_include_HEADERS = \
   FloatSeqC.h \
   FloatSeqS.h \
   Flushing_Strategy.h \
-  GIOPC.h \
-  GIOPS.h \
-  GIOPS_T.h \
   GIOP_Message_Base.h \
   GIOP_Message_Generator_Parser.h \
   GIOP_Message_Generator_Parser_10.h \
@@ -437,8 +437,10 @@ nobase_include_HEADERS = \
   GIOP_Message_State.h \
   GIOP_Message_Version.h \
   GIOP_Utils.h \
+  GIOPC.h \
+  GIOPS.h \
+  GIOPS_T.h \
   IFR_Client_Adapter.h \
-  IIOPC.h \
   IIOP_Acceptor.h \
   IIOP_Connection_Handler.h \
   IIOP_Connector.h \
@@ -448,20 +450,23 @@ nobase_include_HEADERS = \
   IIOP_Lite_Factory.h \
   IIOP_Profile.h \
   IIOP_Transport.h \
-  IOPC.h \
-  IOPS.h \
-  IOPS_T.h \
-  IOP_CodecC.h \
-  IOP_IORC.h \
-  IORInterceptor_Adapter.h \
-  IORInterceptor_Adapter_Factory.h \
-  IOR_Parser.h \
+  IIOPC.h \
   Incoming_Message_Queue.h \
   Interceptor_List.h \
   Invocation_Adapter.h \
   Invocation_Base.h \
   Invocation_Endpoint_Selectors.h \
   Invocation_Utils.h \
+  IOP_CodecC.h \
+  IOP_IORC.h \
+  IOPC.h \
+  IOPS.h \
+  IOPS_T.h \
+  IOR_Parser.h \
+  IORInterceptor_Adapter.h \
+  IORInterceptor_Adapter_Factory.h \
+  Leader_Follower.h \
+  Leader_Follower_Flushing_Strategy.h \
   LF_CH_Event.h \
   LF_Connect_Strategy.h \
   LF_Event.h \
@@ -473,9 +478,6 @@ nobase_include_HEADERS = \
   LF_Invocation_Event.h \
   LF_Strategy.h \
   LF_Strategy_Complete.h \
-  LRU_Connection_Purging_Strategy.h \
-  Leader_Follower.h \
-  Leader_Follower_Flushing_Strategy.h \
   LocalObject.h \
   LocateRequest_Invocation.h \
   LocateRequest_Invocation_Adapter.h \
@@ -485,26 +487,17 @@ nobase_include_HEADERS = \
   LongLongSeqS.h \
   LongSeqC.h \
   LongSeqS.h \
-  MCAST_Parser.h \
-  MProfile.h \
+  LRU_Connection_Purging_Strategy.h \
   Managed_Types.h \
   Marshal.h \
+  MCAST_Parser.h \
   Messaging_PolicyValueC.h \
   Messaging_SyncScopeC.h \
+  MProfile.h \
   Muxed_TMS.h \
-  NVList.h \
   New_Leader_Generator.h \
-  OBV_Constants.h \
-  ORB.h \
-  ORBInitInfo.h \
-  ORBInitializer_Registry.h \
-  ORB_Constants.h \
-  ORB_Core.h \
-  ORB_Core_Auto_Ptr.h \
-  ORB_Table.h \
+  NVList.h \
   Object.h \
-  ObjectIdListC.h \
-  ObjectKey_Table.h \
   Object_Argument_T.h \
   Object_KeyC.h \
   Object_Loader.h \
@@ -513,24 +506,38 @@ nobase_include_HEADERS = \
   Object_Ref_Table.h \
   Object_SArgument_T.h \
   Object_T.h \
+  objectid.h \
+  ObjectIdListC.h \
+  ObjectKey_Table.h \
   Objref_VarOut_T.h \
+  OBV_Constants.h \
   OctetSeqC.h \
   OctetSeqS.h \
+  operation_details.h \
+  ORB.h \
+  ORB_Constants.h \
+  ORB_Core.h \
+  ORB_Core_Auto_Ptr.h \
+  ORB_Table.h \
+  orbconf.h \
+  ORBInitializer_Registry.h \
+  ORBInitInfo.h \
+  ParameterMode.h \
+  params.h \
+  Parser_Registry.h \
+  PI_ForwardC.h \
   PICurrent.h \
   PICurrent_Copy_Callback.h \
   PICurrent_ORBInitializer.h \
-  PI_ForwardC.h \
-  ParameterMode.h \
-  Parser_Registry.h \
   Pluggable_Messaging.h \
   Pluggable_Messaging_Utils.h \
-  PolicyC.h \
-  PolicyFactory_Registry.h \
-  PolicyS.h \
   Policy_ForwardC.h \
   Policy_Manager.h \
   Policy_Set.h \
   Policy_Validator.h \
+  PolicyC.h \
+  PolicyFactory_Registry.h \
+  PolicyS.h \
   PollableC.h \
   PollableS.h \
   PollableS_T.h \
@@ -543,6 +550,7 @@ nobase_include_HEADERS = \
   Protocol_Factory.h \
   Protocols_Hooks.h \
   Pseudo_VarOut_T.h \
+  qt_resource.h \
   Queued_Message.h \
   Reactive_Connect_Strategy.h \
   Reactive_Flushing_Strategy.h \
@@ -550,8 +558,8 @@ nobase_include_HEADERS = \
   Remote_Invocation.h \
   Remote_Object_Proxy_Broker.h \
   Reply_Dispatcher.h \
-  RequestInfo_Util.h \
   Request_Dispatcher.h \
+  RequestInfo_Util.h \
   Resource_Factory.h \
   Resume_Handle.h \
   Seq_Out_T.h \
@@ -561,10 +569,10 @@ nobase_include_HEADERS = \
   Server_Strategy_Factory.h \
   Service_Callbacks.h \
   Service_Context.h \
+  Services_Activate.h \
   ServicesC.h \
   ServicesS.h \
   ServicesS_T.h \
-  Services_Activate.h \
   ShortSeqC.h \
   ShortSeqS.h \
   Special_Basic_Argument_T.h \
@@ -580,19 +588,18 @@ nobase_include_HEADERS = \
   Synch_Queued_Message.h \
   Synch_Refcountable.h \
   Synch_Reply_Dispatcher.h \
-  SystemException.h \
-  TAOC.h \
-  TAOS.h \
-  TAOS_T.h \
+  Tagged_Components.h \
+  Tagged_Profile.h \
   TAO_Export.h \
   TAO_Internal.h \
   TAO_Server_Request.h \
   TAO_Singleton.h \
   TAO_Singleton_Manager.h \
+  TAOC.h \
+  TAOS.h \
+  TAOS_T.h \
+  target_specification.h \
   TC_Constants_Forward.h \
-  TSS_Resources.h \
-  Tagged_Components.h \
-  Tagged_Profile.h \
   Thread_Lane_Resources.h \
   Thread_Lane_Resources_Manager.h \
   Thread_Per_Connection_Handler.h \
@@ -607,9 +614,10 @@ nobase_include_HEADERS = \
   Transport_Descriptor_Interface.h \
   Transport_Mux_Strategy.h \
   Transport_Timer.h \
-  TypeCodeFactory_Adapter.h \
+  TSS_Resources.h \
   Typecode.h \
   Typecode_Constants.h \
+  TypeCodeFactory_Adapter.h \
   UB_String_Argument_T.h \
   UB_String_Arguments.h \
   UB_String_SArgument_T.h \
@@ -622,263 +630,243 @@ nobase_include_HEADERS = \
   UShortSeqS.h \
   UTF16_BOM_Factory.h \
   UTF16_BOM_Translator.h \
-  UserException.h \
   Valuetype_Adapter.h \
-  VarOut_T.h \
   Var_Array_Argument_T.h \
   Var_Array_SArgument_T.h \
   Var_Size_Argument_T.h \
   Var_Size_SArgument_T.h \
+  varbase.h \
+  VarOut_T.h \
   Version.h \
-  WCharSeqC.h \
-  WCharSeqS.h \
-  WStringSeqC.h \
-  WStringSeqS.h \
-  Wait_On_LF_No_Upcall.h \
   Wait_On_Leader_Follower.h \
   Wait_On_Reactor.h \
   Wait_On_Read.h \
   Wait_Strategy.h \
+  WCharSeqC.h \
+  WCharSeqS.h \
   WrongTransactionC.h \
-  corba.h \
-  corbafwd.h \
-  debug.h \
-  default_client.h \
-  default_environment.h \
-  default_ports.h \
-  default_resource.h \
-  default_server.h \
-  objectid.h \
-  operation_details.h \
-  orbconf.h \
-  params.h \
-  qt_resource.h \
-  target_specification.h \
-  varbase.h \
+  WStringSeqC.h \
+  WStringSeqS.h \
   xt_resource.h \
   Acceptor_Filter.i \
   Acceptor_Impl.i \
   Acceptor_Registry.i \
   Adapter.i \
   Any.i \
-  AnySeqC.inl \
-  Any_Array_Impl_T.inl \
-  Any_Basic_Impl_T.inl \
-  Any_Dual_Impl_T.inl \
-  Any_Impl_T.inl \
-  Any_Special_Impl_T.inl \
-  Array_VarOut_T.inl \
   Asynch_Reply_Dispatcher_Base.i \
-  BD_String_Argument_T.inl \
-  BD_String_SArgument_T.inl \
-  Base_Transport_Property.inl \
-  Basic_Argument_T.inl \
-  Basic_SArgument_T.inl \
   Bind_Dispatcher_Guard.i \
   BooleanSeqC.i \
   BoundsC.i \
   Buffering_Constraint_Policy.i \
   CDR.i \
+  Collocation_Resolver.i \
+  Connector_Registry.i \
   CONV_FRAMEC.i \
   CONV_FRAMES.i \
   CONV_FRAMES_T.i \
+  corbafwd.i \
   CORBALOC_Parser.i \
   CORBANAME_Parser.i \
-  CORBA_String.inl \
-  Cache_Entries.inl \
-  CharSeqC.inl \
-  Cleanup_Func_Registry.inl \
-  ClientRequestInfo.inl \
-  ClientRequestInfo_i.inl \
-  ClientRequestInterceptor_Adapter.inl \
-  Collocation_Resolver.i \
-  Condition.inl \
-  Connection_Handler.inl \
-  Connection_Purging_Strategy.inl \
-  Connector_Impl.inl \
-  Connector_Registry.i \
   CurrentC.i \
-  DLL_Parser.i \
+  default_client.i \
   Default_Collocation_Resolver.i \
   Default_Protocols_Hooks.i \
+  default_resource.i \
+  default_server.i \
   Default_Thread_Lane_Resources_Manager.i \
+  DLL_Parser.i \
   DomainC.i \
-  DoubleSeqC.inl \
-  DynamicC.i \
   Dynamic_ParameterC.i \
+  DynamicC.i \
   Endpoint.i \
   Environment.i \
   Exception.i \
-  FILE_Parser.i \
   Fault_Tolerance_Service.i \
-  Fixed_Array_Argument_T.inl \
-  Fixed_Array_SArgument_T.inl \
-  Fixed_Size_Argument_T.inl \
-  Fixed_Size_SArgument_T.inl \
+  FILE_Parser.i \
   FloatSeqC.i \
-  GIOPC.i \
-  GIOPS.i \
-  GIOPS_T.i \
   GIOP_Message_Base.i \
-  GIOP_Message_Generator_Parser.inl \
-  GIOP_Message_Generator_Parser_10.inl \
-  GIOP_Message_Generator_Parser_11.inl \
-  GIOP_Message_Generator_Parser_12.inl \
-  GIOP_Message_Generator_Parser_Impl.inl \
   GIOP_Message_Lite.i \
   GIOP_Message_Locate_Header.i \
-  GIOP_Message_State.inl \
-  GIOP_Message_Version.inl \
   GIOP_Utils.i \
-  IIOPC.i \
+  GIOPC.i \
+  GIOPS.i \
+  GIOPS_T.i \
   IIOP_Acceptor.i \
   IIOP_Connection_Handler.i \
   IIOP_Endpoint.i \
   IIOP_EndpointsC.i \
   IIOP_Profile.i \
   IIOP_Transport.i \
+  IIOPC.i \
+  Invocation_Endpoint_Selectors.i \
+  IOP_CodecC.i \
+  IOP_IORC.i \
   IOPC.i \
   IOPS.i \
   IOPS_T.i \
-  IOP_CodecC.i \
-  IOP_IORC.i \
   IOR_Parser.i \
-  Incoming_Message_Queue.inl \
-  Interceptor_List.inl \
-  Invocation_Adapter.inl \
-  Invocation_Base.inl \
-  Invocation_Endpoint_Selectors.i \
-  LF_Event.inl \
-  LF_Event_Binder.inl \
-  LF_Event_Loop_Thread_Helper.inl \
-  LF_Follower.inl \
-  LF_Follower_Auto_Adder.inl \
-  LF_Follower_Auto_Ptr.inl \
-  LF_Invocation_Event.inl \
-  LF_Strategy.inl \
-  LF_Strategy_Complete.inl \
   Leader_Follower.i \
   LocalObject.i \
-  LongDoubleSeqC.inl \
-  LongLongSeqC.inl \
-  LongSeqC.inl \
-  MCAST_Parser.i \
-  MProfile.i \
   Managed_Types.i \
   Marshal.i \
+  MCAST_Parser.i \
   Messaging_PolicyValueC.i \
   Messaging_SyncScopeC.i \
+  MProfile.i \
   NVList.i \
-  ORB.i \
-  ORBInitInfo.inl \
-  ORB_Core.i \
-  ORB_Core_Auto_Ptr.inl \
-  ORB_Table.inl \
   Object.i \
-  ObjectIdListC.i \
-  Object_Argument_T.inl \
   Object_KeyC.i \
   Object_Loader.i \
-  Object_SArgument_T.inl \
-  Objref_VarOut_T.inl \
-  OctetSeqC.inl \
-  PICurrent.inl \
-  PI_ForwardC.inl \
+  ObjectIdListC.i \
+  operation_details.i \
+  ORB.i \
+  ORB_Core.i \
+  params.i \
   Parser_Registry.i \
+  PI_ForwardC.i \
   Pluggable_Messaging.i \
   Pluggable_Messaging_Utils.i \
-  PolicyC.i \
   Policy_ForwardC.i \
   Policy_Manager.i \
   Policy_Set.i \
+  PolicyC.i \
   PollableC.i \
   PollableS.i \
   PollableS_T.i \
   PortableInterceptorC.i \
   Principal.i \
   Profile.i \
-  Profile_Transport_Resolver.inl \
-  Pseudo_VarOut_T.inl \
-  Queued_Message.inl \
-  Refcounted_ObjectKey.inl \
+  qt_resource.i \
   Reply_Dispatcher.i \
-  Resume_Handle.inl \
-  Seq_Out_T.inl \
-  Seq_Var_T.inl \
   Sequence.i \
   Sequence_T.i \
   Service_Callbacks.i \
-  Service_Context.inl \
   ServicesC.i \
   ServicesS.i \
   ServicesS_T.i \
   ShortSeqC.i \
-  Special_Basic_Argument_T.inl \
-  Special_Basic_SArgument_T.inl \
-  StringSeqC.inl \
   Stub.i \
   Sync_Strategies.i \
-  Synch_Invocation.inl \
-  Synch_Refcountable.inl \
-  SystemException.inl \
+  Tagged_Components.i \
+  Tagged_Profile.i \
+  TAO_Server_Request.i \
   TAOC.i \
   TAOS.i \
   TAOS_T.i \
-  TAO_Server_Request.i \
-  TAO_Singleton.inl \
-  TAO_Singleton_Manager.inl \
-  Tagged_Components.i \
-  Tagged_Profile.i \
+  target_specification.i \
   Thread_Lane_Resources_Manager.i \
   TimeBaseC.i \
   TimeBaseS.i \
   TimeBaseS_T.i \
+  Typecode.i \
+  ULongSeqC.i \
+  UShortSeqC.i \
+  WrongTransactionC.i \
+  xt_resource.i \
+  Any_Array_Impl_T.inl \
+  Any_Basic_Impl_T.inl \
+  Any_Dual_Impl_T.inl \
+  Any_Impl_T.inl \
+  Any_Special_Impl_T.inl \
+  AnySeqC.inl \
+  Array_VarOut_T.inl \
+  Base_Transport_Property.inl \
+  Basic_Argument_T.inl \
+  Basic_SArgument_T.inl \
+  BD_String_Argument_T.inl \
+  BD_String_SArgument_T.inl \
+  Cache_Entries.inl \
+  CharSeqC.inl \
+  Cleanup_Func_Registry.inl \
+  ClientRequestInfo.inl \
+  ClientRequestInfo_i.inl \
+  ClientRequestInterceptor_Adapter.inl \
+  Condition.inl \
+  Connection_Handler.inl \
+  Connection_Purging_Strategy.inl \
+  Connector_Impl.inl \
+  CORBA_String.inl \
+  DLL_ORB.inl \
+  DoubleSeqC.inl \
+  Fixed_Array_Argument_T.inl \
+  Fixed_Array_SArgument_T.inl \
+  Fixed_Size_Argument_T.inl \
+  Fixed_Size_SArgument_T.inl \
+  GIOP_Message_Generator_Parser.inl \
+  GIOP_Message_Generator_Parser_10.inl \
+  GIOP_Message_Generator_Parser_11.inl \
+  GIOP_Message_Generator_Parser_12.inl \
+  GIOP_Message_Generator_Parser_Impl.inl \
+  GIOP_Message_State.inl \
+  GIOP_Message_Version.inl \
+  Incoming_Message_Queue.inl \
+  Interceptor_List.inl \
+  Invocation_Adapter.inl \
+  Invocation_Base.inl \
+  LF_Event.inl \
+  LF_Event_Binder.inl \
+  LF_Event_Loop_Thread_Helper.inl \
+  LF_Follower.inl \
+  LF_Follower_Auto_Adder.inl \
+  LF_Follower_Auto_Ptr.inl \
+  LF_Invocation_Event.inl \
+  LF_Strategy.inl \
+  LF_Strategy_Complete.inl \
+  LongDoubleSeqC.inl \
+  LongLongSeqC.inl \
+  LongSeqC.inl \
+  Object_Argument_T.inl \
+  Object_SArgument_T.inl \
+  Objref_VarOut_T.inl \
+  OctetSeqC.inl \
+  ORB_Core_Auto_Ptr.inl \
+  ORB_Table.inl \
+  ORBInitInfo.inl \
+  PICurrent.inl \
+  Profile_Transport_Resolver.inl \
+  Pseudo_VarOut_T.inl \
+  Queued_Message.inl \
+  Refcounted_ObjectKey.inl \
+  Resume_Handle.inl \
+  Seq_Out_T.inl \
+  Seq_Var_T.inl \
+  Service_Context.inl \
+  Special_Basic_Argument_T.inl \
+  Special_Basic_SArgument_T.inl \
+  StringSeqC.inl \
+  Synch_Invocation.inl \
+  Synch_Refcountable.inl \
+  TAO_Singleton.inl \
+  TAO_Singleton_Manager.inl \
   Transport.inl \
   Transport_Acceptor.inl \
   Transport_Cache_Manager.inl \
   Transport_Connector.inl \
   Transport_Descriptor_Interface.inl \
-  Typecode.i \
   UB_String_Argument_T.inl \
   UB_String_SArgument_T.inl \
   ULongLongSeqC.inl \
-  ULongSeqC.i \
-  UShortSeqC.i \
-  UserException.inl \
-  VarOut_T.inl \
   Var_Array_Argument_T.inl \
   Var_Array_SArgument_T.inl \
   Var_Size_Argument_T.inl \
   Var_Size_SArgument_T.inl \
+  VarOut_T.inl \
+  Wait_Strategy.inl \
   WCharSeqC.inl \
   WStringSeqC.inl \
-  Wait_Strategy.inl \
-  WrongTransactionC.i \
-  corbafwd.i \
-  default_client.i \
-  default_resource.i \
-  default_server.i \
-  operation_details.i \
-  params.i \
-  qt_resource.i \
-  target_specification.i \
-  xt_resource.i \
-  Acceptor_Impl.cpp \
   Any_Array_Impl_T.cpp \
   Any_Basic_Impl_T.cpp \
   Any_Dual_Impl_T.cpp \
   Any_Impl_T.cpp \
   Any_Special_Impl_T.cpp \
   Array_VarOut_T.cpp \
-  BD_String_Argument_T.cpp \
-  BD_String_SArgument_T.cpp \
   Basic_Argument_T.cpp \
   Basic_SArgument_T.cpp \
+  BD_String_Argument_T.cpp \
+  BD_String_SArgument_T.cpp \
   Buffer_Allocator_T.cpp \
-  CONV_FRAMES_T.cpp \
   Codeset_Translator_Factory_T.cpp \
-  Condition.cpp \
-  Connector_Impl.cpp \
+  CONV_FRAMES_T.cpp \
   Fixed_Array_Argument_T.cpp \
   Fixed_Array_SArgument_T.cpp \
   Fixed_Size_Argument_T.cpp \
@@ -898,62 +886,20 @@ nobase_include_HEADERS = \
   Special_Basic_Argument_T.cpp \
   Special_Basic_SArgument_T.cpp \
   TAOS_T.cpp \
-  TAO_Singleton.cpp \
   TimeBaseS_T.cpp \
   UB_String_Argument_T.cpp \
   UB_String_SArgument_T.cpp \
-  VarOut_T.cpp \
   Var_Array_Argument_T.cpp \
   Var_Array_SArgument_T.cpp \
   Var_Size_Argument_T.cpp \
   Var_Size_SArgument_T.cpp \
-  orb.idl \
-  AnySeq.pidl \
-  BooleanSeq.pidl \
-  Bounds.pidl \
-  CONV_FRAME.pidl \
-  CharSeq.pidl \
-  Current.pidl \
-  Domain.pidl \
-  DoubleSeq.pidl \
-  Dynamic.pidl \
-  Dynamic_Parameter.pidl \
-  FloatSeq.pidl \
-  GIOP.pidl \
-  IIOP.pidl \
-  IIOP_Endpoints.pidl \
-  IOP.pidl \
-  IOP_Codec.pidl \
-  IOP_IOR.pidl \
-  InterfaceDef.pidl \
-  InvalidName.pidl \
-  LongDoubleSeq.pidl \
-  LongLongSeq.pidl \
-  LongSeq.pidl \
-  Messaging_PolicyValue.pidl \
-  Messaging_SyncScope.pidl \
-  ObjectIdList.pidl \
-  Object_Key.pidl \
-  OctetSeq.pidl \
-  PI_Forward.pidl \
-  Policy.pidl \
-  Policy_Forward.pidl \
-  Pollable.pidl \
-  PortableInterceptor.pidl \
-  Services.pidl \
-  ShortSeq.pidl \
-  StringSeq.pidl \
-  TAO.pidl \
-  TimeBase.pidl \
-  ULongLongSeq.pidl \
-  ULongSeq.pidl \
-  UShortSeq.pidl \
-  WCharSeq.pidl \
-  WStringSeq.pidl \
-  WrongTransaction.pidl
-
-EXTRA_DIST = \
-  tao.rc
+  VarOut_T.cpp \
+  Acceptor_Impl.cpp \
+  Condition.cpp \
+  Connector_Impl.cpp \
+  TAO_Singleton.cpp \
+  orb.idl
+
 
 ## Makefile.BiDir_GIOP.am 
 
@@ -967,34 +913,145 @@ libTAO_BiDirGIOP_la_CPPFLAGS = \
   -DTAO_BIDIRGIOP_BUILD_DLL
 
 libTAO_BiDirGIOP_la_SOURCES = \
-  BiDir_GIOP/BiDirGIOP.cpp \
   BiDir_GIOP/BiDirPolicyC.cpp \
   BiDir_GIOP/BiDirPolicy_Validator.cpp \
   BiDir_GIOP/BiDir_ORBInitializer.cpp \
   BiDir_GIOP/BiDir_PolicyFactory.cpp \
-  BiDir_GIOP/BiDir_Policy_i.cpp
+  BiDir_GIOP/BiDir_Policy_i.cpp \
+  BiDir_GIOP/BiDirGIOP.cpp
 
 libTAO_BiDirGIOP_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_BiDirGIOP_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
+nobase_pkginclude_HEADERS += \
   BiDir_GIOP/BiDirGIOP.h \
   BiDir_GIOP/BiDirPolicyC.h \
-  BiDir_GIOP/BiDirPolicy_Validator.h \
   BiDir_GIOP/BiDir_ORBInitializer.h \
   BiDir_GIOP/BiDir_PolicyFactory.h \
   BiDir_GIOP/BiDir_Policy_i.h \
   BiDir_GIOP/bidirgiop_export.h \
+  BiDir_GIOP/BiDirPolicy_Validator.h \
   BiDir_GIOP/BiDirPolicyC.i \
-  BiDir_GIOP/BiDir_Policy_i.inl \
-  BiDir_GIOP/BiDirPolicy.pidl
+  BiDir_GIOP/BiDir_Policy_i.inl
+
+
+## Makefile.Valuetype.am 
+
+lib_LTLIBRARIES += libTAO_Valuetype.la
+
+libTAO_Valuetype_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_VALUETYPE_BUILD_DLL
+
+libTAO_Valuetype_la_SOURCES = \
+  Valuetype/AbstractBase.cpp \
+  Valuetype/AbstractBase_Invocation_Adapter.cpp \
+  Valuetype/Seq_Tmplinst.cpp \
+  Valuetype/ValueFactory_Map.cpp \
+  Valuetype/ValueBase.cpp \
+  Valuetype/ValueFactory.cpp \
+  Valuetype/Valuetype_Adapter_Impl.cpp
+
+libTAO_Valuetype_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_Valuetype_la_LIBADD = \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
+  Valuetype/AbstractBase.h \
+  Valuetype/Sequence_T.h \
+  Valuetype/AbstractBase_Invocation_Adapter.h \
+  Valuetype/AbstractBase_T.h \
+  Valuetype/ValueBase.h \
+  Valuetype/ValueFactory.h \
+  Valuetype/Value_CORBA_methods.h \
+  Valuetype/ValueFactory_Map.h \
+  Valuetype/Value_VarOut_T.h \
+  Valuetype/Valuetype_Adapter_Impl.h \
+  Valuetype/valuetype_export.h \
+  Valuetype/AbstractBase.inl \
+  Valuetype/Sequence_T.inl \
+  Valuetype/ValueBase.inl \
+  Valuetype/ValueFactory.inl \
+  Valuetype/ValueFactory_Map.inl \
+  Valuetype/Value_VarOut_T.inl \
+  Valuetype/AbstractBase_T.cpp \
+  Valuetype/Sequence_T.cpp \
+  Valuetype/Value_VarOut_T.cpp
+
+
+## Makefile.ObjRefTemplate.am 
+
+lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
+
+libTAO_ObjRefTemplate_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_ORT_BUILD_DLL
+
+libTAO_ObjRefTemplate_la_SOURCES = \
+  ObjRefTemplate/ObjectReferenceTemplateC.cpp
+
+libTAO_ObjRefTemplate_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_ObjRefTemplate_la_LIBADD = \
+ libTAO_Valuetype.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
+  ObjRefTemplate/ObjectReferenceTemplateC.h \
+  ObjRefTemplate/ort_export.h \
+  ObjRefTemplate/ObjectReferenceTemplateC.i
+
+
+## Makefile.IORInterceptor.am 
+
+lib_LTLIBRARIES += libTAO_IORInterceptor.la
+
+libTAO_IORInterceptor_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_IORINTERCEPTOR_BUILD_DLL
+
+libTAO_IORInterceptor_la_SOURCES = \
+  IORInterceptor/IORInterceptor_List.cpp \
+  IORInterceptor/IORInterceptorC.cpp \
+  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \
+  IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+
+libTAO_IORInterceptor_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_IORInterceptor_la_LIBADD = \
+ libTAO_ObjRefTemplate.la \
+ libTAO_Valuetype.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
+  IORInterceptor/IORInterceptorC.h \
+  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
+  IORInterceptor/IORInterceptor_Adapter_Impl.h \
+  IORInterceptor/IORInterceptor_List.h \
+  IORInterceptor/iorinterceptor_export.h \
+  IORInterceptor/IORInterceptorC.i \
+  IORInterceptor/IORInterceptor_List.inl
 
-EXTRA_DIST += \
-  BiDir_GIOP/TAO_BiDir_GIOP.rc
 
 ## Makefile.PortableServer.am 
 
@@ -1008,11 +1065,15 @@ libTAO_PortableServer_la_CPPFLAGS = \
   -DTAO_PORTABLESERVER_BUILD_DLL
 
 libTAO_PortableServer_la_SOURCES = \
+  PortableServer/Default_Acceptor_Filter.cpp \
+  PortableServer/AMH_Response_Handler.cpp \
   PortableServer/Active_Object_Map.cpp \
+  PortableServer/Object_Adapter.cpp \
   PortableServer/Collocated_Object_Proxy_Broker.cpp \
-  PortableServer/Default_Acceptor_Filter.cpp \
-  PortableServer/Default_Policy_Validator.cpp \
+  PortableServer/Default_ORTC.cpp \
+  PortableServer/IORInfo.cpp \
   PortableServer/Default_Servant_Dispatcher.cpp \
+  PortableServer/Default_Policy_Validator.cpp \
   PortableServer/ImR_LocatorC.cpp \
   PortableServer/ImR_LocatorS.cpp \
   PortableServer/ImplRepoC.cpp \
@@ -1020,19 +1081,16 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/ImplRepo_i.cpp \
   PortableServer/Key_Adapters.cpp \
   PortableServer/ORB_Manager.cpp \
-  PortableServer/ORT_Adapter.cpp \
-  PortableServer/ORT_Adapter_Factory.cpp \
-  PortableServer/Object_Adapter.cpp \
+  PortableServer/POA.cpp \
+  PortableServer/ObjectReferenceTemplate.cpp \
   PortableServer/Operation_Table.cpp \
   PortableServer/PICurrent_Guard.cpp \
-  PortableServer/POA.cpp \
-  PortableServer/POAManager.cpp \
   PortableServer/POA_Cached_Policies.cpp \
+  PortableServer/POAManager.cpp \
+  PortableServer/PortableServer.cpp \
   PortableServer/POA_Policies.cpp \
   PortableServer/POA_Policy_Set.cpp \
-  PortableServer/PolicyS.cpp \
   PortableServer/PortableGroup_Hooks.cpp \
-  PortableServer/PortableServer.cpp \
   PortableServer/PortableServerA.cpp \
   PortableServer/PortableServerC.cpp \
   PortableServer/PortableServer_ORBInitializer.cpp \
@@ -1040,20 +1098,27 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/Servant_Base.cpp \
   PortableServer/Servant_Dispatcher.cpp \
   PortableServer/ServerInterceptorAdapter.cpp \
-  PortableServer/ServerRequestInfo.cpp
+  PortableServer/ServerRequestInfo.cpp \
+  PortableServer/PolicyS.cpp
 
 libTAO_PortableServer_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_PortableServer_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  PortableServer/Active_Object_Map.h \
+ libTAO_IORInterceptor.la \
+ libTAO_ObjRefTemplate.la \
+ libTAO_Valuetype.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
+  PortableServer/AMH_Response_Handler.h \
   PortableServer/Collocated_Object_Proxy_Broker.h \
   PortableServer/Default_Acceptor_Filter.h \
+  PortableServer/Default_ORTC.h \
+  PortableServer/POA.h \
   PortableServer/Default_Policy_Validator.h \
+  PortableServer/IORInfo.h \
   PortableServer/Default_Servant_Dispatcher.h \
   PortableServer/ImR_LocatorC.h \
   PortableServer/ImR_LocatorS.h \
@@ -1062,56 +1127,53 @@ nobase_include_HEADERS += \
   PortableServer/ImplRepo_i.h \
   PortableServer/Key_Adapters.h \
   PortableServer/ORB_Manager.h \
-  PortableServer/ORT_Adapter.h \
-  PortableServer/ORT_Adapter_Factory.h \
+  PortableServer/ObjectReferenceTemplate.h \
   PortableServer/Object_Adapter.h \
   PortableServer/Operation_Table.h \
+  PortableServer/PolicyS_T.h \
+  PortableServer/PolicyS.h \
   PortableServer/PICurrent_Guard.h \
-  PortableServer/POA.h \
   PortableServer/POAManager.h \
   PortableServer/POA_Cached_Policies.h \
   PortableServer/POA_Policies.h \
   PortableServer/POA_Policy_Set.h \
-  PortableServer/PolicyS.h \
-  PortableServer/PolicyS_T.h \
+  PortableServer/PortableServer_ORBInitializer.h \
   PortableServer/PortableGroup_Hooks.h \
   PortableServer/PortableServer.h \
   PortableServer/PortableServerC.h \
   PortableServer/PortableServerS.h \
-  PortableServer/PortableServer_ORBInitializer.h \
+  PortableServer/poa_macros.h \
   PortableServer/PortableServer_PolicyFactory.h \
   PortableServer/Servant_Base.h \
   PortableServer/Servant_Dispatcher.h \
   PortableServer/ServerInterceptorAdapter.h \
   PortableServer/ServerRequestInfo.h \
   PortableServer/Upcall_Wrapper.h \
-  PortableServer/poa_macros.h \
   PortableServer/portableserver_export.h \
+  PortableServer/Active_Object_Map.h \
   PortableServer/Active_Object_Map.i \
-  PortableServer/ImR_LocatorC.inl \
-  PortableServer/ImR_LocatorS.inl \
-  PortableServer/ImplRepoC.inl \
-  PortableServer/ImplRepoS.inl \
+  PortableServer/Default_ORTC.i \
+  PortableServer/IORInfo.inl \
+  PortableServer/ImR_LocatorC.i \
+  PortableServer/ImR_LocatorS.i \
+  PortableServer/ImplRepoC.i \
+  PortableServer/ImplRepoS.i \
   PortableServer/Key_Adapters.i \
+  PortableServer/ObjectReferenceTemplate.inl \
   PortableServer/Object_Adapter.i \
   PortableServer/POA.i \
   PortableServer/POAManager.i \
   PortableServer/POA_Cached_Policies.i \
   PortableServer/POA_Policies.i \
   PortableServer/POA_Policy_Set.i \
-  PortableServer/PolicyS.inl \
-  PortableServer/PolicyS_T.inl \
-  PortableServer/PortableServerC.inl \
+  PortableServer/PolicyS.i \
+  PortableServer/PolicyS_T.i \
+  PortableServer/PortableServerC.i \
   PortableServer/Servant_Base.i \
   PortableServer/ServerInterceptorAdapter.inl \
   PortableServer/ServerRequestInfo.inl \
-  PortableServer/PolicyS_T.cpp \
-  PortableServer/ImR_Locator.pidl \
-  PortableServer/ImplRepo.pidl \
-  PortableServer/PortableServer.pidl
+  PortableServer/PolicyS_T.cpp
 
-EXTRA_DIST += \
-  PortableServer/TAO_PortableServer.rc
 
 ## Makefile.IFR_Client.am 
 
@@ -1139,10 +1201,10 @@ libTAO_IFR_Client_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_IFR_Client_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
+nobase_pkginclude_HEADERS += \
   IFR_Client/IFR_BaseC.h \
   IFR_Client/IFR_BaseS.h \
   IFR_Client/IFR_BasicC.h \
@@ -1153,14 +1215,8 @@ nobase_include_HEADERS += \
   IFR_Client/IFR_BaseC.i \
   IFR_Client/IFR_BasicC.i \
   IFR_Client/IFR_ComponentsC.i \
-  IFR_Client/IFR_ExtendedC.i \
-  IFR_Client/IFR_Base.pidl \
-  IFR_Client/IFR_Basic.pidl \
-  IFR_Client/IFR_Components.pidl \
-  IFR_Client/IFR_Extended.pidl
+  IFR_Client/IFR_ExtendedC.i
 
-EXTRA_DIST += \
-  IFR_Client/TAO_IFR_Client.rc
 
 ## Makefile.Domain.am 
 
@@ -1180,12 +1236,15 @@ libTAO_Domain_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_Domain_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_IFR_Client.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_PortableServer.la \
+ libTAO_IORInterceptor.la \
+ libTAO_ObjRefTemplate.la \
+ libTAO_Valuetype.la \
+ libTAO_IFR_Client.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
   Domain/DomainS.h \
   Domain/DomainS_T.h \
   Domain/domain_export.h \
@@ -1193,8 +1252,6 @@ nobase_include_HEADERS += \
   Domain/DomainS_T.i \
   Domain/DomainS_T.cpp
 
-EXTRA_DIST += \
-  Domain/TAO_Domain.rc
 
 ## Makefile.DynamicAny.am 
 
@@ -1208,7 +1265,6 @@ libTAO_DynamicAny_la_CPPFLAGS = \
   -DTAO_DYNAMICANY_BUILD_DLL
 
 libTAO_DynamicAny_la_SOURCES = \
-  DynamicAny/DynAnyFactory.cpp \
   DynamicAny/DynAny_i.cpp \
   DynamicAny/DynArray_i.cpp \
   DynamicAny/DynCommon.cpp \
@@ -1217,17 +1273,18 @@ libTAO_DynamicAny_la_SOURCES = \
   DynamicAny/DynStruct_i.cpp \
   DynamicAny/DynUnion_i.cpp \
   DynamicAny/DynamicAny.cpp \
-  DynamicAny/DynamicAnyC.cpp
+  DynamicAny/DynamicAnyC.cpp \
+  DynamicAny/DynAnyFactory.cpp
 
 libTAO_DynamicAny_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_DynamicAny_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ libTAO_Valuetype.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
-  DynamicAny/DynAnyFactory.h \
+nobase_pkginclude_HEADERS += \
   DynamicAny/DynAny_i.h \
   DynamicAny/DynArray_i.h \
   DynamicAny/DynCommon.h \
@@ -1238,63 +1295,9 @@ nobase_include_HEADERS += \
   DynamicAny/DynamicAny.h \
   DynamicAny/DynamicAnyC.h \
   DynamicAny/dynamicany_export.h \
-  DynamicAny/DynamicAnyC.i \
-  DynamicAny/DynamicAny.pidl
-
-EXTRA_DIST += \
-  DynamicAny/TAO_DynamicAny.rc
-
-## Makefile.Valuetype.am 
-
-lib_LTLIBRARIES += libTAO_Valuetype.la
-
-libTAO_Valuetype_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_VALUETYPE_BUILD_DLL
-
-libTAO_Valuetype_la_SOURCES = \
-  Valuetype/AbstractBase.cpp \
-  Valuetype/AbstractBase_Invocation_Adapter.cpp \
-  Valuetype/Seq_Tmplinst.cpp \
-  Valuetype/ValueBase.cpp \
-  Valuetype/ValueFactory.cpp \
-  Valuetype/ValueFactory_Map.cpp \
-  Valuetype/Valuetype_Adapter_Impl.cpp
-
-libTAO_Valuetype_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Valuetype_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Valuetype/AbstractBase.h \
-  Valuetype/AbstractBase_Invocation_Adapter.h \
-  Valuetype/AbstractBase_T.h \
-  Valuetype/Sequence_T.h \
-  Valuetype/ValueBase.h \
-  Valuetype/ValueFactory.h \
-  Valuetype/ValueFactory_Map.h \
-  Valuetype/Value_CORBA_methods.h \
-  Valuetype/Value_VarOut_T.h \
-  Valuetype/Valuetype_Adapter_Impl.h \
-  Valuetype/valuetype_export.h \
-  Valuetype/AbstractBase.inl \
-  Valuetype/Sequence_T.inl \
-  Valuetype/ValueBase.inl \
-  Valuetype/ValueFactory.inl \
-  Valuetype/ValueFactory_Map.inl \
-  Valuetype/Value_VarOut_T.inl \
-  Valuetype/AbstractBase_T.cpp \
-  Valuetype/Sequence_T.cpp \
-  Valuetype/Value_VarOut_T.cpp
+  DynamicAny/DynAnyFactory.h \
+  DynamicAny/DynamicAnyC.i
 
-EXTRA_DIST += \
-  Valuetype/TAO_Valuetype.rc
 
 ## Makefile.Messaging.am 
 
@@ -1308,40 +1311,41 @@ libTAO_Messaging_la_CPPFLAGS = \
   -DTAO_MESSAGING_BUILD_DLL
 
 libTAO_Messaging_la_SOURCES = \
-  Messaging/AMH_Response_Handler.cpp \
-  Messaging/Asynch_Invocation.cpp \
-  Messaging/Asynch_Invocation_Adapter.cpp \
+  Messaging/Connection_Timeout_Policy_i.cpp \
   Messaging/Asynch_Reply_Dispatcher.cpp \
   Messaging/Asynch_Timeout_Handler.cpp \
-  Messaging/Connection_Timeout_Policy_i.cpp \
   Messaging/Messaging.cpp \
   Messaging/MessagingC.cpp \
   Messaging/MessagingS.cpp \
-  Messaging/Messaging_No_ImplC.cpp \
   Messaging/Messaging_ORBInitializer.cpp \
-  Messaging/Messaging_PolicyFactory.cpp \
+  Messaging/Messaging_No_ImplC.cpp \
   Messaging/Messaging_Policy_i.cpp \
+  Messaging/Messaging_PolicyFactory.cpp \
   Messaging/Messaging_RT_PolicyC.cpp \
   Messaging/Messaging_SyncScope_PolicyC.cpp \
-  Messaging/TAO_ExtC.cpp
+  Messaging/TAO_ExtC.cpp \
+  Messaging/Asynch_Invocation_Adapter.cpp \
+  Messaging/Asynch_Invocation.cpp
 
 libTAO_Messaging_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_Messaging_la_LIBADD = \
-  libTAO_Valuetype.la \
-  libTAO_PortableServer.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Messaging/AMH_Response_Handler.h \
+ libTAO_PortableServer.la \
+ libTAO_IORInterceptor.la \
+ libTAO_ObjRefTemplate.la \
+ libTAO_Valuetype.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
   Messaging/Asynch_Invocation.h \
   Messaging/Asynch_Invocation_Adapter.h \
   Messaging/Asynch_Reply_Dispatcher.h \
   Messaging/Asynch_Timeout_Handler.h \
   Messaging/Connection_Timeout_Policy_i.h \
   Messaging/Messaging.h \
+  Messaging/TAO_ExtC.h \
   Messaging/MessagingC.h \
   Messaging/MessagingS.h \
   Messaging/MessagingS_T.h \
@@ -1351,7 +1355,6 @@ nobase_include_HEADERS += \
   Messaging/Messaging_Policy_i.h \
   Messaging/Messaging_RT_PolicyC.h \
   Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/TAO_ExtC.h \
   Messaging/messaging_export.h \
   Messaging/Asynch_Invocation_Adapter.inl \
   Messaging/Asynch_Reply_Dispatcher.i \
@@ -1363,20 +1366,11 @@ nobase_include_HEADERS += \
   Messaging/Messaging_RT_PolicyC.i \
   Messaging/Messaging_SyncScope_PolicyC.i \
   Messaging/TAO_ExtC.i \
-  Messaging/MessagingS_T.cpp \
-  Messaging/Messaging.pidl \
-  Messaging/Messaging_No_Impl.pidl \
-  Messaging/Messaging_RT_Policy.pidl \
-  Messaging/Messaging_SyncScope_Policy.pidl \
-  Messaging/TAO_Ext.pidl
+  Messaging/MessagingS_T.cpp
 
-EXTRA_DIST += \
-  Messaging/TAO_Messaging.rc
 
 ## Makefile.DynamicInterface.am 
 
-if !BUILD_MINIMUM_CORBA
-
 lib_LTLIBRARIES += libTAO_DynamicInterface.la
 
 libTAO_DynamicInterface_la_CPPFLAGS = \
@@ -1387,29 +1381,31 @@ libTAO_DynamicInterface_la_CPPFLAGS = \
   -DTAO_DYNAMICINTERFACE_BUILD_DLL
 
 libTAO_DynamicInterface_la_SOURCES = \
-  DynamicInterface/Context.cpp \
   DynamicInterface/DII_Arguments.cpp \
-  DynamicInterface/DII_Invocation.cpp \
+  DynamicInterface/Context.cpp \
   DynamicInterface/DII_Invocation_Adapter.cpp \
-  DynamicInterface/DII_Reply_Dispatcher.cpp \
-  DynamicInterface/Dynamic_Adapter_Impl.cpp \
+  DynamicInterface/DII_Invocation.cpp \
   DynamicInterface/Dynamic_Implementation.cpp \
-  DynamicInterface/ExceptionList.cpp \
+  DynamicInterface/DII_Reply_Dispatcher.cpp \
   DynamicInterface/Request.cpp \
-  DynamicInterface/Server_Request.cpp \
-  DynamicInterface/Unknown_User_Exception.cpp
+  DynamicInterface/ExceptionList.cpp \
+  DynamicInterface/Dynamic_Adapter_Impl.cpp \
+  DynamicInterface/Unknown_User_Exception.cpp \
+  DynamicInterface/Server_Request.cpp
 
 libTAO_DynamicInterface_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_DynamicInterface_la_LIBADD = \
-  libTAO_Messaging.la \
-  libTAO_PortableServer.la \
-  libTAO_Valuetype.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_Messaging.la \
+ libTAO_PortableServer.la \
+ libTAO_IORInterceptor.la \
+ libTAO_ObjRefTemplate.la \
+ libTAO_Valuetype.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
   DynamicInterface/Context.h \
   DynamicInterface/DII_Arguments.h \
   DynamicInterface/DII_CORBA_methods.h \
@@ -1430,100 +1426,6 @@ nobase_include_HEADERS += \
   DynamicInterface/Request.inl \
   DynamicInterface/Server_Request.inl
 
-endif !BUILD_MINIMUM_CORBA
-
-EXTRA_DIST += \
-  DynamicInterface/TAO_DynamicInterface.rc
-
-## Makefile.ObjRefTemplate.am 
-
-lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
-
-libTAO_ObjRefTemplate_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_ORT_BUILD_DLL
-
-libTAO_ObjRefTemplate_la_SOURCES = \
-  ObjRefTemplate/Default_ORTC.cpp \
-  ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp \
-  ObjRefTemplate/ORT_Adapter_Impl.cpp \
-  ObjRefTemplate/ObjectReferenceTemplateC.cpp \
-  ObjRefTemplate/ObjectReferenceTemplate_i.cpp
-
-libTAO_ObjRefTemplate_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_ObjRefTemplate_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_Valuetype.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  ObjRefTemplate/Default_ORTC.h \
-  ObjRefTemplate/ORT_Adapter_Factory_Impl.h \
-  ObjRefTemplate/ORT_Adapter_Impl.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.h \
-  ObjRefTemplate/ObjectReferenceTemplate_i.h \
-  ObjRefTemplate/ort_export.h \
-  ObjRefTemplate/Default_ORTC.i \
-  ObjRefTemplate/ObjectReferenceTemplateC.inl \
-  ObjRefTemplate/ObjectReferenceTemplate_i.inl \
-  ObjRefTemplate/Default_ORT.pidl \
-  ObjRefTemplate/ObjectReferenceTemplate.pidl
-
-EXTRA_DIST += \
-  ObjRefTemplate/TAO_ObjRefTemplate.rc
-
-## Makefile.IORInterceptor.am 
-
-lib_LTLIBRARIES += libTAO_IORInterceptor.la
-
-libTAO_IORInterceptor_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IORINTERCEPTOR_BUILD_DLL
-
-libTAO_IORInterceptor_la_SOURCES = \
-  IORInterceptor/IORInfo.cpp \
-  IORInterceptor/IORInfoC.cpp \
-  IORInterceptor/IORInterceptorC.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Impl.cpp \
-  IORInterceptor/IORInterceptor_List.cpp
-
-libTAO_IORInterceptor_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IORInterceptor_la_LIBADD = \
-  libTAO_ObjRefTemplate.la \
-  libTAO_Valuetype.la \
-  libTAO_PortableServer.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IORInterceptor/IORInfo.h \
-  IORInterceptor/IORInfoC.h \
-  IORInterceptor/IORInterceptorC.h \
-  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
-  IORInterceptor/IORInterceptor_Adapter_Impl.h \
-  IORInterceptor/IORInterceptor_List.h \
-  IORInterceptor/iorinterceptor_export.h \
-  IORInterceptor/IORInfo.inl \
-  IORInterceptor/IORInfoC.inl \
-  IORInterceptor/IORInterceptorC.inl \
-  IORInterceptor/IORInterceptor_List.inl \
-  IORInterceptor/IORInfo.pidl \
-  IORInterceptor/IORInterceptor.pidl
-
-EXTRA_DIST += \
-  IORInterceptor/TAO_IORInterceptor.rc
 
 ## Makefile.IORManipulation.am 
 
@@ -1546,19 +1448,16 @@ libTAO_IORManip_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_IORManip_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
+nobase_pkginclude_HEADERS += \
   IORManipulation/IORC.h \
   IORManipulation/IORManip_Loader.h \
   IORManipulation/IORManipulation.h \
   IORManipulation/ior_manip_export.h \
-  IORManipulation/IORC.i \
-  IORManipulation/IOR.pidl
+  IORManipulation/IORC.i
 
-EXTRA_DIST += \
-  IORManipulation/TAO_IORManip.rc
 
 ## Makefile.IORTable.am 
 
@@ -1572,34 +1471,29 @@ libTAO_IORTable_la_CPPFLAGS = \
   -DTAO_IORTABLE_BUILD_DLL
 
 libTAO_IORTable_la_SOURCES = \
-  IORTable/IORTable.cpp \
-  IORTable/IORTableC.cpp \
   IORTable/IOR_Table_Impl.cpp \
-  IORTable/Table_Adapter.cpp
+  IORTable/IORTableC.cpp \
+  IORTable/Table_Adapter.cpp \
+  IORTable/IORTable.cpp
 
 libTAO_IORTable_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_IORTable_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
+nobase_pkginclude_HEADERS += \
   IORTable/IORTable.h \
   IORTable/IORTableC.h \
   IORTable/IOR_Table_Impl.h \
-  IORTable/Table_Adapter.h \
   IORTable/iortable_export.h \
-  IORTable/IORTableC.i \
-  IORTable/IORTable.pidl
+  IORTable/Table_Adapter.h \
+  IORTable/IORTableC.i
 
-EXTRA_DIST += \
-  IORTable/TAO_IORTable.rc
 
 ## Makefile.RTCORBA.am 
 
-if BUILD_RT_CORBA
-
 lib_LTLIBRARIES += libTAO_RTCORBA.la
 
 libTAO_RTCORBA_la_CPPFLAGS = \
@@ -1610,23 +1504,22 @@ libTAO_RTCORBA_la_CPPFLAGS = \
   -DTAO_RTCORBA_BUILD_DLL
 
 libTAO_RTCORBA_la_SOURCES = \
-  RTCORBA/Continuous_Priority_Mapping.cpp \
   RTCORBA/Direct_Priority_Mapping.cpp \
-  RTCORBA/Linear_Network_Priority_Mapping.cpp \
+  RTCORBA/RTCORBA.cpp \
   RTCORBA/Linear_Priority_Mapping.cpp \
   RTCORBA/Multi_Priority_Mapping.cpp \
   RTCORBA/Network_Priority_Mapping.cpp \
   RTCORBA/Network_Priority_Mapping_Manager.cpp \
   RTCORBA/Priority_Mapping.cpp \
-  RTCORBA/Priority_Mapping_Manager.cpp \
-  RTCORBA/RTCORBA.cpp \
   RTCORBA/RTCORBAC.cpp \
+  RTCORBA/Priority_Mapping_Manager.cpp \
   RTCORBA/RT_Current.cpp \
+  RTCORBA/RT_Invocation_Endpoint_Selectors.cpp \
   RTCORBA/RT_Endpoint_Selector_Factory.cpp \
   RTCORBA/RT_Endpoint_Utils.cpp \
-  RTCORBA/RT_Invocation_Endpoint_Selectors.cpp \
   RTCORBA/RT_Mutex.cpp \
   RTCORBA/RT_ORB.cpp \
+  RTCORBA/RT_Transport_Descriptor.cpp \
   RTCORBA/RT_ORBInitializer.cpp \
   RTCORBA/RT_ORB_Loader.cpp \
   RTCORBA/RT_PolicyFactory.cpp \
@@ -1635,38 +1528,39 @@ libTAO_RTCORBA_la_SOURCES = \
   RTCORBA/RT_Stub.cpp \
   RTCORBA/RT_Stub_Factory.cpp \
   RTCORBA/RT_Thread_Lane_Resources_Manager.cpp \
-  RTCORBA/RT_Transport_Descriptor.cpp \
   RTCORBA/RT_Transport_Descriptor_Property.cpp \
-  RTCORBA/Thread_Pool.cpp
+  RTCORBA/Thread_Pool.cpp \
+  RTCORBA/Linear_Network_Priority_Mapping.cpp \
+  RTCORBA/Continuous_Priority_Mapping.cpp
 
 libTAO_RTCORBA_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTCORBA_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
+nobase_pkginclude_HEADERS += \
   RTCORBA/Continuous_Priority_Mapping.h \
   RTCORBA/Direct_Priority_Mapping.h \
+  RTCORBA/Priority_Mapping.h \
   RTCORBA/Linear_Network_Priority_Mapping.h \
   RTCORBA/Linear_Priority_Mapping.h \
+  RTCORBA/RTCORBA.h \
+  RTCORBA/Network_Priority_Mapping_Manager.h \
   RTCORBA/Multi_Priority_Mapping.h \
   RTCORBA/Network_Priority_Mapping.h \
-  RTCORBA/Network_Priority_Mapping_Manager.h \
-  RTCORBA/Priority_Mapping.h \
+  RTCORBA/RTCORBA_includeC.h \
   RTCORBA/Priority_Mapping_Manager.h \
-  RTCORBA/RTCORBA.h \
   RTCORBA/RTCORBAC.h \
-  RTCORBA/RTCORBA_includeC.h \
   RTCORBA/RTCORBA_includeS.h \
   RTCORBA/RT_Current.h \
   RTCORBA/RT_Endpoint_Selector_Factory.h \
   RTCORBA/RT_Endpoint_Utils.h \
+  RTCORBA/RT_ORBInitializer.h \
   RTCORBA/RT_Invocation_Endpoint_Selectors.h \
   RTCORBA/RT_Mutex.h \
   RTCORBA/RT_ORB.h \
-  RTCORBA/RT_ORBInitializer.h \
   RTCORBA/RT_ORB_Loader.h \
   RTCORBA/RT_PolicyFactory.h \
   RTCORBA/RT_Policy_i.h \
@@ -1698,19 +1592,11 @@ nobase_include_HEADERS += \
   RTCORBA/RT_Thread_Lane_Resources_Manager.i \
   RTCORBA/RT_Transport_Descriptor.inl \
   RTCORBA/RT_Transport_Descriptor_Property.inl \
-  RTCORBA/Thread_Pool.i \
-  RTCORBA/RTCORBA.pidl \
-  RTCORBA/RTCORBA_include.pidl
-
-endif BUILD_RT_CORBA
+  RTCORBA/Thread_Pool.i
 
-EXTRA_DIST += \
-  RTCORBA/TAO_RTCORBA.rc
 
 ## Makefile.RTPortableServer.am 
 
-if BUILD_RT_CORBA
-
 lib_LTLIBRARIES += libTAO_RTPortableServer.la
 
 libTAO_RTPortableServer_la_CPPFLAGS = \
@@ -1721,51 +1607,46 @@ libTAO_RTPortableServer_la_CPPFLAGS = \
   -DTAO_RTPORTABLESERVER_BUILD_DLL
 
 libTAO_RTPortableServer_la_SOURCES = \
-  RTPortableServer/RTPortableServer.cpp \
+  RTPortableServer/RT_Collocation_Resolver.cpp \
   RTPortableServer/RTPortableServerA.cpp \
   RTPortableServer/RTPortableServerC.cpp \
   RTPortableServer/RT_Acceptor_Filters.cpp \
-  RTPortableServer/RT_Collocation_Resolver.cpp \
   RTPortableServer/RT_Object_Adapter_Factory.cpp \
   RTPortableServer/RT_POA.cpp \
+  RTPortableServer/RT_Servant_Dispatcher.cpp \
   RTPortableServer/RT_Policy_Validator.cpp \
-  RTPortableServer/RT_Servant_Dispatcher.cpp
+  RTPortableServer/RTPortableServer.cpp
 
 libTAO_RTPortableServer_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTPortableServer_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_RTCORBA.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_PortableServer.la \
+ libTAO_IORInterceptor.la \
+ libTAO_ObjRefTemplate.la \
+ libTAO_Valuetype.la \
+ libTAO_RTCORBA.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
   RTPortableServer/RTPortableServer.h \
   RTPortableServer/RTPortableServerC.h \
   RTPortableServer/RT_Acceptor_Filters.h \
   RTPortableServer/RT_Collocation_Resolver.h \
-  RTPortableServer/RT_Object_Adapter_Factory.h \
   RTPortableServer/RT_POA.h \
+  RTPortableServer/RT_Object_Adapter_Factory.h \
   RTPortableServer/RT_Policy_Validator.h \
-  RTPortableServer/RT_Servant_Dispatcher.h \
   RTPortableServer/rtportableserver_export.h \
+  RTPortableServer/RT_Servant_Dispatcher.h \
   RTPortableServer/RTPortableServerC.i \
   RTPortableServer/RT_Acceptor_Filters.i \
   RTPortableServer/RT_Collocation_Resolver.i \
-  RTPortableServer/RT_POA.i \
-  RTPortableServer/RTPortableServer.pidl
-
-endif BUILD_RT_CORBA
+  RTPortableServer/RT_POA.i
 
-EXTRA_DIST += \
-  RTPortableServer/TAO_RTPortableServer.rc
 
 ## Makefile.RTScheduler.am 
 
-if BUILD_RT_CORBA
-if BUILD_CORBA_MESSAGING
-
 lib_LTLIBRARIES += libTAO_RTScheduler.la
 
 libTAO_RTScheduler_la_CPPFLAGS = \
@@ -1776,25 +1657,28 @@ libTAO_RTScheduler_la_CPPFLAGS = \
   -DTAO_RTSCHEDULER_BUILD_DLL
 
 libTAO_RTScheduler_la_SOURCES = \
-  RTScheduling/Current.cpp \
+  RTScheduling/RTScheduler_Initializer.cpp \
   RTScheduling/Distributable_Thread.cpp \
-  RTScheduling/RTScheduler.cpp \
   RTScheduling/RTSchedulerC.cpp \
-  RTScheduling/RTScheduler_Initializer.cpp \
   RTScheduling/RTScheduler_Loader.cpp \
   RTScheduling/RTScheduler_Manager.cpp \
-  RTScheduling/Request_Interceptor.cpp
+  RTScheduling/Request_Interceptor.cpp \
+  RTScheduling/RTScheduler.cpp \
+  RTScheduling/Current.cpp
 
 libTAO_RTScheduler_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTScheduler_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_RTCORBA.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_PortableServer.la \
+ libTAO_IORInterceptor.la \
+ libTAO_ObjRefTemplate.la \
+ libTAO_Valuetype.la \
+ libTAO_RTCORBA.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
   RTScheduling/Current.h \
   RTScheduling/Distributable_Thread.h \
   RTScheduling/RTScheduler.h \
@@ -1807,15 +1691,8 @@ nobase_include_HEADERS += \
   RTScheduling/ThreadAction.h \
   RTScheduling/rtscheduler_export.h \
   RTScheduling/RTSchedulerC.i \
-  RTScheduling/RTScheduler_Manager.i \
-  RTScheduling/RTScheduler.pidl \
-  RTScheduling/RTScheduler_include.pidl
+  RTScheduling/RTScheduler_Manager.i
 
-endif BUILD_CORBA_MESSAGING
-endif BUILD_RT_CORBA
-
-EXTRA_DIST += \
-  RTScheduling/TAO_RTScheduler.rc
 
 ## Makefile.SmartProxies.am 
 
@@ -1835,16 +1712,14 @@ libTAO_SmartProxies_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_SmartProxies_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
+nobase_pkginclude_HEADERS += \
   SmartProxies/Smart_Proxies.h \
   SmartProxies/smartproxies_export.h \
   SmartProxies/Smart_Proxies.inl
 
-EXTRA_DIST += \
-  SmartProxies/SmartProxies.rc
 
 ## Makefile.Strategies.am 
 
@@ -1859,17 +1734,18 @@ libTAO_Strategies_la_CPPFLAGS = \
 
 libTAO_Strategies_la_SOURCES = \
   Strategies/DIOP_Acceptor.cpp \
-  Strategies/DIOP_Connection_Handler.cpp \
   Strategies/DIOP_Connector.cpp \
+  Strategies/DIOP_Transport.cpp \
+  Strategies/DIOP_Connection_Handler.cpp \
   Strategies/DIOP_Endpoint.cpp \
   Strategies/DIOP_Factory.cpp \
   Strategies/DIOP_Profile.cpp \
-  Strategies/DIOP_Transport.cpp \
+  Strategies/LF_Strategy_Null.cpp \
   Strategies/FIFO_Connection_Purging_Strategy.cpp \
   Strategies/LFU_Connection_Purging_Strategy.cpp \
-  Strategies/LF_Strategy_Null.cpp \
   Strategies/NULL_Connection_Purging_Strategy.cpp \
   Strategies/SCIOP_Acceptor.cpp \
+  Strategies/SHMIOP_Connection_Handler.cpp \
   Strategies/SCIOP_Connection_Handler.cpp \
   Strategies/SCIOP_Connector.cpp \
   Strategies/SCIOP_Endpoint.cpp \
@@ -1878,21 +1754,20 @@ libTAO_Strategies_la_SOURCES = \
   Strategies/SCIOP_Profile.cpp \
   Strategies/SCIOP_Transport.cpp \
   Strategies/SHMIOP_Acceptor.cpp \
-  Strategies/SHMIOP_Connection_Handler.cpp \
+  Strategies/UIOP_Connection_Handler.cpp \
   Strategies/SHMIOP_Connector.cpp \
   Strategies/SHMIOP_Endpoint.cpp \
   Strategies/SHMIOP_Factory.cpp \
   Strategies/SHMIOP_Profile.cpp \
   Strategies/SHMIOP_Transport.cpp \
   Strategies/UIOP_Acceptor.cpp \
-  Strategies/UIOP_Connection_Handler.cpp \
+  Strategies/UIOP_Lite_Factory.cpp \
   Strategies/UIOP_Connector.cpp \
   Strategies/UIOP_Endpoint.cpp \
   Strategies/UIOP_Factory.cpp \
-  Strategies/UIOP_Lite_Factory.cpp \
+  Strategies/advanced_resource.cpp \
   Strategies/UIOP_Profile.cpp \
   Strategies/UIOP_Transport.cpp \
-  Strategies/advanced_resource.cpp \
   Strategies/sciop_endpoints.cpp \
   Strategies/uiop_endpoints.cpp
 
@@ -1900,10 +1775,10 @@ libTAO_Strategies_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_Strategies_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
+nobase_pkginclude_HEADERS += \
   Strategies/DIOP_Acceptor.h \
   Strategies/DIOP_Connection_Handler.h \
   Strategies/DIOP_Connector.h \
@@ -1911,12 +1786,12 @@ nobase_include_HEADERS += \
   Strategies/DIOP_Factory.h \
   Strategies/DIOP_Profile.h \
   Strategies/DIOP_Transport.h \
+  Strategies/SCIOP_Connection_Handler.h \
   Strategies/FIFO_Connection_Purging_Strategy.h \
   Strategies/LFU_Connection_Purging_Strategy.h \
   Strategies/LF_Strategy_Null.h \
   Strategies/NULL_Connection_Purging_Strategy.h \
   Strategies/SCIOP_Acceptor.h \
-  Strategies/SCIOP_Connection_Handler.h \
   Strategies/SCIOP_Connector.h \
   Strategies/SCIOP_Endpoint.h \
   Strategies/SCIOP_Factory.h \
@@ -1964,12 +1839,8 @@ nobase_include_HEADERS += \
   Strategies/UIOP_Transport.i \
   Strategies/advanced_resource.i \
   Strategies/sciop_endpoints.i \
-  Strategies/uiop_endpoints.i \
-  Strategies/sciop_endpoints.pidl \
-  Strategies/uiop_endpoints.pidl
+  Strategies/uiop_endpoints.i
 
-EXTRA_DIST += \
-  Strategies/TAO_Strategies.rc
 
 ## Makefile.TypeCodeFactory.am 
 
@@ -1985,28 +1856,25 @@ libTAO_TypeCodeFactory_la_CPPFLAGS = \
 libTAO_TypeCodeFactory_la_SOURCES = \
   TypeCodeFactory/TypeCodeFactoryC.cpp \
   TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp \
-  TypeCodeFactory/TypeCodeFactory_Loader.cpp \
-  TypeCodeFactory/TypeCodeFactory_i.cpp
+  TypeCodeFactory/TypeCodeFactory_i.cpp \
+  TypeCodeFactory/TypeCodeFactory_Loader.cpp
 
 libTAO_TypeCodeFactory_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_TypeCodeFactory_la_LIBADD = \
-  libTAO_IFR_Client.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+ libTAO_IFR_Client.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
+nobase_pkginclude_HEADERS += \
   TypeCodeFactory/TypeCodeFactoryC.h \
   TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h \
   TypeCodeFactory/TypeCodeFactory_Loader.h \
   TypeCodeFactory/TypeCodeFactory_i.h \
   TypeCodeFactory/typecodefactory_export.h \
-  TypeCodeFactory/TypeCodeFactoryC.inl \
-  TypeCodeFactory/TypeCodeFactory.pidl
+  TypeCodeFactory/TypeCodeFactoryC.inl
 
-EXTRA_DIST += \
-  TypeCodeFactory/TypeCodeFactory.rc
 
 ## Makefile.Utils.am 
 
@@ -2031,11 +1899,14 @@ libTAO_Utils_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_Utils_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
+ libTAO_PortableServer.la \
+ libTAO_IORInterceptor.la \
+ libTAO_ObjRefTemplate.la \
+ libTAO_Valuetype.la \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
   Utils/Auto_Functor.h \
   Utils/Implicit_Deactivator.h \
   Utils/ORB_Destroyer.h \
@@ -2047,6 +1918,7 @@ nobase_include_HEADERS += \
   Utils/PolicyList_Destroyer.inl \
   Utils/Servant_Var.inl
 
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
index 705b76b43b9..267df3700da 100644
--- a/TAO/tao/Messaging.mpc
+++ b/TAO/tao/Messaging.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core, portableserver, valuetype {
+project : taolib, core, portableserver {
   sharedname   = TAO_Messaging
   dynamicflags = TAO_MESSAGING_BUILD_DLL
 
@@ -22,8 +22,4 @@ project : taolib, core, portableserver, valuetype {
   Resource_Files {
     Messaging
   }
-
-  PIDL_Files {
-    Messaging
-  }
 }
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 0f986e5b769..4444cb1b7e7 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -41,21 +41,16 @@ namespace TAO
     this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
-    TAO_OutputCDR &cdr =
-      this->resolver_.transport ()->messaging_object ()->out_stream ();
-
     Invocation_Status s = TAO_INVOKE_FAILURE;
 
+#if TAO_HAS_INTERCEPTORS == 1
+    s =
+      this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
-    this->write_header (tspec,
-                        cdr
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (s);
-
-    this->marshal_data (cdr
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (s);
-
+    if (s != TAO_INVOKE_SUCCESS)
+      return s;
+#endif /*TAO_HAS_INTERCEPTORS */
     // Register a reply dispatcher for this invocation. Use the
     // preallocated reply dispatcher.
     TAO_Bind_Dispatcher_Guard dispatch_guard (
@@ -82,20 +77,23 @@ namespace TAO
     // reply dispatcher.
     dispatch_guard.status (TAO_Bind_Dispatcher_Guard::NO_UNBIND);
 
-#if TAO_HAS_INTERCEPTORS == 1
-    s =
-      this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (s != TAO_INVOKE_SUCCESS)
-      return s;
-#endif /*TAO_HAS_INTERCEPTORS */
+    TAO_OutputCDR &cdr =
+      this->resolver_.transport ()->messaging_object ()->out_stream ();
 
     // We have started the interception flow. We need to call the
     // ending interception flow if things go wrong. The purpose of the
     // try block is to take care of the cases when things go wrong.
     ACE_TRY
       {
+        this->write_header (tspec,
+                            cdr
+                            ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        this->marshal_data (cdr
+                            ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
         // Send it as a oneway request. It will make all the required
         // paraphernalia within the ORB to fire, like buffering if
         // send blocks etc.
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index 31b5a52dcc6..89793da3ad9 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -60,65 +60,65 @@ static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e48),
-  ACE_NTOHL (0x6f6c6465),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f4578), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x696f6e48), 
+  ACE_NTOHL (0x6f6c6465), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
     16,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e486f6c),
+  ACE_NTOHL (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e486f6c), 
   ACE_NTOHL (0x64657200),  // name = ExceptionHolder
     0, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
 3, // member count
     20,
-  ACE_NTOHL (0x69735f73),
-  ACE_NTOHL (0x79737465),
-  ACE_NTOHL (0x6d5f6578),
-  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x69735f73), 
+  ACE_NTOHL (0x79737465), 
+  ACE_NTOHL (0x6d5f6578), 
+  ACE_NTOHL (0x63657074), 
   ACE_NTOHL (0x696f6e00),  // name = is_system_exception
     CORBA::tk_boolean,
 
   1, // data member visibility marker
 
   11,
-  ACE_NTOHL (0x62797465),
-  ACE_NTOHL (0x5f6f7264),
+  ACE_NTOHL (0x62797465), 
+  ACE_NTOHL (0x5f6f7264), 
   ACE_NTOHL (0x65720000),  // name = byte_order
     CORBA::tk_boolean,
 
   1, // data member visibility marker
 
   20,
-  ACE_NTOHL (0x6d617273),
-  ACE_NTOHL (0x68616c65),
-  ACE_NTOHL (0x645f6578),
-  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x6d617273), 
+  ACE_NTOHL (0x68616c65), 
+  ACE_NTOHL (0x645f6578), 
+  ACE_NTOHL (0x63657074), 
   ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
     CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
         9,
-    ACE_NTOHL (0x4f637465),
-    ACE_NTOHL (0x74536571),
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
     ACE_NTOHL (0x0),  // name = OctetSeq
         CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
@@ -149,7 +149,7 @@ namespace Messaging
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref (
     Messaging::ExceptionHolder * p
@@ -158,7 +158,7 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref (
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref (
     Messaging::ExceptionHolder * p
@@ -167,9 +167,9 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref (
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<Messaging::ExceptionHolder>::release (
+TAO::Value_Traits<Messaging::ExceptionHolder>::tao_release (
     Messaging::ExceptionHolder * p
   )
 {
@@ -183,7 +183,7 @@ Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return dynamic_cast< ::Messaging::ExceptionHolder * > (v);
 }
 
@@ -228,29 +228,29 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
         base,
         ExceptionHolder::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ExceptionHolder::_downcast (base);
@@ -268,7 +268,7 @@ Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
 {
 }
 
-const char*
+const char* 
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
@@ -293,7 +293,7 @@ Messaging::ExceptionHolder_init::create_for_unmarshal (void)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::ReplyHandler_ptr
-TAO::Objref_Traits<Messaging::ReplyHandler>::duplicate (
+TAO::Objref_Traits<Messaging::ReplyHandler>::tao_duplicate (
     Messaging::ReplyHandler_ptr p
   )
 {
@@ -302,7 +302,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::ReplyHandler>::release (
+TAO::Objref_Traits<Messaging::ReplyHandler>::tao_release (
     Messaging::ReplyHandler_ptr p
   )
 {
@@ -311,14 +311,14 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::ReplyHandler_ptr
-TAO::Objref_Traits<Messaging::ReplyHandler>::nil (void)
+TAO::Objref_Traits<Messaging::ReplyHandler>::tao_nil (void)
 {
   return Messaging::ReplyHandler::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::ReplyHandler>::marshal (
+TAO::Objref_Traits<Messaging::ReplyHandler>::tao_marshal (
     Messaging::ReplyHandler_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -327,7 +327,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -351,7 +351,7 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation ()
 Messaging::ReplyHandler::~ReplyHandler (void)
 {}
 
-void
+void 
 Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyHandler *_tao_tmp_pointer =
@@ -396,7 +396,7 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -446,20 +446,20 @@ static const CORBA::Long _oc_Messaging_ReplyHandler[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5265),
-  ACE_NTOHL (0x706c7948),
-  ACE_NTOHL (0x616e646c),
-  ACE_NTOHL (0x65723a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x706c7948), 
+  ACE_NTOHL (0x616e646c), 
+  ACE_NTOHL (0x65723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
     13,
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x7948616e),
-  ACE_NTOHL (0x646c6572),
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x7948616e), 
+  ACE_NTOHL (0x646c6572), 
   ACE_NTOHL (0x0),  // name = ReplyHandler
   };
 
@@ -762,21 +762,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -793,13 +793,13 @@ CORBA::Boolean operator>> (
   template class
     TAO_Value_Var_T<
         Messaging::ExceptionHolder
-
+        
       >;
-
+  
   template class
     TAO_Value_Out_T<
         Messaging::ExceptionHolder
-
+        
       >;
 
   template class
@@ -816,7 +816,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         Messaging::ReplyHandler
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         Messaging::ReplyHandler
@@ -842,13 +842,13 @@ CORBA::Boolean operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         Messaging::ExceptionHolder \
-
+        
       >
-
+  
 # pragma instantiate \
     TAO_Value_Out_T< \
         Messaging::ExceptionHolder \
-
+        
       >
 
 # pragma instantiate \
@@ -865,7 +865,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         Messaging::ReplyHandler
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         Messaging::ReplyHandler
@@ -881,4 +881,5 @@ CORBA::Boolean operator>> (
         Messaging::ReplyHandler \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index da218e55e7d..34595011524 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -419,7 +419,7 @@ namespace TAO
   {
     static void tao_add_ref (Messaging::ExceptionHolder *);
     static void tao_remove_ref (Messaging::ExceptionHolder *);
-    static void release (Messaging::ExceptionHolder *);
+    static void tao_release (Messaging::ExceptionHolder *);
   };
 
 #endif /* end #if !defined */
@@ -430,14 +430,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyHandler>
   {
-    static Messaging::ReplyHandler_ptr duplicate (
+    static Messaging::ReplyHandler_ptr tao_duplicate (
         Messaging::ReplyHandler_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::ReplyHandler_ptr
       );
-    static Messaging::ReplyHandler_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::ReplyHandler_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::ReplyHandler_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
index c6ba7f3fc9b..4c3c75a122e 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
@@ -214,7 +214,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RebindPolicy_ptr
-TAO::Objref_Traits<Messaging::RebindPolicy>::duplicate (
+TAO::Objref_Traits<Messaging::RebindPolicy>::tao_duplicate (
     Messaging::RebindPolicy_ptr p
   )
 {
@@ -223,7 +223,7 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::RebindPolicy>::release (
+TAO::Objref_Traits<Messaging::RebindPolicy>::tao_release (
     Messaging::RebindPolicy_ptr p
   )
 {
@@ -232,14 +232,14 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RebindPolicy_ptr
-TAO::Objref_Traits<Messaging::RebindPolicy>::nil (void)
+TAO::Objref_Traits<Messaging::RebindPolicy>::tao_nil (void)
 {
   return Messaging::RebindPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::RebindPolicy>::marshal (
+TAO::Objref_Traits<Messaging::RebindPolicy>::tao_marshal (
     Messaging::RebindPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -497,7 +497,7 @@ Messaging::PriorityRange::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RequestPriorityPolicy_ptr
-TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::duplicate (
+TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_duplicate (
     Messaging::RequestPriorityPolicy_ptr p
   )
 {
@@ -506,7 +506,7 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::release (
+TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_release (
     Messaging::RequestPriorityPolicy_ptr p
   )
 {
@@ -515,14 +515,14 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RequestPriorityPolicy_ptr
-TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::nil (void)
+TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_nil (void)
 {
   return Messaging::RequestPriorityPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::marshal (
+TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_marshal (
     Messaging::RequestPriorityPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -688,7 +688,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::ReplyPriorityPolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::duplicate (
+TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_duplicate (
     Messaging::ReplyPriorityPolicy_ptr p
   )
 {
@@ -697,7 +697,7 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::release (
+TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_release (
     Messaging::ReplyPriorityPolicy_ptr p
   )
 {
@@ -706,14 +706,14 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::ReplyPriorityPolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::nil (void)
+TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_nil (void)
 {
   return Messaging::ReplyPriorityPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::marshal (
+TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_marshal (
     Messaging::ReplyPriorityPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -878,7 +878,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RequestStartTimePolicy_ptr
-TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::duplicate (
+TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_duplicate (
     Messaging::RequestStartTimePolicy_ptr p
   )
 {
@@ -887,7 +887,7 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::release (
+TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_release (
     Messaging::RequestStartTimePolicy_ptr p
   )
 {
@@ -896,14 +896,14 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RequestStartTimePolicy_ptr
-TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::nil (void)
+TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_nil (void)
 {
   return Messaging::RequestStartTimePolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::marshal (
+TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_marshal (
     Messaging::RequestStartTimePolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1070,7 +1070,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RequestEndTimePolicy_ptr
-TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::duplicate (
+TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_duplicate (
     Messaging::RequestEndTimePolicy_ptr p
   )
 {
@@ -1079,7 +1079,7 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::release (
+TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_release (
     Messaging::RequestEndTimePolicy_ptr p
   )
 {
@@ -1088,14 +1088,14 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RequestEndTimePolicy_ptr
-TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::nil (void)
+TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_nil (void)
 {
   return Messaging::RequestEndTimePolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::marshal (
+TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_marshal (
     Messaging::RequestEndTimePolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1261,7 +1261,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::ReplyStartTimePolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::duplicate (
+TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_duplicate (
     Messaging::ReplyStartTimePolicy_ptr p
   )
 {
@@ -1270,7 +1270,7 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::release (
+TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_release (
     Messaging::ReplyStartTimePolicy_ptr p
   )
 {
@@ -1279,14 +1279,14 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::ReplyStartTimePolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::nil (void)
+TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_nil (void)
 {
   return Messaging::ReplyStartTimePolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::marshal (
+TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_marshal (
     Messaging::ReplyStartTimePolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1452,7 +1452,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::ReplyEndTimePolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::duplicate (
+TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_duplicate (
     Messaging::ReplyEndTimePolicy_ptr p
   )
 {
@@ -1461,7 +1461,7 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::release (
+TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_release (
     Messaging::ReplyEndTimePolicy_ptr p
   )
 {
@@ -1470,14 +1470,14 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::ReplyEndTimePolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::nil (void)
+TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_nil (void)
 {
   return Messaging::ReplyEndTimePolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::marshal (
+TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_marshal (
     Messaging::ReplyEndTimePolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1642,7 +1642,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RelativeRequestTimeoutPolicy_ptr
-TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::duplicate (
+TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_duplicate (
     Messaging::RelativeRequestTimeoutPolicy_ptr p
   )
 {
@@ -1651,7 +1651,7 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::release (
+TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_release (
     Messaging::RelativeRequestTimeoutPolicy_ptr p
   )
 {
@@ -1660,14 +1660,14 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RelativeRequestTimeoutPolicy_ptr
-TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::nil (void)
+TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_nil (void)
 {
   return Messaging::RelativeRequestTimeoutPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::marshal (
+TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_marshal (
     Messaging::RelativeRequestTimeoutPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1937,7 +1937,7 @@ Messaging::RoutingTypeRange::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RoutingPolicy_ptr
-TAO::Objref_Traits<Messaging::RoutingPolicy>::duplicate (
+TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_duplicate (
     Messaging::RoutingPolicy_ptr p
   )
 {
@@ -1946,7 +1946,7 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::RoutingPolicy>::release (
+TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_release (
     Messaging::RoutingPolicy_ptr p
   )
 {
@@ -1955,14 +1955,14 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RoutingPolicy_ptr
-TAO::Objref_Traits<Messaging::RoutingPolicy>::nil (void)
+TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_nil (void)
 {
   return Messaging::RoutingPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::RoutingPolicy>::marshal (
+TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_marshal (
     Messaging::RoutingPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2124,7 +2124,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::MaxHopsPolicy_ptr
-TAO::Objref_Traits<Messaging::MaxHopsPolicy>::duplicate (
+TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_duplicate (
     Messaging::MaxHopsPolicy_ptr p
   )
 {
@@ -2133,7 +2133,7 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::MaxHopsPolicy>::release (
+TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_release (
     Messaging::MaxHopsPolicy_ptr p
   )
 {
@@ -2142,14 +2142,14 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::MaxHopsPolicy_ptr
-TAO::Objref_Traits<Messaging::MaxHopsPolicy>::nil (void)
+TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_nil (void)
 {
   return Messaging::MaxHopsPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::MaxHopsPolicy>::marshal (
+TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_marshal (
     Messaging::MaxHopsPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2311,7 +2311,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::QueueOrderPolicy_ptr
-TAO::Objref_Traits<Messaging::QueueOrderPolicy>::duplicate (
+TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_duplicate (
     Messaging::QueueOrderPolicy_ptr p
   )
 {
@@ -2320,7 +2320,7 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::QueueOrderPolicy>::release (
+TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_release (
     Messaging::QueueOrderPolicy_ptr p
   )
 {
@@ -2329,14 +2329,14 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::QueueOrderPolicy_ptr
-TAO::Objref_Traits<Messaging::QueueOrderPolicy>::nil (void)
+TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_nil (void)
 {
   return Messaging::QueueOrderPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::QueueOrderPolicy>::marshal (
+TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_marshal (
     Messaging::QueueOrderPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
index ae675e406e1..f85f397cfe4 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.h
@@ -1612,14 +1612,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::RebindPolicy>
   {
-    static Messaging::RebindPolicy_ptr duplicate (
+    static Messaging::RebindPolicy_ptr tao_duplicate (
         Messaging::RebindPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::RebindPolicy_ptr
       );
-    static Messaging::RebindPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::RebindPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::RebindPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1633,14 +1633,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::RequestPriorityPolicy>
   {
-    static Messaging::RequestPriorityPolicy_ptr duplicate (
+    static Messaging::RequestPriorityPolicy_ptr tao_duplicate (
         Messaging::RequestPriorityPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::RequestPriorityPolicy_ptr
       );
-    static Messaging::RequestPriorityPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::RequestPriorityPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::RequestPriorityPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1654,14 +1654,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyPriorityPolicy>
   {
-    static Messaging::ReplyPriorityPolicy_ptr duplicate (
+    static Messaging::ReplyPriorityPolicy_ptr tao_duplicate (
         Messaging::ReplyPriorityPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::ReplyPriorityPolicy_ptr
       );
-    static Messaging::ReplyPriorityPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::ReplyPriorityPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::ReplyPriorityPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1675,14 +1675,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::RequestStartTimePolicy>
   {
-    static Messaging::RequestStartTimePolicy_ptr duplicate (
+    static Messaging::RequestStartTimePolicy_ptr tao_duplicate (
         Messaging::RequestStartTimePolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::RequestStartTimePolicy_ptr
       );
-    static Messaging::RequestStartTimePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::RequestStartTimePolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::RequestStartTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1696,14 +1696,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::RequestEndTimePolicy>
   {
-    static Messaging::RequestEndTimePolicy_ptr duplicate (
+    static Messaging::RequestEndTimePolicy_ptr tao_duplicate (
         Messaging::RequestEndTimePolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::RequestEndTimePolicy_ptr
       );
-    static Messaging::RequestEndTimePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::RequestEndTimePolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::RequestEndTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1717,14 +1717,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyStartTimePolicy>
   {
-    static Messaging::ReplyStartTimePolicy_ptr duplicate (
+    static Messaging::ReplyStartTimePolicy_ptr tao_duplicate (
         Messaging::ReplyStartTimePolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::ReplyStartTimePolicy_ptr
       );
-    static Messaging::ReplyStartTimePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::ReplyStartTimePolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::ReplyStartTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1738,14 +1738,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyEndTimePolicy>
   {
-    static Messaging::ReplyEndTimePolicy_ptr duplicate (
+    static Messaging::ReplyEndTimePolicy_ptr tao_duplicate (
         Messaging::ReplyEndTimePolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::ReplyEndTimePolicy_ptr
       );
-    static Messaging::ReplyEndTimePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::ReplyEndTimePolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::ReplyEndTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1759,14 +1759,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>
   {
-    static Messaging::RelativeRequestTimeoutPolicy_ptr duplicate (
+    static Messaging::RelativeRequestTimeoutPolicy_ptr tao_duplicate (
         Messaging::RelativeRequestTimeoutPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::RelativeRequestTimeoutPolicy_ptr
       );
-    static Messaging::RelativeRequestTimeoutPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::RelativeRequestTimeoutPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::RelativeRequestTimeoutPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1780,14 +1780,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::RoutingPolicy>
   {
-    static Messaging::RoutingPolicy_ptr duplicate (
+    static Messaging::RoutingPolicy_ptr tao_duplicate (
         Messaging::RoutingPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::RoutingPolicy_ptr
       );
-    static Messaging::RoutingPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::RoutingPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::RoutingPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1801,14 +1801,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::MaxHopsPolicy>
   {
-    static Messaging::MaxHopsPolicy_ptr duplicate (
+    static Messaging::MaxHopsPolicy_ptr tao_duplicate (
         Messaging::MaxHopsPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::MaxHopsPolicy_ptr
       );
-    static Messaging::MaxHopsPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::MaxHopsPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::MaxHopsPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1822,14 +1822,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::QueueOrderPolicy>
   {
-    static Messaging::QueueOrderPolicy_ptr duplicate (
+    static Messaging::QueueOrderPolicy_ptr tao_duplicate (
         Messaging::QueueOrderPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::QueueOrderPolicy_ptr
       );
-    static Messaging::QueueOrderPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::QueueOrderPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::QueueOrderPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
index 0dc6d2c6603..7fdcf3225e8 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
@@ -112,7 +112,7 @@ namespace Messaging
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RelativeRoundtripTimeoutPolicy_ptr
-TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::duplicate (
+TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_duplicate (
     Messaging::RelativeRoundtripTimeoutPolicy_ptr p
   )
 {
@@ -121,7 +121,7 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::release (
+TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_release (
     Messaging::RelativeRoundtripTimeoutPolicy_ptr p
   )
 {
@@ -130,14 +130,14 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::RelativeRoundtripTimeoutPolicy_ptr
-TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::nil (void)
+TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_nil (void)
 {
   return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::marshal (
+TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_marshal (
     Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
index 77d5c0fbe8a..bc35afd3dec 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
@@ -238,14 +238,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>
   {
-    static Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate (
+    static Messaging::RelativeRoundtripTimeoutPolicy_ptr tao_duplicate (
         Messaging::RelativeRoundtripTimeoutPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::RelativeRoundtripTimeoutPolicy_ptr
       );
-    static Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::RelativeRoundtripTimeoutPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
index 2258328fd35..bf5c226f661 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
@@ -59,7 +59,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::SyncScopePolicy_ptr
-TAO::Objref_Traits<Messaging::SyncScopePolicy>::duplicate (
+TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_duplicate (
     Messaging::SyncScopePolicy_ptr p
   )
 {
@@ -68,7 +68,7 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<Messaging::SyncScopePolicy>::release (
+TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_release (
     Messaging::SyncScopePolicy_ptr p
   )
 {
@@ -77,14 +77,14 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 Messaging::SyncScopePolicy_ptr
-TAO::Objref_Traits<Messaging::SyncScopePolicy>::nil (void)
+TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_nil (void)
 {
   return Messaging::SyncScopePolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<Messaging::SyncScopePolicy>::marshal (
+TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_marshal (
     Messaging::SyncScopePolicy_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
index bfd072dec95..b901877a1ec 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
@@ -227,14 +227,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<Messaging::SyncScopePolicy>
   {
-    static Messaging::SyncScopePolicy_ptr duplicate (
+    static Messaging::SyncScopePolicy_ptr tao_duplicate (
         Messaging::SyncScopePolicy_ptr
       );
-    static void release (
+    static void tao_release (
         Messaging::SyncScopePolicy_ptr
       );
-    static Messaging::SyncScopePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static Messaging::SyncScopePolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         Messaging::SyncScopePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
index 0f031d2aa95..14de8ef1ea2 100644
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -59,7 +59,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 TAO::ConnectionTimeoutPolicy_ptr
-TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::duplicate (
+TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_duplicate (
     TAO::ConnectionTimeoutPolicy_ptr p
   )
 {
@@ -68,7 +68,7 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::release (
+TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_release (
     TAO::ConnectionTimeoutPolicy_ptr p
   )
 {
@@ -77,14 +77,14 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 TAO::ConnectionTimeoutPolicy_ptr
-TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::nil (void)
+TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_nil (void)
 {
   return TAO::ConnectionTimeoutPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::marshal (
+TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_marshal (
     TAO::ConnectionTimeoutPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
index 738074f3f37..8840f468313 100644
--- a/TAO/tao/Messaging/TAO_ExtC.h
+++ b/TAO/tao/Messaging/TAO_ExtC.h
@@ -227,14 +227,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Objref_Traits<TAO::ConnectionTimeoutPolicy>
   {
-    static TAO::ConnectionTimeoutPolicy_ptr duplicate (
+    static TAO::ConnectionTimeoutPolicy_ptr tao_duplicate (
         TAO::ConnectionTimeoutPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         TAO::ConnectionTimeoutPolicy_ptr
       );
-    static TAO::ConnectionTimeoutPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static TAO::ConnectionTimeoutPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         TAO::ConnectionTimeoutPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index fdfb2213e16..09378a0ba4d 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -5,14 +5,13 @@
 
 #include "NVList.h"
 
-#include "tao/SystemException.h"
 #include "tao/BoundsC.h"
+#include "tao/debug.h"
 #include "tao/Typecode.h"
 #include "tao/Marshal.h"
 #include "tao/CORBA_String.h"
 #include "tao/Any_Impl.h"
 #include "tao/CDR.h"
-#include "tao/debug.h"
 
 #include "ace/Auto_Ptr.h"
 
@@ -244,7 +243,7 @@ CORBA::NVList::add_element (CORBA::Flags flags
   if (ACE_BIT_DISABLED (flags,
                         CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 
                         CORBA::NamedValue::_nil ());
     }
 
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index a49d6a35bd1..06e158f02e5 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -27,7 +27,6 @@ ACE_RCSID (tao,
 #include "TypeCodeFactory_Adapter.h"
 #include "debug.h"
 #include "CDR.h"
-#include "SystemException.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "PICurrent_ORBInitializer.h"  /* @@ This should go away! */
@@ -47,14 +46,6 @@ ACE_RCSID (tao,
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
 
-#if defined (ACE_HAS_EXCEPTIONS)
-void TAO_unexpected_exception_handler (void)
-{
-  throw CORBA::UNKNOWN ();
-}
-#endif  /* ACE_HAS_EXCEPTIONS */
-
-
 static const char ior_prefix[] = "IOR:";
 
 // = Static initialization.
@@ -187,7 +178,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL)
       // CORBA::OBJECT_NOT_EXIST exception if the ORB has been
       // destroyed by the time an ORB function is called.
 
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE,
                                           CORBA::COMPLETED_NO));
     }
 
@@ -299,7 +290,7 @@ CORBA::ORB::create_list (CORBA::Long count,
                     CORBA::NVList,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -316,7 +307,7 @@ CORBA::ORB::create_list (CORBA::Long count,
                             CORBA::NamedValue,
                             CORBA::NO_MEMORY (
                               CORBA::SystemException::_tao_minor_code (
-                                0,
+                                TAO_DEFAULT_MINOR_CODE,
                                 ENOMEM),
                               CORBA::COMPLETED_NO));
           ACE_CHECK;
@@ -369,7 +360,7 @@ CORBA::ORB::create_environment (CORBA::Environment_ptr &environment
                     CORBA::Environment (),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 }
@@ -382,7 +373,7 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv
                     CORBA::NamedValue,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 }
@@ -398,7 +389,7 @@ CORBA::ORB::get_service_information (
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOTSUP),
                       CORBA::COMPLETED_NO),
                     0);
@@ -410,7 +401,7 @@ CORBA::ORB::create_context_list (CORBA::ContextList_ptr &
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
-                 0,
+                 TAO_DEFAULT_MINOR_CODE,
                  ENOTSUP),
                CORBA::COMPLETED_NO));
 }
@@ -421,7 +412,7 @@ CORBA::ORB::get_default_context (CORBA::Context_ptr &
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
-                 0,
+                 TAO_DEFAULT_MINOR_CODE,
                  ENOTSUP),
                CORBA::COMPLETED_NO));
 }
@@ -432,7 +423,7 @@ CORBA::ORB::send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
-                 0,
+                 TAO_DEFAULT_MINOR_CODE,
                  ENOTSUP),
                CORBA::COMPLETED_NO));
 }
@@ -443,7 +434,7 @@ CORBA::ORB::send_multiple_requests_deferred (const CORBA::ORB::RequestSeq &
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
-                 0,
+                 TAO_DEFAULT_MINOR_CODE,
                  ENOTSUP),
                CORBA::COMPLETED_NO));
 }
@@ -454,7 +445,7 @@ CORBA::ORB::get_next_response (CORBA::Request_ptr &
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
-                 0,
+                 TAO_DEFAULT_MINOR_CODE,
                  ENOTSUP),
                CORBA::COMPLETED_NO));
 }
@@ -464,7 +455,7 @@ CORBA::ORB::poll_next_response (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOTSUP),
                       CORBA::COMPLETED_NO),
                     0);
@@ -479,6 +470,7 @@ CORBA::ORB::create_struct_tc (
     const CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -505,6 +497,7 @@ CORBA::ORB::create_union_tc (
     const CORBA::UnionMemberSeq & members
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -531,6 +524,7 @@ CORBA::ORB::create_enum_tc (
     const CORBA::EnumMemberSeq & members
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -556,6 +550,7 @@ CORBA::ORB::create_alias_tc (
     CORBA::TypeCode_ptr original_type
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -581,6 +576,7 @@ CORBA::ORB::create_exception_tc (
     const CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -605,6 +601,7 @@ CORBA::ORB::create_interface_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -627,6 +624,7 @@ CORBA::ORB::create_string_tc (
     CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -648,6 +646,7 @@ CORBA::ORB::create_wstring_tc (
     CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -670,6 +669,7 @@ CORBA::ORB::create_fixed_tc (
     CORBA::UShort scale
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -693,6 +693,7 @@ CORBA::ORB::create_sequence_tc (
     CORBA::TypeCode_ptr element_type
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -716,6 +717,7 @@ CORBA::ORB::create_array_tc (
     CORBA::TypeCode_ptr element_type
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -742,6 +744,7 @@ CORBA::ORB::create_value_tc (
     const CORBA::ValueMemberSeq & members
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -769,6 +772,7 @@ CORBA::ORB::create_value_box_tc (
     CORBA::TypeCode_ptr boxed_type
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -793,6 +797,7 @@ CORBA::ORB::create_native_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -815,6 +820,7 @@ CORBA::ORB::create_recursive_tc (
     const char *id
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -837,6 +843,7 @@ CORBA::ORB::create_abstract_interface_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -860,6 +867,7 @@ CORBA::ORB::create_local_interface_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -883,6 +891,7 @@ CORBA::ORB::create_component_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -906,6 +915,7 @@ CORBA::ORB::create_home_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -932,6 +942,7 @@ CORBA::ORB::create_event_tc (
     const CORBA::ValueMemberSeq &members
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -1276,7 +1287,7 @@ CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
       // CORBA::OBJECT_NOT_EXIST exception if the ORB has been
       // destroyed by the time an ORB function is called.
 
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE,
                                           CORBA::COMPLETED_NO));
     }
 }
@@ -1314,7 +1325,7 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
   // course requires the TypeCode constants and system exceptions to
   // have been initialized.
   TAO_Singleton_Manager::instance ()->_set_unexpected (
-    ::TAO_unexpected_exception_handler);
+    CORBA::ORB::_tao_unexpected_exception);
 #endif /* ACE_HAS_EXCEPTIONS */
 
   // Verify some of the basic implementation requirements.  This test
@@ -1322,15 +1333,15 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
   // routine does).
   //
   // NOTE:  we still "just" assume that native floating point is IEEE.
-  if (   sizeof (CORBA::Boolean)    != 1
-      || sizeof (CORBA::Short)      != 2
-      || sizeof (CORBA::Long)       != 4
-      || sizeof (CORBA::LongLong)   != 8
-      || sizeof (CORBA::Float)      != 4
-      || sizeof (CORBA::Double)     != 8
+  if (sizeof (CORBA::Boolean) != 1
+      || sizeof (CORBA::Short) != 2
+      || sizeof (CORBA::Long) != 4
+      || sizeof (CORBA::LongLong) != 8
+      || sizeof (CORBA::Float) != 4
+      || sizeof (CORBA::Double) != 8
       || sizeof (CORBA::LongDouble) != 16
-      || sizeof (CORBA::WChar)      < 2
-      || sizeof (void *)            != ACE_SIZEOF_VOID_P)
+      || sizeof (CORBA::WChar) < 2
+      || sizeof (void *) != ACE_SIZEOF_VOID_P)
     {
       ACE_ERROR ((LM_ERROR,
                   "%N; ERROR: unexpected basic type size; "
@@ -1355,7 +1366,7 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_CodecFactory_ORBInitializer,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -1382,7 +1393,7 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_PICurrent_ORBInitializer,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -1395,6 +1406,16 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
+void CORBA::ORB::_tao_unexpected_exception (void)
+{
+#if defined(ACE_HAS_EXCEPTIONS)
+  throw CORBA::UNKNOWN ();
+#else
+  // Nothing to do, this will be handled by the ORB core when sending
+  // the exception back to the client...
+#endif /* ACE_HAS_EXCEPTIONS */
+}
+
 const ACE_CString &
 CORBA::ORB::_tao_ft_client_id (void)
 {
@@ -1493,7 +1514,7 @@ CORBA::ORB_init (int &argc,
     {
       ACE_THROW_RETURN (CORBA::BAD_PARAM (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             EINVAL),
                           CORBA::COMPLETED_NO),
                         CORBA::ORB::_nil ());
@@ -1568,7 +1589,7 @@ CORBA::ORB_init (int &argc,
                     TAO_ORB_Core (orbid_string.c_str ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
@@ -1607,7 +1628,7 @@ CORBA::ORB_init (int &argc,
                                      command_line.get_ASCII_argv()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
@@ -1633,7 +1654,7 @@ CORBA::ORB_init (int &argc,
   if (result == -1)
       ACE_THROW_RETURN (CORBA::BAD_PARAM (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             EINVAL),
                           CORBA::COMPLETED_NO),
                         CORBA::ORB::_nil ());
@@ -1663,7 +1684,7 @@ CORBA::ORB_init (int &argc,
   // Before returning remember to store the ORB into the table...
   if (TAO_ORB_Table::instance ()->bind (orbid_string.c_str (),
                                         safe_oc.get ()) != 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (0,
+    ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
                                        CORBA::COMPLETED_NO),
                       CORBA::ORB::_nil ());
 
@@ -1784,7 +1805,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj
 
           ACE_THROW_RETURN (CORBA::MARSHAL (
                               CORBA::SystemException::_tao_minor_code (
-                                0,
+                                TAO_DEFAULT_MINOR_CODE,
                                 EINVAL),
                               CORBA::COMPLETED_NO),
                             0);
@@ -1802,7 +1823,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj
 
           ACE_THROW_RETURN (CORBA::MARSHAL (
                               CORBA::SystemException::_tao_minor_code (
-                                0,
+                                TAO_DEFAULT_MINOR_CODE,
                                 EINVAL),
                               CORBA::COMPLETED_NO),
                             0);
@@ -1830,7 +1851,7 @@ CORBA::ORB::string_to_object (const char *str
   if (str == 0)
     ACE_THROW_RETURN (CORBA::INV_OBJREF (
                         CORBA::SystemException::_tao_minor_code (
-                          0,
+                          TAO_DEFAULT_MINOR_CODE,
                           EINVAL),
                         CORBA::COMPLETED_NO),
                       CORBA::Object::_nil ());
@@ -1870,6 +1891,8 @@ CORBA::Policy_ptr
 CORBA::ORB::create_policy (CORBA::PolicyType type,
                            const CORBA::Any& val
                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CORBA::PolicyError))
 {
   this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -1885,6 +1908,8 @@ CORBA::ORB::create_policy (CORBA::PolicyType type,
 CORBA::Policy_ptr
 CORBA::ORB::_create_policy (CORBA::PolicyType type
                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CORBA::PolicyError))
 {
   this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -1985,7 +2010,7 @@ CORBA::ORB::url_ior_string_to_object (const char* str
     {
       ACE_THROW_RETURN (CORBA::INV_OBJREF (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             EINVAL),
                           CORBA::COMPLETED_NO),
                         CORBA::Object::_nil ());
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 325afa29502..1cf5b1c290b 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -9,7 +9,7 @@
  *  Header file for CORBA's ORB type.
  *
  *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author Douglas C. Schmidt <schmidt@dre.vanderbilt.edu.edu>
+ *  @author Douglas C. Schmidt <schmidt@uci.edu>
  */
 //=============================================================================
 
@@ -18,17 +18,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "UserException.h"
+#include "Exception.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "objectid.h"
-#include "Policy_ForwardC.h"
+#include "PolicyC.h"
 #include "OBV_Constants.h"
 #include "CORBA_methods.h"
-#include "VarOut_T.h"
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
@@ -63,15 +62,6 @@ namespace CORBA
   class ValueMemberSeq;
   class ORB_ObjectIdList;
 
-  class ExceptionList;
-  typedef ExceptionList * ExceptionList_ptr;
-
-  class ContextList;
-  typedef ContextList * ContextList_ptr;
-
-  class Context;
-  typedef Context * Context_ptr;
-
   // Used at present only in Typecode_Constants.cpp, to make _tc_ORBid.
   // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
   typedef char * ORBid;
@@ -123,12 +113,11 @@ namespace CORBA
   typedef UShort ServiceType;
 
   class Request;
-  typedef Request * Request_ptr;
   typedef TAO_Pseudo_Var_T<Request> Request_var;
   typedef TAO_Pseudo_Out_T<Request, Request_var> Request_out;
 
   class ORB;
-  typedef ORB * ORB_ptr;
+  typedef ORB *ORB_ptr;
   typedef TAO_Pseudo_Var_T<ORB> ORB_var;
   typedef TAO_Pseudo_Out_T<ORB, ORB_var> ORB_out;
 
@@ -208,7 +197,7 @@ namespace CORBA
      * Turn an object reference into a string.  Each type of ORB,
      * e.g. an IIOP ORB, must implement this.  This can be used by
      * servers to publish their whereabouts to clients.  The output of
-     * this is typically eventually given to @c string_to_object() as
+     * this is typically eventually given to <string_to_object()> as
      * an argument.
      */
     char * object_to_string (CORBA::Object_ptr obj
@@ -303,60 +292,71 @@ namespace CORBA
         const char *id,
         const char *name,
         const CORBA::StructMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_union_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr discriminator_type,
         const CORBA::UnionMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_enum_tc (
         const char *id,
         const char *name,
         const CORBA::EnumMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_alias_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_exception_tc (
         const char *id,
         const char *name,
         const CORBA::StructMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_interface_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_string_tc (
         CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_wstring_tc (
         CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_fixed_tc (
         CORBA::UShort digits,
         CORBA::UShort scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_sequence_tc (
         CORBA::ULong bound,
         CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_array_tc (
         CORBA::ULong length,
         CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_value_tc (
         const char *id,
@@ -364,43 +364,52 @@ namespace CORBA
         CORBA::ValueModifier type_modifier,
         CORBA::TypeCode_ptr concrete_base,
         const CORBA::ValueMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_value_box_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr boxed_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_native_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_recursive_tc (
         const char *id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_local_interface_tc (
         const char *id,
         const char *ame
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_component_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_home_tc (
         const char *id,
         const char *name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::TypeCode_ptr create_event_tc (
         const char *id,
@@ -408,7 +417,9 @@ namespace CORBA
         CORBA::ValueModifier type_modifier,
         CORBA::TypeCode_ptr concrete_base,
         const CORBA::ValueMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -425,15 +436,10 @@ namespace CORBA
     /**
      * Instructs the ORB to initialize itself and run its event loop in
      * the current thread, not returning until the ORB has shut down or
-     * the time value specified through @a tv has expired.  If an
-     * error occurs during initialization or at runtime, a CORBA
-     * system exception will be thrown.  @a tv is reduced by the
-     * amount of time spent in this call.
-     *
-     * If this function is called with a @ tv value, client threads
-     * making invocations will continue their operations. When the
-     * operation timesout and returns, any invocations showing up on
-     * the server will be buffered by TCP.
+     * the time value specified through <tv> has expired.  If an error
+     * occurs during initialization or at runtime, a CORBA system
+     * exception will be thrown.  <tv> is reduced by the amount of time
+     * spent in this call.
      **/
     void run (ACE_Time_Value &tv
               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -441,17 +447,12 @@ namespace CORBA
     /**
      * Instructs the ORB to initialize itself and run its event loop in
      * the current thread, not returning until the ORB has shut down or
-     * the time value specified through @a tv has expired.  If an error
+     * the time value specified through <tv> has expired.  If an error
      * occurs during initialization or at runtime, a CORBA system
-     * exception will be thrown.  @a tv is reduced by the amount of time
-     * spent in this call.  If @a tv is 0, it means that the timeout
-     * is infinite.  If @a tv is @c ACE_Time_Value::zero, it specifies
-     * to poll and does not block.
-     *
-     * If this function is called with @a tv value, client threads
-     * making invocations will continue their operations. When the
-     * operation timesout and returns, any invocations showing up on
-     * the server will be buffered by TCP.
+     * exception will be thrown.  <tv> is reduced by the amount of time
+     * spent in this call.  If <tv> is 0, it means that the timeout is
+     * infinite.  If <tv> is ACE_Time_Value::zero, it specifies to poll
+     * and does not block.
      **/
     void run (ACE_Time_Value *tv
               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -545,7 +546,9 @@ namespace CORBA
 
     CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                      const CORBA::Any& val
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CORBA::PolicyError));
 
     // ----------------------------------------------------------------
     // = TAO-specific extensions to the CORBA specification.
@@ -554,7 +557,9 @@ namespace CORBA
     /// Create an empty policy, usually to be filled in later by
     /// demarshaling.
     CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                      ACE_ENV_ARG_DECL);
+                                      ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CORBA::PolicyError));
 
     /// Resolve the POA.
     CORBA::Object_ptr resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL);
@@ -563,6 +568,10 @@ namespace CORBA
     /// haven't been initialized yet.
     static void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL);
 
+    // The function used by tao to handle the "unexpected" exceptions,
+    // It raises CORBA::UNKNOWN.
+    static void _tao_unexpected_exception (void);
+
     // Reference counting...
     CORBA::ULong _incr_refcnt (void);
     CORBA::ULong _decr_refcnt (void);
diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp
index 1ff36512203..f1e6ddf23ef 100644
--- a/TAO/tao/ORBInitInfo.cpp
+++ b/TAO/tao/ORBInitInfo.cpp
@@ -4,7 +4,6 @@
 #include "ORB_Core.h"
 #include "ORB.h"
 #include "CodecFactory.h"
-#include "SystemException.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "PICurrent.h"
@@ -23,7 +22,7 @@ ACE_RCSID (TAO,
 // Traits specializations for TAO_ORBInitInfo.
 
 TAO_ORBInitInfo_ptr
-TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate (
+TAO::Objref_Traits<TAO_ORBInitInfo>::tao_duplicate (
     TAO_ORBInitInfo_ptr p
   )
 {
@@ -31,7 +30,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate (
 }
 
 void
-TAO::Objref_Traits<TAO_ORBInitInfo>::release (
+TAO::Objref_Traits<TAO_ORBInitInfo>::tao_release (
     TAO_ORBInitInfo_ptr p
   )
 {
@@ -39,13 +38,13 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::release (
 }
 
 TAO_ORBInitInfo_ptr
-TAO::Objref_Traits<TAO_ORBInitInfo>::nil (void)
+TAO::Objref_Traits<TAO_ORBInitInfo>::tao_nil (void)
 {
   return TAO_ORBInitInfo::_nil ();
 }
 
 CORBA::Boolean
-TAO::Objref_Traits<TAO_ORBInitInfo>::marshal (
+TAO::Objref_Traits<TAO_ORBInitInfo>::tao_marshal (
     TAO_ORBInitInfo_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -83,7 +82,7 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
                     CORBA::StringSeq,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -126,7 +125,7 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
                         TAO_CodecFactory (this->orb_core_),
                           CORBA::NO_MEMORY (
                             CORBA::SystemException::_tao_minor_code (
-                              0,
+                              TAO_DEFAULT_MINOR_CODE,
                               ENOMEM),
                             CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (IOP::CodecFactory::_nil ());
@@ -202,7 +201,7 @@ TAO_ORBInitInfo::add_client_request_interceptor (
   ACE_UNUSED_ARG (interceptor);
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
-                 0,
+                 TAO_DEFAULT_MINOR_CODE,
                  ENOTSUP),
                CORBA::COMPLETED_NO));
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -226,7 +225,7 @@ TAO_ORBInitInfo::add_server_request_interceptor (
   ACE_UNUSED_ARG (interceptor);
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
-                 0,
+                 TAO_DEFAULT_MINOR_CODE,
                  ENOTSUP),
                CORBA::COMPLETED_NO));
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -260,7 +259,7 @@ TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL)
 #else
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOTSUP),
                       CORBA::COMPLETED_NO),
                     0);
@@ -301,7 +300,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
   if (result != 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (
                         CORBA::SystemException::_tao_minor_code (
-                          0,
+                          TAO_DEFAULT_MINOR_CODE,
                           errno),
                         CORBA::COMPLETED_NO),
                       0);
@@ -320,7 +319,7 @@ TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
       // this instance to zero when it is done initializing the ORB,
       // which is why we base "existence" on the validity of the ORB
       // core pointer.
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE,
                                           CORBA::COMPLETED_NO));
     }
 }
diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h
index cd4a6c0a3df..6b18c942d12 100644
--- a/TAO/tao/ORBInitInfo.h
+++ b/TAO/tao/ORBInitInfo.h
@@ -277,14 +277,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<TAO_ORBInitInfo>
   {
-    static TAO_ORBInitInfo_ptr duplicate (
+    static TAO_ORBInitInfo_ptr tao_duplicate (
         TAO_ORBInitInfo_ptr
       );
-    static void release (
+    static void tao_release (
         TAO_ORBInitInfo_ptr
       );
-    static TAO_ORBInitInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static TAO_ORBInitInfo_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         TAO_ORBInitInfo_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 4a7aa25a200..55ee065b5eb 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -4,7 +4,6 @@
 #include "TAO_Singleton.h"
 #include "ORB_Constants.h"
 #include "TAO_Singleton_Manager.h"
-#include "SystemException.h"
 
 #include "ace/Static_Object_Lock.h"
 
@@ -74,7 +73,7 @@ TAO_ORBInitializer_Registry::register_orb_initializer (
   else
     ACE_THROW (CORBA::INV_OBJREF (
                  CORBA::SystemException::_tao_minor_code (
-                   0,
+                   TAO_DEFAULT_MINOR_CODE,
                    EINVAL),
                  CORBA::COMPLETED_NO));
 }
diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h
index 585914e1604..2b992221904 100644
--- a/TAO/tao/ORB_Constants.h
+++ b/TAO/tao/ORB_Constants.h
@@ -2,14 +2,13 @@
 
 //=============================================================================
 /**
- *  @file  ORB_Constants.h
+ *  @file     ORB_Constants.h
  *
  *  $Id$
  *
  *  Constants needed by various files.
  *
  *  @author  Jeff Parsons
- *  @author  Ossama Othman
  */
 //=============================================================================
 
@@ -24,120 +23,29 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// A hash define for the regular two way operation.
+#include "tao/TAO_Export.h"
+
+// An hash define for the regular two way operation
 #define TAO_TWOWAY_RESPONSE_FLAG 255
 
 namespace CORBA
 {
-  /// The OMG Vendor Minor Codeset ID (VMCID).
+  /// The OMG Vendor Minor Codeset ID.
   /**
    * This number is reserved by the OMG as a prefix to all the
    * standard system exception minor codes.  Check the CORBA/IIOP
    * specification for details.
-   *
-   * OMG defined system exception minor codes should be logically
-   * OR-ed with this constant when passing such minor codes to a
-   * @c CORBA::SystemException constructor.  For example, throwing a
-   * @c CORBA::BAD_PARAM exception with an OMG defined minor code of
-   * @c 2 is done as follows:
-   *
-   * @verbatim
-   *   throw (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
-   * @endverbatim
-   *
-   * *NOT* as:
-   *
-   * @verbatim
-   *   throw (CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO);
-   * @endverbatim
    */
   const ULong OMGVMCID = 0x4f4d0000U;
 }
 
-namespace TAO
-{
-  /// TAO Vendor Minor Codeset ID (VMCID).
-  /**
-   * TAO Vendor Minor Codeset ID (VMCID) assigned by the OMG.  Do
-   * *NOT* change at random.  The TAO VMCID is an ASCII representation
-   * of @c TA0xxxx (close enough since a VMCID only consists of the
-   * higher order 20 bits of a 32 bit unsigned long integer).  The
-   * first 16 bits are @c TA, and the remaining 4 are @c 0.
-   *
-   * @note Remember that we can only play with the lower order 12
-   *       bits.  @c MAX_MINOR_CODE is there to remind us of that.
-   *
-   * @see @c MAX_MINOR_CODE
-   */
-  const CORBA::ULong VMCID = 0x54410000U;
-
-  /// Maximum allowed TAO system exception minor code.
-  /**
-   * Vendors are only allowed to use the lower order 12 bits of their
-   * when defining vendor-specific exception minor codes.
-   * @c MAX_MINOR_CODE is the maximum minor code value available to
-   * TAO.  Do not exceed it when defining TAO system exception minor
-   * codes.
-   *
-   * @see @c VMCID
-   */
-  const CORBA::ULong MAX_MINOR_CODE = VMCID | 0xfffU;
-
-  /// TAO Vendor @c PolicyType Valueset ID (VPVID)
-  /**
-   * TAO Vendor @c PolicyType Valueset ID (VPVID) assigned by the
-   * OMG.  This value was automatically assigned when TAO's VMCID was
-   * assigned.  Its value is always the same as the VMCID.
-   *
-   * As with TAO-specific system exception minor codes, the
-   * TAO-specific @c PolicyType space occupies the lower order 12 bits
-   * of the TAO VPVID, i.e.
-   *
-   * @verbatim
-   *    TAO::VPVID <= TAO PolicyType <= TAO::VPVID | 0xfffU.
-   * @endverbatim
-   *
-   * For example, TAO-specific @c PolicyTypes should be defined by
-   * logically "OR-ing" a 12 bit or less (i.e. 0x0U <= value <=
-   * 0xfffU) value with @c TAO::VPVID.
-   *
-   * @see VMCID
-   */
-  const CORBA::ULong VPVID = VMCID;
-}
-
-/**
- * @name TAO-Specific System Exception Minor Code Values
- *
- * These system exception minor code values are specific to TAO.
- */
-//@{
-/// TAO VMCID assigned by the OMG.
-/**
- * @note This constant has historically been used in the wrong way.
- *       It was often used as the @a location argument to the @c
- *       CORBA::SystemException::_tao_minor_code() static method.  A
- *       more appropriate default @a location argument/value would
- *       have been zero since the location code resides in portion of
- *       the lower order 12 bits, not the higher order 20 bits which
- *       is where the VMCID resides, and what this value happens to
- *       be.
- *
- * @deprecated Please use @c TAO::VMCID instead, or zero if being used
- *             as default TAO exception location code argument.
- *
- * @see @c TAO::VMCID
- */
-const CORBA::ULong TAO_DEFAULT_MINOR_CODE = TAO::VMCID;
-
-/// Maximum allowed system exception minor code.
-/**
- * @deprecated Please use @c TAO::MAX_MINOR_CODE instead.
- *
- * @see @c TAO::MAX_MINOR_CODE
- */
-const CORBA::ULong TAO_MAX_MINOR_CODE = TAO::MAX_MINOR_CODE;
-//@}
+// This number was assigned by the OMG.  Do *NOT* change at random.
+// The ASCII representation 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.
+const CORBA::ULong TAO_DEFAULT_MINOR_CODE = 0x54410000U;
+const CORBA::ULong TAO_MAX_MINOR_CODE = 0x54410fffU;
 
 /// A dummy service context that is inserted in the service context
 /// list to preserve the alignment in DSI based gateways, so no
@@ -150,8 +58,8 @@ const CORBA::ULong TAO_SVC_CONTEXT_ALIGN = 0x54414f00U;
 /**
  * @name TAO-Specific Profile IDs
  *
- * The TAO @c IOP::ProfileId range @c 0x54414f00 - @c 0x54414f0f has
- * been reserved with the OMG.
+ * The TAO @c IOP::ProfileId range 0x54414f00 - 0x54414f0f has been
+ * reserved with the OMG.
  *
  * @note It is *NOT* necessary to list your own protocols here.
  *
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index f32effcf875..7530bde6ff3 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -2036,20 +2036,6 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->has_shutdown ())
-    {
-      // As defined by the CORBA 2.3 specification, throw a
-      // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB
-      // has shutdown by the time an ORB function is called.
-
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4,
-                                       CORBA::COMPLETED_NO));
-    }
-}
-
-void
 TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC (())
 {
@@ -2784,6 +2770,17 @@ TAO_ORB_Core::add_interceptor (
     }
 }
 
+TAO_IORInterceptor_List *
+TAO_ORB_Core::ior_interceptor_list (void)
+{
+  if (this->ior_interceptor_adapter ())
+    {
+      return this->ior_interceptor_adapter_->interceptor_list ();
+    }
+
+  return 0;
+}
+
 TAO_IORInterceptor_Adapter *
 TAO_ORB_Core::ior_interceptor_adapter (void)
 {
@@ -2818,7 +2815,6 @@ TAO_ORB_Core::ior_interceptor_adapter (void)
                                    "ior_interceptor_adapter \n");
             }
           ACE_ENDTRY;
-          ACE_CHECK_RETURN(0);
         }
     }
 
@@ -2832,7 +2828,6 @@ TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
   , client_leader_thread_ (0)
   , lane_ (0)
   , ts_objects_ ()
-  , upcalls_temporarily_suspended_on_this_thread_ (false)
   , orb_core_ (0)
 #if TAO_HAS_INTERCEPTORS == 1
     , pi_current_ ()
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 2a879aa4216..a9836d08857 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -55,6 +55,7 @@ class TAO_Connector_Registry;
 class TAO_Resource_Factory;
 class TAO_Client_Strategy_Factory;
 class TAO_Server_Strategy_Factory;
+class TAO_Transport_Cache_Manager;
 
 class TAO_TSS_Resources;
 class TAO_Leader_Follower;
@@ -85,6 +86,7 @@ class TAO_Policy_Manager;
 class TAO_Policy_Current;
 
 class TAO_Codeset_Manager;
+class TAO_IORInterceptor_List;
 class TAO_IORInterceptor_Adapter;
 class TAO_Valuetype_Adapter;
 
@@ -172,10 +174,6 @@ public:
   /// Generic container for thread-specific objects.
   ACE_Array_Base<void *> ts_objects_;
 
-  // Set to true by the wait_on_lf_no_nested_upcall wait strategy
-  // @CJC@  maybe we should use allocate_tss_slot_id() instead?
-  bool upcalls_temporarily_suspended_on_this_thread_;
-
   /// Pointer to the ORB core.  Needed to get access to the TSS
   /// cleanup functions for the TSS objects stored in the TSS object
   /// array in this class.
@@ -934,14 +932,15 @@ public:
   void add_interceptor (
     PortableInterceptor::IORInterceptor_ptr interceptor
     ACE_ENV_ARG_DECL);
+
+  TAO_IORInterceptor_List *ior_interceptor_list (void);
   //@}
 
   /// Return the valuetype adapter
   TAO_Valuetype_Adapter *& valuetype_adapter (void);
 
-  /// Get the IOR Interceptor adapter. If not created, this method will try
-  /// to create one.
-  TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void);
+  /// Return the underlying transport cache
+  TAO_Transport_Cache_Manager *transport_cache (void);
 
   /// Set and Get methods to indicate whether a BiDir IIOP policy has
   /// been set in the POA.
@@ -1078,6 +1077,8 @@ private:
   CORBA::Boolean is_collocation_enabled (TAO_ORB_Core *other_orb,
                                          const TAO_MProfile &mp);
 
+  TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void);
+
 protected:
 
   /// Synchronize internal state...
@@ -1348,11 +1349,10 @@ public:
   // The hook to be set for the SyncScopePolicy
   TAO_ORB_Core::Sync_Scope_Hook sync_scope_hook_;
 
-  /**
-   * Name of the protocols_hooks that needs to be instantiated.
-   * The default value is "Protocols_Hooks". If RTCORBA option is
-   * set, its value will be set to be "RT_Protocols_Hooks".
-   */
+  // Name of the protocols_hooks that needs to be instantiated.
+  // The default value is "Protocols_Hooks". If RTCORBA option is
+  // set, its value will be set to
+  // be "RT_Protocols_Hooks".
   ACE_CString protocols_hooks_name_;
 
   /// The hook to be set for the RelativeRoundtripTimeoutPolicy.
@@ -1361,105 +1361,81 @@ public:
   /// The hook to be set for the ConnectionTimeoutPolicy
   TAO_ORB_Core::Timeout_Hook connection_timeout_hook_;
 
-  /**
-   * Name of the endpoint selector factory that needs to be instantiated.
-   * The default value is "Default_Endpoint_Selector_Factory". If
-   * TAO_RTCORBA is linked, the set_endpoint_selector_factory will be
-   * called to set the value to be "RT_Endpoint_Selector_Factory".
-   */
+  // Name of the endpoint selector factory that needs to be instantiated.
+  // The default value is "Default_Endpoint_Selector_Factory". If
+  // TAO_RTCORBA is linked, the set_endpoint_selector_factory will be
+  // called to set the value to be "RT_Endpoint_Selector_Factory".
   ACE_CString endpoint_selector_factory_name_;
 
-  /**
-   * Name of the thread lane resources manager that needs to be
-   * instantiated.  The default value is
-   * "Default_Thread_Lane_Resources_Manager_Factory". If TAO_RTCORBA
-   * is linked, the set_thread_lane_resources_manager will be called
-   * to set the value to be
-   * "RT_Thread_Lane_Resources_Manager_Factory".
-   */
+  // Name of the thread lane resources manager that needs to be
+  // instantiated.  The default value is
+  // "Default_Thread_Lane_Resources_Manager_Factory". If TAO_RTCORBA
+  // is linked, the set_thread_lane_resources_manager will be called
+  // to set the value to be
+  // "RT_Thread_Lane_Resources_Manager_Factory".
   ACE_CString thread_lane_resources_manager_factory_name_;
 
-  /**
-   * Name of the collocation resolver that needs to be instantiated.
-   * The default value is "Default_Collocation_Resolver". If
-   * TAO_RTCORBA is linked, the set_collocation_resolver will be
-   * called to set the value to be "RT_Collocation_Resolver".
-   */
+  // Name of the collocation resolver that needs to be instantiated.
+  // The default value is "Default_Collocation_Resolver". If
+  // TAO_RTCORBA is linked, the set_collocation_resolver will be
+  // called to set the value to be "RT_Collocation_Resolver".
   ACE_CString collocation_resolver_name_;
 
-  /**
-   * Name of the stub factory that needs to be instantiated.
-   * The default value is "Default_Stub_Factory". If TAO_RTCORBA is
-   * linked, the set_stub_factory will be called to set the value
-   * to be "RT_Stub_Factory".
-   */
+  // Name of the stub factory that needs to be instantiated.
+  // The default value is "Default_Stub_Factory". If TAO_RTCORBA is
+  // linked, the set_stub_factory will be called to set the value
+  // to be "RT_Stub_Factory".
   ACE_CString stub_factory_name_;
 
-  /**
-   * Name of the resource factory that needs to be instantiated.
-   * The default value is "Resource_Factory". If TAO_Strategies is
-   * linked, the set_resource_factory will be called to set the value
-   * to be "Advanced_Resource_Factory".
-   */
+  // Name of the resource factory that needs to be instantiated.
+  // The default value is "Resource_Factory". If TAO_Strategies is
+  // linked, the set_resource_factory will be called to set the value
+  // to be "Advanced_Resource_Factory".
   ACE_CString resource_factory_name_;
 
-  /**
-   * Name of the service object for DII request creation that needs
-   * to be instantiated. The default value is "Dynamic_Adaper". If
-   * TAO_DynamicInterface is linked, dynamic_adapter_name() will be
-   * called to set the value to "Concrete_Dynamic_Adapter".
-   */
+  // Name of the service object for DII request creation that needs
+  // to be instantiated. The default value is "Dynamic_Adaper". If
+  // TAO_DynamicInterface is linked, dynamic_adapter_name() will be
+  // called to set the value to "Concrete_Dynamic_Adapter".
   ACE_CString dynamic_adapter_name_;
 
-  /**
-   * Name of the service object for functions that make calls on
-   * the Interface Repository. The default value is "IFR_Client_Adaper".
-   * If TAO_IFR_CLient is linked, ifr_client_adapter_name() will be
-   * called to set the value to "Concrete_IFR_Client_Adapter".
-   */
+  // Name of the service object for functions that make calls on
+  // the Interface Repository. The default value is "IFR_Client_Adaper".
+  // If TAO_IFR_CLient is linked, ifr_client_adapter_name() will be
+  // called to set the value to "Concrete_IFR_Client_Adapter".
   ACE_CString ifr_client_adapter_name_;
 
-  /**
-   * Name of the service object used by the ORB create_*_tc functions.
-   * The default value is "TypeCodeFactory_Adapter". If the
-   * TypeCodeFactory library is linked, the corresponding accessor
-   * function typecodefactory_adapter_name() will be called to set
-   * the value to "Concrete_TypeCodeFactory_Adapter".
-   */
+  // Name of the service object used by the ORB create_*_tc functions.
+  // The default value is "TypeCodeFactory_Adapter". If the
+  // TypeCodeFactory library is linked, the corresponding accessor
+  // function typecodefactory_adapter_name() will be called to set
+  // the value to "Concrete_TypeCodeFactory_Adapter".
   ACE_CString typecodefactory_adapter_name_;
 
-  /**
-   * Name of the factory object used to adapt function calls on
-   * the PortableInterceptor interfaces IORInfo and IORInterceptor.
-   * The default value is "IORInterceptor_Adapter_Factory". If the
-   * IORInterceptor library is linked, the corresponding accessor
-   * function iorinterceptor_adapter_factory_name() will be called to set
-   * the value to "Concrete_IORInterceptor_Adapter_Factory".
-   */
+  // Name of the factory object used to adapt function calls on
+  // the PortableInterceptor interfaces IORInfo and IORInterceptor.
+  // The default value is "IORInterceptor_Adapter_Factory". If the
+  // IORInterceptor library is linked, the corresponding accessor
+  // function iorinterceptor_adapter_factory_name() will be called to set
+  // the value to "Concrete_IORInterceptor_Adapter_Factory".
   ACE_CString iorinterceptor_adapter_factory_name_;
 
-  /**
-   * Name of the service object used to adapt function calls on
-   * the valuetype-related interfaces.
-   * The default value is "Valuetype_Adapter". If the
-   * Valuetype library is linked, the corresponding accessor
-   * function valuetype_adapter_name() will be called to set
-   * the value to "Concrete_Valuetype_Adapter".
-   */
+  // Name of the service object used to adapt function calls on
+  // the valuetype-related interfaces.
+  // The default value is "Valuetype_Adapter". If the
+  // Valuetype library is linked, the corresponding accessor
+  // function valuetype_adapter_name() will be called to set
+  // the value to "Concrete_Valuetype_Adapter".
   ACE_CString valuetype_adapter_name_;
 
-  /**
-   * Name of the service object used to create the RootPOA.  The
-   * default value is "TAO_POA".  If TAO_RTCORBA is loaded, this
-   * will be changed to TAO_RT_POA so that a POA equipped with
-   * realtime extensions will be returned.
-   */
+  // Name of the service object used to create the RootPOA.  The
+  // default value is "TAO_POA".  If TAO_RTCORBA is loaded, this
+  // will be changed to TAO_RT_POA so that a POA equipped with
+  // realtime extensions will be returned.
   ACE_CString poa_factory_name_;
 
-  /**
-   * The service configurator directive used to load
-   * poa_factory_name_ dynamically.
-   */
+  // The service configurator directive used to load
+  // poa_factory_name_ dynamically.
   ACE_CString poa_factory_directive_;
 
 private:
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 76be478d42a..7f9170af8dd 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -339,6 +339,21 @@ TAO_ORB_Core::has_shutdown (void)
   return this->has_shutdown_;
 }
 
+ACE_INLINE void
+TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (this->has_shutdown ())
+    {
+      // As defined by the CORBA 2.3 specification, throw a
+      // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB
+      // has shutdown by the time an ORB function is called.
+
+      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4,
+                                       CORBA::COMPLETED_NO));
+    }
+}
+
+
 ACE_INLINE int
 TAO_ORB_Core::thread_per_connection_timeout (ACE_Time_Value &timeout) const
 {
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index 97a37403fe2..1148b06fd3b 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -16,15 +16,17 @@
 #define TAO_ORB_TABLE_H
 
 #include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
+#include "ace/Null_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/corbafwd.h"
+
 #include "ace/Hash_Map_Manager_T.h"
-#include "ace/Null_Mutex.h"
+
+#include "tao/TAO_Export.h"
 
 // Forward declarations.
 class TAO_ORB_Core;
@@ -85,14 +87,14 @@ public:
   /// Set the ORB related to the orb_id as the default ORB and not the
   /// ORB that is first binded.
   void set_default (const char *orb_id);
-
+  
   /// Method the ORB invokes to specify that it doesnt want to be the
   /// default ORB if there are more than one ORB registered.
   void not_default (const char *orb_id);
 
-  /// Accessor to the underlying table_
+  /// Accessor to the underlying table_ 
   Table * table (void);
-
+   
 private:
 
   /// Prevent copying
@@ -105,7 +107,7 @@ private:
   void update_orbs();
 
   /// Variable to check if the first ORB decides not to be the default
-  bool first_orb_not_default_;
+  CORBA::Boolean first_orb_not_default_;
 
   /// The implementation.
   Table table_;
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
index 8f84ef9c4aa..a873ddbb474 100644
--- a/TAO/tao/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : valuetype, portableserver, core {
+project : valuetype, core {
   sharedname   = TAO_ObjRefTemplate
   dynamicflags = TAO_ORT_BUILD_DLL
 
@@ -22,8 +22,4 @@ project : valuetype, portableserver, core {
   Resource_Files {
     ObjRefTemplate
   }
-
-  PIDL_Files {
-    ObjRefTemplate
-  }
 }
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 34e55bb51a4..cae4150604a 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -33,6 +33,7 @@
 #ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_
 #define _OBJECT_REFERENCE_TEMPLATE_IDL_
 
+#include <orb.idl>
 #include "tao/PI_Forward.pidl"
 
 module PortableInterceptor
@@ -54,6 +55,15 @@ module PortableInterceptor
   };
 
   typedef sequence<ObjectReferenceTemplate> ObjectReferenceTemplateSeq;
+
+  typedef long AdapterManagerId;
+
+  typedef short AdapterState;
+  const AdapterState    HOLDING         = 0;
+  const AdapterState    ACTIVE          = 1;
+  const AdapterState    DISCARDING      = 2;
+  const AdapterState    INACTIVE        = 3;
+  const AdapterState    NON_EXISTENT    = 4;
 };
 
 #endif  /* _OBJECT_REFERENCE_TEMPLATE_IDL_ */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index 7ae8e3c69bc..6dbae78e6e8 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303
+// be\be_codegen.cpp:323
 
 
 #include "ObjectReferenceTemplateC.h"
@@ -34,7 +34,6 @@
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Valuetype/ValueFactory.h"
-#include "tao/ORB_Core.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
@@ -47,22 +46,22 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ObjectReferenceTemplateC.inl"
+#include "ObjectReferenceTemplateC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_ORT_Export Arg_Traits<CORBA::StringSeq>
     : public
@@ -79,33 +78,33 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
-  ACE_NTOHL (0x72793a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x72793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
     23,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
   ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
     2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -128,29 +127,29 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_add_ref (
     PortableInterceptor::ObjectReferenceFactory * p
   )
 {
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::remove_ref (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_remove_ref (
     PortableInterceptor::ObjectReferenceFactory * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::release (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_release (
     PortableInterceptor::ObjectReferenceFactory * p
   )
 {
@@ -164,7 +163,7 @@ PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return dynamic_cast< ::PortableInterceptor::ObjectReferenceFactory * > (v);
 }
 
@@ -178,8 +177,8 @@ void
 PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceFactory *_tao_tmp_pointer =
-    static_cast<
-        ObjectReferenceFactory *> (
+    ACE_static_cast (
+        ObjectReferenceFactory *,
         _tao_void_pointer
       );
   CORBA::remove_ref (_tao_tmp_pointer);
@@ -199,29 +198,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
         base,
         ObjectReferenceFactory::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceFactory::_downcast (base);
@@ -229,33 +228,33 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x6174653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x6174653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
     24,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
     2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -278,29 +277,29 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_add_ref (
     PortableInterceptor::ObjectReferenceTemplate * p
   )
 {
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::remove_ref (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_remove_ref (
     PortableInterceptor::ObjectReferenceTemplate * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::release (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_release (
     PortableInterceptor::ObjectReferenceTemplate * p
   )
 {
@@ -314,7 +313,7 @@ PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return dynamic_cast< ::PortableInterceptor::ObjectReferenceTemplate * > (v);
 }
 
@@ -328,8 +327,8 @@ void
 PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceTemplate *_tao_tmp_pointer =
-    static_cast<
-        ObjectReferenceTemplate *> (
+    ACE_static_cast (
+        ObjectReferenceTemplate *,
         _tao_void_pointer
       );
   CORBA::remove_ref (_tao_tmp_pointer);
@@ -349,37 +348,37 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
   return retval;
 }
 
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
@@ -428,42 +427,42 @@ void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (
   )
 {
   ObjectReferenceTemplateSeq * _tao_tmp_pointer =
-    static_cast<ObjectReferenceTemplateSeq *> (_tao_void_pointer);
+    ACE_static_cast (ObjectReferenceTemplateSeq *, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   63,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
     27,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
   ACE_NTOHL (0x65710000),  // name = ObjectReferenceTemplateSeq
     CORBA::tk_sequence, // typecode kind
   124, // encapsulation length
@@ -472,33 +471,33 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
     480, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       60,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x506f7274),
-      ACE_NTOHL (0x61626c65),
-      ACE_NTOHL (0x496e7465),
-      ACE_NTOHL (0x72636570),
-      ACE_NTOHL (0x746f722f),
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63745265),
-      ACE_NTOHL (0x66657265),
-      ACE_NTOHL (0x6e636554),
-      ACE_NTOHL (0x656d706c),
-      ACE_NTOHL (0x6174653a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x506f7274), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x496e7465), 
+      ACE_NTOHL (0x72636570), 
+      ACE_NTOHL (0x746f722f), 
+      ACE_NTOHL (0x4f626a65), 
+      ACE_NTOHL (0x63745265), 
+      ACE_NTOHL (0x66657265), 
+      ACE_NTOHL (0x6e636554), 
+      ACE_NTOHL (0x656d706c), 
+      ACE_NTOHL (0x6174653a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
             24,
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63745265),
-      ACE_NTOHL (0x66657265),
-      ACE_NTOHL (0x6e636554),
-      ACE_NTOHL (0x656d706c),
+      ACE_NTOHL (0x4f626a65), 
+      ACE_NTOHL (0x63745265), 
+      ACE_NTOHL (0x66657265), 
+      ACE_NTOHL (0x6e636554), 
+      ACE_NTOHL (0x656d706c), 
       ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
             2, // value modifier
       CORBA::tk_null, // no stateful base valuetype
 
 3, // member count
-
+      
     0U,
 
 };
@@ -518,7 +517,97 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:57
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  53,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0
+    17,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x0),  // name = AdapterManagerId
+    CORBA::tk_long,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterManagerId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_AdapterManagerId),
+    (char *) &_oc_PortableInterceptor_AdapterManagerId,
+    0,
+    sizeof (PortableInterceptor::AdapterManagerId)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_AdapterManagerId =
+    &_tc_TAO_tc_PortableInterceptor_AdapterManagerId;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657253), 
+  ACE_NTOHL (0x74617465), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0
+    13,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657253), 
+  ACE_NTOHL (0x74617465), 
+  ACE_NTOHL (0x0),  // name = AdapterState
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterState (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_AdapterState),
+    (char *) &_oc_PortableInterceptor_AdapterState,
+    0,
+    sizeof (PortableInterceptor::AdapterState)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_AdapterState =
+    &_tc_TAO_tc_PortableInterceptor_AdapterState;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_cs.cpp:57
+
+
 
 template<>
 CORBA::Boolean
@@ -574,7 +663,9 @@ operator>>= (
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:57
+// be\be_visitor_valuetype/any_op_cs.cpp:57
+
+
 
 template<>
 CORBA::Boolean
@@ -629,8 +720,8 @@ operator>>= (
 
 
 
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -666,8 +757,8 @@ CORBA::Boolean operator>>= (
     PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
   )
 {
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ObjectReferenceTemplateSeq *&> (
+  return _tao_any >>= ACE_const_cast (
+      const PortableInterceptor::ObjectReferenceTemplateSeq *&,
       _tao_elem
     );
 }
@@ -688,7 +779,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+// be\be_valuetype.cpp:490
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt)
@@ -709,7 +800,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceFactory * vt)
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -720,8 +811,8 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        const_cast<
-            PortableInterceptor::ObjectReferenceFactory *> (
+        ACE_const_cast (
+            PortableInterceptor::ObjectReferenceFactory *,
             _tao_valuetype
           ),
         (ptrdiff_t) &PortableInterceptor::ObjectReferenceFactory::_downcast
@@ -740,7 +831,7 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+// be\be_valuetype.cpp:490
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
@@ -761,7 +852,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -772,8 +863,8 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        const_cast<
-            PortableInterceptor::ObjectReferenceTemplate *> (
+        ACE_const_cast (
+            PortableInterceptor::ObjectReferenceTemplate *,
             _tao_valuetype
           ),
         (ptrdiff_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast
@@ -792,7 +883,7 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
@@ -802,21 +893,21 @@ CORBA::Boolean operator<< (
     const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -826,7 +917,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -836,35 +927,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -890,13 +981,13 @@ CORBA::Boolean operator>> (
   template class
     TAO_Value_Var_T<
         PortableInterceptor::ObjectReferenceFactory
-
+        
       >;
-
+  
   template class
     TAO_Value_Out_T<
         PortableInterceptor::ObjectReferenceFactory
-
+        
       >;
 
   template class
@@ -918,13 +1009,13 @@ CORBA::Boolean operator>> (
   template class
     TAO_Value_Var_T<
         PortableInterceptor::ObjectReferenceTemplate
-
+        
       >;
-
+  
   template class
     TAO_Value_Out_T<
         PortableInterceptor::ObjectReferenceTemplate
-
+        
       >;
 
   template class
@@ -1006,13 +1097,13 @@ CORBA::Boolean operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         PortableInterceptor::ObjectReferenceFactory \
-
+        
       >
-
+  
 # pragma instantiate \
     TAO_Value_Out_T< \
         PortableInterceptor::ObjectReferenceFactory \
-
+        
       >
 
 # pragma instantiate \
@@ -1021,12 +1112,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_Argument_T< \
-        PortableInterceptor::AdapterName, \
-        PortableInterceptor::AdapterName_var \
-      >
-
-# pragma instantiate \
     TAO::Value_Traits< \
         PortableInterceptor::ObjectReferenceTemplate \
       >
@@ -1034,13 +1119,13 @@ CORBA::Boolean operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         PortableInterceptor::ObjectReferenceTemplate \
-
+        
       >
-
+  
 # pragma instantiate \
     TAO_Value_Out_T< \
         PortableInterceptor::ObjectReferenceTemplate \
-
+        
       >
 
 # pragma instantiate \
@@ -1092,4 +1177,5 @@ CORBA::Boolean operator>> (
         PortableInterceptor::ObjectReferenceTemplateSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
index d2a256eac7d..3e4798bd919 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -26,26 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 
 #include /**/ "ace/pre.h"
 
-
-#include "ace/config-all.h"
+#include "tao/ORB.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ort_export.h"
-#include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
-#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/Valuetype/Sequence_T.h"
 #include "tao/Sequence_T.h"
 #include "tao/Valuetype/Value_VarOut_T.h"
@@ -78,26 +76,26 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527
-
-
+  // be\be_valuetype.cpp:527
+  
+  
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_
-
+  
   class ObjectReferenceFactory;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceFactory
       >
     ObjectReferenceFactory_var;
-
+  
   typedef
     TAO_Value_Out_T<
         ObjectReferenceFactory
@@ -105,78 +103,78 @@ namespace PortableInterceptor
     ObjectReferenceFactory_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
+  // be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
-
+  
   class TAO_ORT_Export ObjectReferenceFactory
     : public virtual CORBA::ValueBase
   {
   public:
     typedef ObjectReferenceFactory_var _var_type;
-
+    
     static ObjectReferenceFactory* _downcast (CORBA::ValueBase *);
-
+    
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceFactory *&
       );
-
+    
     virtual const char* _tao_obv_repository_id (void) const;
-
+    
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:401
+    
   public:
     virtual CORBA::Object_ptr make_object (
-        const char *, const ::PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:250
+  
   protected:
     ObjectReferenceFactory (void);
-
+    
     virtual ~ObjectReferenceFactory (void);
-
-
+    
+    
   private:
     ObjectReferenceFactory (const ObjectReferenceFactory &);
     void operator= (const ObjectReferenceFactory &);
-
+    
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527
-
-
+  // be\be_valuetype.cpp:527
+  
+  
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
-
+  
   class ObjectReferenceTemplate;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceTemplate
       >
     ObjectReferenceTemplate_var;
-
+  
   typedef
     TAO_Value_Out_T<
         ObjectReferenceTemplate
@@ -184,87 +182,87 @@ namespace PortableInterceptor
     ObjectReferenceTemplate_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
+  // be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
-
+  
   class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual ObjectReferenceFactory
   {
   public:
     typedef ObjectReferenceTemplate_var _var_type;
-
+    
     static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
-
+    
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceTemplate *&
       );
-
+    
     virtual const char* _tao_obv_repository_id (void) const;
-
+    
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:401
+    
   public:
     virtual char * server_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:401
+    
   public:
     virtual char * orb_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:401
+    
   public:
     virtual ::PortableInterceptor::AdapterName * adapter_name (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:250
+  
   protected:
     ObjectReferenceTemplate (void);
-
+    
     virtual ~ObjectReferenceTemplate (void);
-
-
+    
+    
   private:
     ObjectReferenceTemplate (const ObjectReferenceTemplate &);
     void operator= (const ObjectReferenceTemplate &);
-
+    
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-
+  
   class ObjectReferenceTemplateSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ObjectReferenceTemplateSeq,
@@ -274,7 +272,7 @@ namespace PortableInterceptor
           >
       >
     ObjectReferenceTemplateSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ObjectReferenceTemplateSeq,
@@ -285,7 +283,7 @@ namespace PortableInterceptor
           >
       >
     ObjectReferenceTemplateSeq_out;
-
+  
   class TAO_ORT_Export ObjectReferenceTemplateSeq
     : public
         TAO_Unbounded_Valuetype_Sequence<
@@ -299,38 +297,85 @@ namespace PortableInterceptor
     ObjectReferenceTemplateSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ObjectReferenceTemplate ** buffer,
+        ObjectReferenceTemplate ** buffer, 
         CORBA::Boolean release = 0
       );
     ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
     ~ObjectReferenceTemplateSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ObjectReferenceTemplateSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
+  typedef CORBA::Long AdapterManagerId;
+  typedef CORBA::Long_out AdapterManagerId_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
+  typedef CORBA::Short AdapterState;
+  typedef CORBA::Short_out AdapterState_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState HOLDING = 0;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState ACTIVE = 1;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState DISCARDING = 2;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState INACTIVE = 3;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState NON_EXISTENT = 4;
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:55
+// be\be_visitor_valuetype/obv_module.cpp:55
 
 namespace OBV_PortableInterceptor
 {
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -338,47 +383,47 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory>
   {
-    static void add_ref (PortableInterceptor::ObjectReferenceFactory *);
-    static void remove_ref (PortableInterceptor::ObjectReferenceFactory *);
-    static void release (PortableInterceptor::ObjectReferenceFactory *);
+    static void tao_add_ref (PortableInterceptor::ObjectReferenceFactory *);
+    static void tao_remove_ref (PortableInterceptor::ObjectReferenceFactory *);
+    static void tao_release (PortableInterceptor::ObjectReferenceFactory *);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate>
   {
-    static void add_ref (PortableInterceptor::ObjectReferenceTemplate *);
-    static void remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
-    static void release (PortableInterceptor::ObjectReferenceTemplate *);
+    static void tao_add_ref (PortableInterceptor::ObjectReferenceTemplate *);
+    static void tao_remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
+    static void tao_release (PortableInterceptor::ObjectReferenceTemplate *);
   };
 
 #endif /* end #if !defined */
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
+// be\be_visitor_valuetype/any_op_ch.cpp:54
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
+// be\be_visitor_valuetype/any_op_ch.cpp:54
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version
@@ -386,7 +431,7 @@ TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableIntercept
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:434
+// be\be_valuetype.cpp:434
 
 namespace CORBA
 {
@@ -395,13 +440,13 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
 TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:434
+// be\be_valuetype.cpp:434
 
 namespace CORBA
 {
@@ -410,13 +455,13 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
 TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
@@ -433,10 +478,10 @@ TAO_ORT_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
-#include "ObjectReferenceTemplateC.inl"
+#include "ObjectReferenceTemplateC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -450,3 +495,4 @@ TAO_ORT_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i
new file mode 100644
index 00000000000..1185feac15c
--- /dev/null
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_valuetype/valuetype_ci.cpp:56
+
+ACE_INLINE
+PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory (void)
+{}
+
+ACE_INLINE
+PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void)
+{}
+
+ACE_INLINE const char* 
+PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
+{
+  return "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0";
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_valuetype/valuetype_ci.cpp:56
+
+ACE_INLINE
+PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
+{}
+
+ACE_INLINE
+PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+{}
+
+ACE_INLINE const char* 
+PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
+{
+  return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0";
+}
+
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index bb64bcd766e..df57f09aed8 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -17,8 +17,6 @@
 #include "IFR_Client_Adapter.h"
 #include "Remote_Object_Proxy_Broker.h"
 #include "CDR.h"
-#include "SystemException.h"
-#include "PolicyC.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
@@ -303,7 +301,7 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_THROW_RETURN (CORBA::INTERNAL (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         EINVAL),
                       CORBA::COMPLETED_NO),
                     0);
@@ -542,7 +540,7 @@ CORBA::Object::_set_policy_overrides (
                                   this->is_collocated_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_MAYBE));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
@@ -928,26 +926,26 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
 namespace TAO
 {
   CORBA::Object_ptr
-  Objref_Traits<CORBA::Object>::duplicate (CORBA::Object_ptr p)
+  Objref_Traits<CORBA::Object>::tao_duplicate (CORBA::Object_ptr p)
   {
     return CORBA::Object::_duplicate (p);
   }
 
   void
-  Objref_Traits<CORBA::Object>::release (CORBA::Object_ptr p)
+  Objref_Traits<CORBA::Object>::tao_release (CORBA::Object_ptr p)
   {
     CORBA::release (p);
   }
 
   CORBA::Object_ptr
-  Objref_Traits<CORBA::Object>::nil (void)
+  Objref_Traits<CORBA::Object>::tao_nil (void)
   {
     return CORBA::Object::_nil ();
   }
 
   CORBA::Boolean
-  Objref_Traits<CORBA::Object>::marshal (CORBA::Object_ptr p,
-                                         TAO_OutputCDR & cdr)
+  Objref_Traits<CORBA::Object>::tao_marshal (CORBA::Object_ptr p,
+                                             TAO_OutputCDR & cdr)
   {
     return p->marshal (cdr);
   }
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index abe40a97ce6..fb0a3b1af07 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -422,11 +422,11 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::Object>
   {
-    static CORBA::Object_ptr duplicate (CORBA::Object_ptr);
-    static void release (CORBA::Object_ptr);
-    static CORBA::Object_ptr nil (void);
-    static CORBA::Boolean marshal (CORBA::Object_ptr p,
-                                   TAO_OutputCDR & cdr);
+    static CORBA::Object_ptr tao_duplicate (CORBA::Object_ptr);
+    static void tao_release (CORBA::Object_ptr);
+    static CORBA::Object_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (CORBA::Object_ptr p,
+                                       TAO_OutputCDR & cdr);
   };
 
   /**
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp
index db3a85f5329..f3b9d225df0 100644
--- a/TAO/tao/Object_Argument_T.cpp
+++ b/TAO/tao/Object_Argument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_Object_Argument_T<S_ptr>::marshal (TAO_OutputCDR & cdr)
   return cdr << this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_ptr>
 void
 TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p)
@@ -31,8 +29,6 @@ TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S_ptr, typename S_traits>
@@ -46,12 +42,10 @@ template<typename S_ptr, typename S_traits>
 CORBA::Boolean
 TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr)
 {
-  S_traits::release (this->x_);
+  S_traits::tao_release (this->x_);
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_ptr, typename S_traits>
 void
 TAO::Inout_Object_Argument_T<S_ptr,S_traits>::interceptor_param (
@@ -62,8 +56,6 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S_ptr, typename S_out>
@@ -73,8 +65,6 @@ TAO::Out_Object_Argument_T<S_ptr,S_out>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_ptr, typename S_out>
 void
 TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param (
@@ -85,8 +75,6 @@ TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S_ptr, typename S_var>
@@ -96,8 +84,6 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_.out ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_ptr, typename S_var>
 void
 TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any)
@@ -105,6 +91,4 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_OBJECT_ARGUMENT_T_C */
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index 206d20fc631..fa23e08ef83 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -41,9 +41,9 @@ namespace TAO
     In_Object_Argument_T (S_ptr x);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_ptr arg (void) const;
 
   private:
@@ -64,9 +64,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_ptr & arg (void);
 
   private:
@@ -86,9 +86,9 @@ namespace TAO
     Out_Object_Argument_T (S_out & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_out arg (void);
 
   private:
@@ -108,9 +108,9 @@ namespace TAO
     Ret_Object_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_ptr & arg (void);
 
     S_ptr excp (void);
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 7c673f39ba0..577447e433e 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -233,7 +233,7 @@ TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key,
       return strm.read_octet_array (key.get_buffer (),
                                     _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.read_octet_array (key.get_buffer (), key.length ());
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
 
     }
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index f5293c48b40..23aedad01ef 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -18,7 +18,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 namespace CORBA
 {
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index af00050eba3..d39df133941 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -3,16 +3,12 @@
 #include "Environment.h"
 #include "debug.h"
 #include "ORB_Constants.h"
-#include "SystemException.h"
-#include "Object.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (tao,
            Object_Ref_Table,
            "$Id$")
 
-
 // ****************************************************************
 
 TAO_Object_Ref_Table::TAO_Object_Ref_Table (void)
diff --git a/TAO/tao/Object_SArgument_T.cpp b/TAO/tao/Object_SArgument_T.cpp
index cdd83d2e90f..21f3d4d98c6 100644
--- a/TAO/tao/Object_SArgument_T.cpp
+++ b/TAO/tao/Object_SArgument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR &cdr)
   return cdr >> this->x_.out ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_ptr, typename S_var>
 void
 TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
@@ -33,8 +31,6 @@ TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S_ptr, typename S_var>
@@ -51,8 +47,6 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_.out ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_ptr, typename S_var>
 void
 TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
@@ -63,8 +57,6 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S_ptr, typename S_var, typename S_out>
@@ -74,8 +66,6 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_.in ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_ptr, typename S_var, typename S_out>
 void
 TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param (
@@ -86,8 +76,6 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S_ptr, typename S_var>
@@ -97,8 +85,6 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var>::marshal (TAO_OutputCDR & cdr)
   return cdr << this->x_.in ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_ptr, typename S_var>
 void
 TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result (
@@ -108,6 +94,4 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result (
   (*any) <<= this->x_.in ();
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_OBJECT_SARGUMENT_T_C */
diff --git a/TAO/tao/Object_SArgument_T.h b/TAO/tao/Object_SArgument_T.h
index c906251067b..9876bdad6bb 100644
--- a/TAO/tao/Object_SArgument_T.h
+++ b/TAO/tao/Object_SArgument_T.h
@@ -41,9 +41,9 @@ namespace TAO
     In_Object_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_ptr arg (void) const;
 
   private:
@@ -64,9 +64,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_ptr & arg (void);
 
   private:
@@ -86,9 +86,9 @@ namespace TAO
     Out_Object_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_out arg (void);
 
   private:
@@ -108,9 +108,9 @@ namespace TAO
     Ret_Object_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_ptr & arg (void);
 
   private:
diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp
index 53bf34d07fb..663b1a6a7c5 100644
--- a/TAO/tao/Object_T.cpp
+++ b/TAO/tao/Object_T.cpp
@@ -2,9 +2,8 @@
 #ifndef TAO_OBJECT_T_C
 #define TAO_OBJECT_T_C
 
-#include "tao/Object_T.h"
-#include "tao/Stub.h"
-#include "tao/SystemException.h"
+#include "Object_T.h"
+#include "Stub.h"
 
 ACE_RCSID (tao,
            Object_T,
diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp
index 7da5ea26bc6..1449d935ff6 100644
--- a/TAO/tao/Objref_VarOut_T.cpp
+++ b/TAO/tao/Objref_VarOut_T.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (tao,
 
 template <typename T>
 TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void)
-  : ptr_ (TAO::Objref_Traits<T>::nil ())
+  : ptr_ (TAO::Objref_Traits<T>::tao_nil ())
 {
 }
 
@@ -24,21 +24,21 @@ TAO_Objref_Var_T<T>::TAO_Objref_Var_T (
     const TAO_Objref_Var_T<T> & p
   )
   : TAO_Base_var (),
-    ptr_ (TAO::Objref_Traits<T>::duplicate (p.ptr ()))
+    ptr_ (TAO::Objref_Traits<T>::tao_duplicate (p.ptr ()))
 {
 }
 
 template <typename T>
 TAO_Objref_Var_T<T>::~TAO_Objref_Var_T (void)
 {
-  TAO::Objref_Traits<T>::release (this->ptr_);
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
 }
 
 template <typename T>
 TAO_Objref_Var_T<T> &
 TAO_Objref_Var_T<T>::operator= (T * p)
 {
-  TAO::Objref_Traits<T>::release (this->ptr_);
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
@@ -51,8 +51,8 @@ TAO_Objref_Var_T<T>::operator= (
 {
   if (this != &p)
     {
-      TAO::Objref_Traits<T>::release (this->ptr_);
-      this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.ptr ());
+      TAO::Objref_Traits<T>::tao_release (this->ptr_);
+      this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.ptr ());
     }
 
   return *this;
@@ -95,8 +95,8 @@ template <typename T>
 T *&
 TAO_Objref_Var_T<T>::out (void)
 {
-  TAO::Objref_Traits<T>::release (this->ptr_);
-  this->ptr_ = TAO::Objref_Traits<T>::nil ();
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
+  this->ptr_ = TAO::Objref_Traits<T>::tao_nil ();
   return this->ptr_;
 }
 
@@ -105,7 +105,7 @@ T *
 TAO_Objref_Var_T<T>::_retn (void)
 {
   T * val = this->ptr_;
-  this->ptr_ = TAO::Objref_Traits<T>::nil ();
+  this->ptr_ = TAO::Objref_Traits<T>::tao_nil ();
   return val;
 }
 
@@ -120,14 +120,14 @@ template <typename T>
 void
 TAO_Objref_Var_T<T>::free (void)
 {
-  TAO::Objref_Traits<T>::release (this->ptr_);
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
 }
 
 template <typename T>
 void
 TAO_Objref_Var_T<T>::reset (T * p)
 {
-  TAO::Objref_Traits<T>::release (this->ptr_);
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
   this->ptr_ = p;
 }
 
@@ -137,7 +137,7 @@ template <typename T>
 TAO_Objref_Out_T<T>::TAO_Objref_Out_T (T *& p)
   : ptr_ (p)
 {
-  this->ptr_ = TAO::Objref_Traits<T>::nil ();
+  this->ptr_ = TAO::Objref_Traits<T>::tao_nil ();
 }
 
 template <typename T>
@@ -146,8 +146,8 @@ TAO_Objref_Out_T<T>::TAO_Objref_Out_T (
   )
   : ptr_ (p.out ())
 {
-  TAO::Objref_Traits<T>::release (this->ptr_);
-  this->ptr_ = TAO::Objref_Traits<T>::nil ();
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
+  this->ptr_ = TAO::Objref_Traits<T>::tao_nil ();
 }
 
 template <typename T>
@@ -174,7 +174,7 @@ TAO_Objref_Out_T<T>::operator= (
     const TAO_Objref_Var_T<T> & p
   )
 {
-  this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.ptr ());
+  this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.ptr ());
   return *this;
 }
 
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index f0d0fcf2407..a158f2b2f35 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -37,11 +37,11 @@ namespace TAO
   template<typename T>
   struct Objref_Traits
   {
-    static T * duplicate (T *);
-    static void release (T *);
-    static T * nil (void);
-    static CORBA::Boolean marshal (T *,
-                                   TAO_OutputCDR &);
+    static T * tao_duplicate (T *);
+    static void tao_release (T *);
+    static T * tao_nil (void);
+    static CORBA::Boolean tao_marshal (T *,
+                                       TAO_OutputCDR &);
   };
 }
 
diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp
index 8126af7647e..6c1929201ed 100644
--- a/TAO/tao/PICurrent.cpp
+++ b/TAO/tao/PICurrent.cpp
@@ -14,7 +14,6 @@ ACE_RCSID (tao,
 #include "ORB_Core.h"
 #include "TAO_Server_Request.h"
 #include "PICurrent_Copy_Callback.h"
-#include "SystemException.h"
 
 
 TAO::PICurrent::PICurrent (TAO_ORB_Core * orb_core)
@@ -121,7 +120,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId id
                         CORBA::Any (table[id]), // Make a copy.
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (any);
@@ -135,7 +134,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId id
                         CORBA::Any,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (any);
diff --git a/TAO/tao/PICurrent_ORBInitializer.cpp b/TAO/tao/PICurrent_ORBInitializer.cpp
index f86a18151eb..c4f5255cdd7 100644
--- a/TAO/tao/PICurrent_ORBInitializer.cpp
+++ b/TAO/tao/PICurrent_ORBInitializer.cpp
@@ -4,7 +4,6 @@
 
 #include "ORB_Core.h"
 #include "ORBInitInfo.h"
-#include "SystemException.h"
 
 ACE_RCSID (tao,
            PICurrent_ORBInitializer,
@@ -27,7 +26,7 @@ TAO_PICurrent_ORBInitializer::pre_init (
                     TAO::PICurrent (orb_core),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
index 5256404e9dc..a1269596552 100644
--- a/TAO/tao/PI_Forward.pidl
+++ b/TAO/tao/PI_Forward.pidl
@@ -43,8 +43,6 @@ module PortableInterceptor
   typedef string ORBId;
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::OctetSeq ObjectId;
-  typedef long AdapterManagerId;
-  typedef short AdapterState;
 };
 
 #endif  /* _PI_FORWARD_IDL_ */
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
index ab3fc77daa3..d989d5183a4 100644
--- a/TAO/tao/PI_ForwardC.cpp
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -26,12 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303
+// be\be_codegen.cpp:323
 
 
 #include "PI_ForwardC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -39,11 +37,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "PI_ForwardC.inl"
+#include "PI_ForwardC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -52,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_PortableInterceptor_ServerId[] =
 {
@@ -93,7 +91,7 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_PortableInterceptor_ORBId[] =
 {
@@ -132,7 +130,7 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_PortableInterceptor_AdapterName[] =
 {
@@ -195,7 +193,7 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_PortableInterceptor_ObjectId[] =
 {
@@ -258,95 +256,7 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465724d), 
-  ACE_NTOHL (0x616e6167), 
-  ACE_NTOHL (0x65724964), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0
-    17,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465724d), 
-  ACE_NTOHL (0x616e6167), 
-  ACE_NTOHL (0x65724964), 
-  ACE_NTOHL (0x0),  // name = AdapterManagerId
-    CORBA::tk_long,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterManagerId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_AdapterManagerId),
-    (char *) &_oc_PortableInterceptor_AdapterManagerId,
-    0,
-    sizeof (PortableInterceptor::AdapterManagerId)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_AdapterManagerId =
-    &_tc_TAO_tc_PortableInterceptor_AdapterManagerId;
-}
-
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657253), 
-  ACE_NTOHL (0x74617465), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0
-    13,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657253), 
-  ACE_NTOHL (0x74617465), 
-  ACE_NTOHL (0x0),  // name = AdapterState
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterState (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_AdapterState),
-    (char *) &_oc_PortableInterceptor_AdapterState,
-    0,
-    sizeof (PortableInterceptor::AdapterState)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_AdapterState =
-    &_tc_TAO_tc_PortableInterceptor_AdapterState;
-}
-
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1633
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index 9f876afd852..b1da5a26d1d 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -26,25 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_PI_FORWARDC_H_
 #define _TAO_IDL_ORIG_PI_FORWARDC_H_
 
 #include /**/ "ace/pre.h"
 
-
-#include "ace/config-all.h"
+#include "OctetSeqC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
 
-#include "OctetSeqC.h"
 #include "StringSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -71,88 +67,66 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:376
-  
+  // be\be_visitor_typedef/typedef_ch.cpp:376
+
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
   typedef CORBA::String_out ServerId_out;
-  
+
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId;
-  
+
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:376
-  
+  // be\be_visitor_typedef/typedef_ch.cpp:376
+
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
   typedef CORBA::String_out ORBId_out;
-  
+
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId;
-  
+
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:435
-  
+  // be\be_visitor_typedef/typedef_ch.cpp:435
+
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
   typedef CORBA::StringSeq_out AdapterName_out;
-  
+
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName;
-  
+
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:435
-  
+  // be\be_visitor_typedef/typedef_ch.cpp:435
+
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
-  
+
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
-  
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:342
-  
-  typedef CORBA::Long AdapterManagerId;
-  typedef CORBA::Long_out AdapterManagerId_out;
-  
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
-  
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:342
-  
-  typedef CORBA::Short AdapterState;
-  typedef CORBA::Short_out AdapterState_out;
-  
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -160,10 +134,10 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
-#include "PI_ForwardC.inl"
+#include "PI_ForwardC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/PI_ForwardC.i b/TAO/tao/PI_ForwardC.i
new file mode 100644
index 00000000000..38aa32569ba
--- /dev/null
+++ b/TAO/tao/PI_ForwardC.i
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index addf34ef1fd..a50804aa762 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -32,7 +32,6 @@
 #include "PolicyC.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
-#include "tao/SystemException.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
 #include "tao/Typecode.h"
@@ -457,7 +456,7 @@ CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Policy_ptr
-TAO::Objref_Traits<CORBA::Policy>::duplicate (
+TAO::Objref_Traits<CORBA::Policy>::tao_duplicate (
     CORBA::Policy_ptr p
   )
 {
@@ -466,7 +465,7 @@ TAO::Objref_Traits<CORBA::Policy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::Policy>::release (
+TAO::Objref_Traits<CORBA::Policy>::tao_release (
     CORBA::Policy_ptr p
   )
 {
@@ -475,14 +474,14 @@ TAO::Objref_Traits<CORBA::Policy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Policy_ptr
-TAO::Objref_Traits<CORBA::Policy>::nil (void)
+TAO::Objref_Traits<CORBA::Policy>::tao_nil (void)
 {
   return CORBA::Policy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::Policy>::marshal (
+TAO::Objref_Traits<CORBA::Policy>::tao_marshal (
     CORBA::Policy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -734,7 +733,7 @@ CORBA::Policy::marshal (TAO_OutputCDR &cdr)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::PolicyManager_ptr
-TAO::Objref_Traits<CORBA::PolicyManager>::duplicate (
+TAO::Objref_Traits<CORBA::PolicyManager>::tao_duplicate (
     CORBA::PolicyManager_ptr p
   )
 {
@@ -743,7 +742,7 @@ TAO::Objref_Traits<CORBA::PolicyManager>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::PolicyManager>::release (
+TAO::Objref_Traits<CORBA::PolicyManager>::tao_release (
     CORBA::PolicyManager_ptr p
   )
 {
@@ -752,14 +751,14 @@ TAO::Objref_Traits<CORBA::PolicyManager>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::PolicyManager_ptr
-TAO::Objref_Traits<CORBA::PolicyManager>::nil (void)
+TAO::Objref_Traits<CORBA::PolicyManager>::tao_nil (void)
 {
   return CORBA::PolicyManager::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::PolicyManager>::marshal (
+TAO::Objref_Traits<CORBA::PolicyManager>::tao_marshal (
     CORBA::PolicyManager_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -879,7 +878,7 @@ CORBA::PolicyManager::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::PolicyCurrent_ptr
-TAO::Objref_Traits<CORBA::PolicyCurrent>::duplicate (
+TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_duplicate (
     CORBA::PolicyCurrent_ptr p
   )
 {
@@ -888,7 +887,7 @@ TAO::Objref_Traits<CORBA::PolicyCurrent>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::PolicyCurrent>::release (
+TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_release (
     CORBA::PolicyCurrent_ptr p
   )
 {
@@ -897,14 +896,14 @@ TAO::Objref_Traits<CORBA::PolicyCurrent>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::PolicyCurrent_ptr
-TAO::Objref_Traits<CORBA::PolicyCurrent>::nil (void)
+TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_nil (void)
 {
   return CORBA::PolicyCurrent::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::PolicyCurrent>::marshal (
+TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_marshal (
     CORBA::PolicyCurrent_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 1d4c2b5815f..4ac4a42dd25 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -40,8 +40,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Environment.h"
-#include "tao/UserException.h"
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
@@ -71,13 +70,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -87,62 +86,62 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::Short PolicyErrorCode;
   typedef CORBA::Short_out PolicyErrorCode_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyErrorCode;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode BAD_POLICY = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_POLICYERROR_CH_)
 #define _CORBA_POLICYERROR_CH_
-
+  
   class TAO_Export PolicyError : public CORBA::UserException
   {
   public:
-
+    
     CORBA::PolicyErrorCode reason;
     PolicyError (void);
     PolicyError (const PolicyError &);
     ~PolicyError (void);
 
     PolicyError &operator= (const PolicyError &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static PolicyError *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -154,51 +153,51 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     PolicyError (
         ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_INVALIDPOLICIES_CH_)
 #define _CORBA_INVALIDPOLICIES_CH_
-
+  
   class TAO_Export InvalidPolicies : public CORBA::UserException
   {
   public:
-
+    
     CORBA::UShortSeq indices;
     InvalidPolicies (void);
     InvalidPolicies (const InvalidPolicies &);
     ~InvalidPolicies (void);
 
     InvalidPolicies &operator= (const InvalidPolicies &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static InvalidPolicies *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -210,47 +209,47 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     InvalidPolicies (
         const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
-
+  
   class Policy;
   typedef Policy *Policy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Policy
       >
     Policy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Policy
@@ -258,13 +257,13 @@ namespace CORBA
     Policy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
-
+  
   class TAO_Export Policy
     : public virtual CORBA::Object
   {
@@ -272,65 +271,65 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Policy>;
     typedef Policy_ptr _ptr_type;
     typedef Policy_var _var_type;
-
+    
     // The static operations.
     static Policy_ptr _duplicate (Policy_ptr obj);
-
+    
     static Policy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Policy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Policy_ptr _nil (void)
     {
       return (Policy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -344,21 +343,21 @@ namespace CORBA
 
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Policy (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Policy_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Policy (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Policy (
         TAO_Stub *objref,
@@ -366,38 +365,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Policy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Policy (const Policy &);
-
+    
     void operator= (const Policy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_)
 #define _CORBA_POLICYMANAGER__VAR_OUT_CH_
-
+  
   class PolicyManager;
   typedef PolicyManager *PolicyManager_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PolicyManager
       >
     PolicyManager_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PolicyManager
@@ -405,43 +404,43 @@ namespace CORBA
     PolicyManager_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYMANAGER_CH_)
 #define _CORBA_POLICYMANAGER_CH_
-
+  
   class TAO_Export PolicyManager
     : public virtual CORBA::Object
   {
   public:
     typedef PolicyManager_ptr _ptr_type;
     typedef PolicyManager_var _var_type;
-
+    
     // The static operations.
     static PolicyManager_ptr _duplicate (PolicyManager_ptr obj);
-
+    
     static PolicyManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyManager_ptr _nil (void)
     {
       return (PolicyManager_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -449,10 +448,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_policy_overrides (
         const CORBA::PolicyList & policies,
         CORBA::SetOverrideType set_add
@@ -462,53 +461,53 @@ namespace CORBA
         CORBA::SystemException
         , CORBA::InvalidPolicies
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PolicyManager (void);
-
+    
     virtual ~PolicyManager (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyManager (const PolicyManager &);
-
+    
     void operator= (const PolicyManager &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
 #define _CORBA_POLICYCURRENT__VAR_OUT_CH_
-
+  
   class PolicyCurrent;
   typedef PolicyCurrent *PolicyCurrent_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PolicyCurrent
       >
     PolicyCurrent_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PolicyCurrent
@@ -516,13 +515,13 @@ namespace CORBA
     PolicyCurrent_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYCURRENT_CH_)
 #define _CORBA_POLICYCURRENT_CH_
-
+  
   class TAO_Export PolicyCurrent
     : public virtual CORBA::PolicyManager,
       public virtual CORBA::Current
@@ -530,56 +529,56 @@ namespace CORBA
   public:
     typedef PolicyCurrent_ptr _ptr_type;
     typedef PolicyCurrent_var _var_type;
-
+    
     // The static operations.
     static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj);
-
+    
     static PolicyCurrent_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyCurrent_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyCurrent_ptr _nil (void)
     {
       return (PolicyCurrent_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PolicyCurrent (void);
-
+    
     virtual ~PolicyCurrent (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyCurrent (const PolicyCurrent &);
-
+    
     void operator= (const PolicyCurrent &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyCurrent;
 
 // TAO_IDL - Generated from
@@ -607,18 +606,18 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__TRAITS_CH_)
 #define _CORBA_POLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::Policy>
   {
-    static CORBA::Policy_ptr duplicate (
+    static CORBA::Policy_ptr tao_duplicate (
         CORBA::Policy_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::Policy_ptr
       );
-    static CORBA::Policy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::Policy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::Policy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -628,18 +627,18 @@ namespace TAO
 
 #if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_)
 #define _CORBA_POLICYMANAGER__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::PolicyManager>
   {
-    static CORBA::PolicyManager_ptr duplicate (
+    static CORBA::PolicyManager_ptr tao_duplicate (
         CORBA::PolicyManager_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::PolicyManager_ptr
       );
-    static CORBA::PolicyManager_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::PolicyManager_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::PolicyManager_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -649,18 +648,18 @@ namespace TAO
 
 #if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
 #define _CORBA_POLICYCURRENT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::PolicyCurrent>
   {
-    static CORBA::PolicyCurrent_ptr duplicate (
+    static CORBA::PolicyCurrent_ptr tao_duplicate (
         CORBA::PolicyCurrent_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::PolicyCurrent_ptr
       );
-    static CORBA::PolicyCurrent_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::PolicyCurrent_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::PolicyCurrent_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -742,3 +741,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp
index 2fc7b7da091..a4c6e2259a0 100644
--- a/TAO/tao/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PolicyFactory_Registry.cpp
@@ -1,9 +1,6 @@
 #include "PolicyFactory_Registry.h"
 #include "PortableInterceptorC.h"
 #include "ORB_Constants.h"
-#include "SystemException.h"
-#include "PolicyC.h"
-
 
 ACE_RCSID (tao,
            PolicyFactory_Registry,
@@ -39,7 +36,7 @@ TAO_PolicyFactory_Registry::register_policy_factory (
     {
       ACE_THROW (CORBA::BAD_PARAM (
                    CORBA::SystemException::_tao_minor_code (
-                     0,
+                     TAO_DEFAULT_MINOR_CODE,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl
index 3b8ca403c1c..96c9e2e1bec 100644
--- a/TAO/tao/Policy_Forward.pidl
+++ b/TAO/tao/Policy_Forward.pidl
@@ -1,5 +1,3 @@
-// -*- IDL -*-
-
 /**
  * @file Policy_Forward.pidl
  *
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
index 0a4aca61ee6..c6d45c86850 100644
--- a/TAO/tao/Policy_ForwardA.cpp
+++ b/TAO/tao/Policy_ForwardA.cpp
@@ -26,7 +26,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Policy_ForwardC.h"
-#include "tao/SystemException.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
@@ -418,3 +417,4 @@ CORBA::Boolean operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 11609fa1252..5b41eace926 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -50,7 +50,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_POLICYLIST_CS_)
@@ -106,7 +106,7 @@ void CORBA::PolicyList::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_POLICYTYPESEQ_CS_)
@@ -171,23 +171,23 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::Policy>::marshal (
+            TAO::Objref_Traits<CORBA::Policy>::tao_marshal (
                 _tao_sequence[i].in (), strm
               );
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -197,7 +197,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -207,28 +207,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
@@ -246,13 +246,13 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+  
   return 0;
 }
 
@@ -262,7 +262,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -272,21 +272,21 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+    
     }
-
+  
   return 0;
 }
 
@@ -305,12 +305,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -443,4 +443,5 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum
         CORBA::PolicyType \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 516e4a032d9..ff979fc2b4d 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -73,33 +73,33 @@
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::ULong PolicyType;
   typedef CORBA::ULong_out PolicyType_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
-
+  
   class Policy;
   typedef Policy *Policy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Policy
       >
     Policy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Policy
@@ -107,15 +107,15 @@ namespace CORBA
     Policy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_POLICYLIST_CH_)
 #define _CORBA_POLICYLIST_CH_
-
+  
   class PolicyList;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         PolicyList,
@@ -125,7 +125,7 @@ namespace CORBA
           >
       >
     PolicyList_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         PolicyList,
@@ -136,7 +136,7 @@ namespace CORBA
           >
       >
     PolicyList_out;
-
+  
   class TAO_Export PolicyList
     : public
         TAO_Unbounded_Object_Sequence<
@@ -150,39 +150,39 @@ namespace CORBA
     PolicyList (
         CORBA::ULong max,
         CORBA::ULong length,
-        Policy_ptr* buffer,
+        Policy_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     PolicyList (const PolicyList &);
     ~PolicyList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef PolicyList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
 #define _CORBA_POLICYTYPESEQ_CH_
-
+  
   class PolicyTypeSeq;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         PolicyTypeSeq,
         PolicyType
       >
     PolicyTypeSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         PolicyTypeSeq,
@@ -190,7 +190,7 @@ namespace CORBA
         PolicyType
       >
     PolicyTypeSeq_out;
-
+  
   class TAO_Export PolicyTypeSeq
     : public
         TAO_Unbounded_Sequence<
@@ -203,38 +203,38 @@ namespace CORBA
     PolicyTypeSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::ULong* buffer,
+        CORBA::ULong* buffer, 
         CORBA::Boolean release = 0
       );
     PolicyTypeSeq (const PolicyTypeSeq &);
     ~PolicyTypeSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef PolicyTypeSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum SetOverrideType
   {
     SET_OVERRIDE,
     ADD_OVERRIDE
   };
-
+  
   typedef SetOverrideType &SetOverrideType_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType;
 
 // TAO_IDL - Generated from
@@ -251,18 +251,18 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__TRAITS_CH_)
 #define _CORBA_POLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::Policy>
   {
-    static CORBA::Policy_ptr duplicate (
+    static CORBA::Policy_ptr tao_duplicate (
         CORBA::Policy_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::Policy_ptr
       );
-    static CORBA::Policy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::Policy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::Policy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -365,3 +365,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index 518901ec37d..0881e7ea41b 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -2,7 +2,6 @@
 
 #include "Policy_Set.h"
 #include "Environment.h"
-#include "SystemException.h"
 #include "debug.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index d54cbf9e7f9..6bd0220847c 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -49,7 +49,7 @@ public:
   /// Destructor
   ~TAO_Policy_Set (void);
 
-  /// Copy the state from @a source, it uses the copy() operator to
+  /// Copy the state from <source>, it uses the copy() operator to
   /// obtain independent copies of all the policies.
   void copy_from (TAO_Policy_Set* source
                   ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index acd5203ec22..1269caa0d2a 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -30,7 +30,6 @@
 
 
 #include "PollableC.h"
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -58,7 +57,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Pollable_ptr
-TAO::Objref_Traits<CORBA::Pollable>::duplicate (
+TAO::Objref_Traits<CORBA::Pollable>::tao_duplicate (
     CORBA::Pollable_ptr p
   )
 {
@@ -67,7 +66,7 @@ TAO::Objref_Traits<CORBA::Pollable>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::Pollable>::release (
+TAO::Objref_Traits<CORBA::Pollable>::tao_release (
     CORBA::Pollable_ptr p
   )
 {
@@ -76,14 +75,14 @@ TAO::Objref_Traits<CORBA::Pollable>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Pollable_ptr
-TAO::Objref_Traits<CORBA::Pollable>::nil (void)
+TAO::Objref_Traits<CORBA::Pollable>::tao_nil (void)
 {
   return CORBA::Pollable::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::Pollable>::marshal (
+TAO::Objref_Traits<CORBA::Pollable>::tao_marshal (
     CORBA::Pollable_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -92,7 +91,7 @@ TAO::Objref_Traits<CORBA::Pollable>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_Pollable_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -113,10 +112,10 @@ CORBA::Pollable::_narrow (
     {
       return Pollable::_nil ();
     }
-
+  
   Pollable_ptr proxy =
     dynamic_cast<Pollable_ptr> (_tao_objref);
-
+  
   return Pollable::_duplicate (proxy);
 }
 
@@ -130,10 +129,10 @@ CORBA::Pollable::_unchecked_narrow (
     {
       return Pollable::_nil ();
     }
-
+  
   Pollable_ptr proxy =
     dynamic_cast<Pollable_ptr> (_tao_objref);
-
+  
   return Pollable::_duplicate (proxy);
 }
 
@@ -144,7 +143,7 @@ CORBA::Pollable::_duplicate (Pollable_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -195,7 +194,7 @@ CORBA::Pollable::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::DIIPollable_ptr
-TAO::Objref_Traits<CORBA::DIIPollable>::duplicate (
+TAO::Objref_Traits<CORBA::DIIPollable>::tao_duplicate (
     CORBA::DIIPollable_ptr p
   )
 {
@@ -204,7 +203,7 @@ TAO::Objref_Traits<CORBA::DIIPollable>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::DIIPollable>::release (
+TAO::Objref_Traits<CORBA::DIIPollable>::tao_release (
     CORBA::DIIPollable_ptr p
   )
 {
@@ -213,14 +212,14 @@ TAO::Objref_Traits<CORBA::DIIPollable>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::DIIPollable_ptr
-TAO::Objref_Traits<CORBA::DIIPollable>::nil (void)
+TAO::Objref_Traits<CORBA::DIIPollable>::tao_nil (void)
 {
   return CORBA::DIIPollable::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::DIIPollable>::marshal (
+TAO::Objref_Traits<CORBA::DIIPollable>::tao_marshal (
     CORBA::DIIPollable_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -229,7 +228,7 @@ TAO::Objref_Traits<CORBA::DIIPollable>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_DIIPollable_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -250,10 +249,10 @@ CORBA::DIIPollable::_narrow (
     {
       return DIIPollable::_nil ();
     }
-
+  
   DIIPollable_ptr proxy =
     dynamic_cast<DIIPollable_ptr> (_tao_objref);
-
+  
   return DIIPollable::_duplicate (proxy);
 }
 
@@ -267,10 +266,10 @@ CORBA::DIIPollable::_unchecked_narrow (
     {
       return DIIPollable::_nil ();
     }
-
+  
   DIIPollable_ptr proxy =
     dynamic_cast<DIIPollable_ptr> (_tao_objref);
-
+  
   return DIIPollable::_duplicate (proxy);
 }
 
@@ -281,7 +280,7 @@ CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -336,7 +335,7 @@ CORBA::DIIPollable::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::PollableSet_ptr
-TAO::Objref_Traits<CORBA::PollableSet>::duplicate (
+TAO::Objref_Traits<CORBA::PollableSet>::tao_duplicate (
     CORBA::PollableSet_ptr p
   )
 {
@@ -345,7 +344,7 @@ TAO::Objref_Traits<CORBA::PollableSet>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::PollableSet>::release (
+TAO::Objref_Traits<CORBA::PollableSet>::tao_release (
     CORBA::PollableSet_ptr p
   )
 {
@@ -354,14 +353,14 @@ TAO::Objref_Traits<CORBA::PollableSet>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::PollableSet_ptr
-TAO::Objref_Traits<CORBA::PollableSet>::nil (void)
+TAO::Objref_Traits<CORBA::PollableSet>::tao_nil (void)
 {
   return CORBA::PollableSet::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::PollableSet>::marshal (
+TAO::Objref_Traits<CORBA::PollableSet>::tao_marshal (
     CORBA::PollableSet_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -370,12 +369,12 @@ TAO::Objref_Traits<CORBA::PollableSet>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_PollableSet_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
@@ -460,7 +459,7 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode (
 
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
@@ -561,10 +560,10 @@ CORBA::PollableSet::_narrow (
     {
       return PollableSet::_nil ();
     }
-
+  
   PollableSet_ptr proxy =
     dynamic_cast<PollableSet_ptr> (_tao_objref);
-
+  
   return PollableSet::_duplicate (proxy);
 }
 
@@ -578,10 +577,10 @@ CORBA::PollableSet::_unchecked_narrow (
     {
       return PollableSet::_nil ();
     }
-
+  
   PollableSet_ptr proxy =
     dynamic_cast<PollableSet_ptr> (_tao_objref);
-
+  
   return PollableSet::_duplicate (proxy);
 }
 
@@ -592,7 +591,7 @@ CORBA::PollableSet::_duplicate (PollableSet_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -650,7 +649,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         CORBA::PollableSet
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::PollableSet
@@ -665,7 +664,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         CORBA::Pollable
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::Pollable
@@ -680,7 +679,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         CORBA::DIIPollable
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::DIIPollable
@@ -697,7 +696,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         CORBA::PollableSet
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::PollableSet
@@ -712,7 +711,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         CORBA::Pollable
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::Pollable
@@ -727,10 +726,11 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         CORBA::DIIPollable
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::DIIPollable
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index cf49db5e05d..1b6f8da199a 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -33,15 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/UserException.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
@@ -68,13 +67,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -84,22 +83,22 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_POLLABLESET__VAR_OUT_CH_)
 #define _CORBA_POLLABLESET__VAR_OUT_CH_
-
+  
   class PollableSet;
   typedef PollableSet *PollableSet_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PollableSet
       >
     PollableSet_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PollableSet
@@ -107,22 +106,22 @@ namespace CORBA
     PollableSet_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_POLLABLE__VAR_OUT_CH_)
 #define _CORBA_POLLABLE__VAR_OUT_CH_
-
+  
   class Pollable;
   typedef Pollable *Pollable_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Pollable
       >
     Pollable_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Pollable
@@ -130,43 +129,43 @@ namespace CORBA
     Pollable_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLLABLE_CH_)
 #define _CORBA_POLLABLE_CH_
-
+  
   class TAO_Export Pollable
     : public virtual CORBA::Object
   {
   public:
     typedef Pollable_ptr _ptr_type;
     typedef Pollable_var _var_type;
-
+    
     // The static operations.
     static Pollable_ptr _duplicate (Pollable_ptr obj);
-
+    
     static Pollable_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Pollable_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Pollable_ptr _nil (void)
     {
       return (Pollable_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean is_ready (
         CORBA::ULong timeout
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -174,58 +173,58 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::PollableSet_ptr create_pollable_set (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Pollable (void);
-
+    
     virtual ~Pollable (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Pollable (const Pollable &);
-
+    
     void operator= (const Pollable &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_DIIPOLLABLE__VAR_OUT_CH_)
 #define _CORBA_DIIPOLLABLE__VAR_OUT_CH_
-
+  
   class DIIPollable;
   typedef DIIPollable *DIIPollable_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         DIIPollable
       >
     DIIPollable_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         DIIPollable
@@ -233,115 +232,115 @@ namespace CORBA
     DIIPollable_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_DIIPOLLABLE_CH_)
 #define _CORBA_DIIPOLLABLE_CH_
-
+  
   class TAO_Export DIIPollable
     : public virtual CORBA::Pollable
   {
   public:
     typedef DIIPollable_ptr _ptr_type;
     typedef DIIPollable_var _var_type;
-
+    
     // The static operations.
     static DIIPollable_ptr _duplicate (DIIPollable_ptr obj);
-
+    
     static DIIPollable_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static DIIPollable_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static DIIPollable_ptr _nil (void)
     {
       return (DIIPollable_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     DIIPollable (void);
-
+    
     virtual ~DIIPollable (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     DIIPollable (const DIIPollable &);
-
+    
     void operator= (const DIIPollable &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLLABLESET_CH_)
 #define _CORBA_POLLABLESET_CH_
-
+  
   class TAO_Export PollableSet
     : public virtual CORBA::Object
   {
   public:
     typedef PollableSet_ptr _ptr_type;
     typedef PollableSet_var _var_type;
-
+    
     // The static operations.
     static PollableSet_ptr _duplicate (PollableSet_ptr obj);
-
+    
     static PollableSet_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PollableSet_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PollableSet_ptr _nil (void)
     {
       return (PollableSet_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_
-
+    
     class TAO_Export NoPossiblePollable : public CORBA::UserException
     {
     public:
-
+      
       NoPossiblePollable (void);
       NoPossiblePollable (const NoPossiblePollable &);
       ~NoPossiblePollable (void);
 
       NoPossiblePollable &operator= (const NoPossiblePollable &);
-
+      
       static NoPossiblePollable *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -353,34 +352,34 @@ namespace CORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:125
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_
-
+    
     class TAO_Export UnknownPollable : public CORBA::UserException
     {
     public:
-
+      
       UnknownPollable (void);
       UnknownPollable (const UnknownPollable &);
       ~UnknownPollable (void);
 
       UnknownPollable &operator= (const UnknownPollable &);
-
+      
       static UnknownPollable *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -392,31 +391,31 @@ namespace CORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:125
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::DIIPollable_ptr create_dii_pollable (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_pollable (
         CORBA::Pollable_ptr potential
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -424,10 +423,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Pollable_ptr poll (
         CORBA::ULong timeout
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -436,10 +435,10 @@ namespace CORBA
         CORBA::SystemException
         , CORBA::PollableSet::NoPossiblePollable
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void remove (
         CORBA::Pollable_ptr potential
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -448,38 +447,38 @@ namespace CORBA
         CORBA::SystemException
         , CORBA::PollableSet::UnknownPollable
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::UShort number_left (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PollableSet (void);
-
+    
     virtual ~PollableSet (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PollableSet (const PollableSet &);
-
+    
     void operator= (const PollableSet &);
   };
 
@@ -499,18 +498,18 @@ namespace TAO
 
 #if !defined (_CORBA_POLLABLESET__TRAITS_CH_)
 #define _CORBA_POLLABLESET__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::PollableSet>
   {
-    static CORBA::PollableSet_ptr duplicate (
+    static CORBA::PollableSet_ptr tao_duplicate (
         CORBA::PollableSet_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::PollableSet_ptr
       );
-    static CORBA::PollableSet_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::PollableSet_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::PollableSet_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -520,18 +519,18 @@ namespace TAO
 
 #if !defined (_CORBA_POLLABLE__TRAITS_CH_)
 #define _CORBA_POLLABLE__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::Pollable>
   {
-    static CORBA::Pollable_ptr duplicate (
+    static CORBA::Pollable_ptr tao_duplicate (
         CORBA::Pollable_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::Pollable_ptr
       );
-    static CORBA::Pollable_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::Pollable_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::Pollable_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -541,18 +540,18 @@ namespace TAO
 
 #if !defined (_CORBA_DIIPOLLABLE__TRAITS_CH_)
 #define _CORBA_DIIPOLLABLE__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::DIIPollable>
   {
-    static CORBA::DIIPollable_ptr duplicate (
+    static CORBA::DIIPollable_ptr tao_duplicate (
         CORBA::DIIPollable_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::DIIPollable_ptr
       );
-    static CORBA::DIIPollable_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::DIIPollable_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::DIIPollable_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -579,3 +578,4 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 9a7d5978800..61dbfdcba82 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -49,12 +49,6 @@ module PortableInterceptor {
 
   typeprefix PortableInterceptor "omg.org";
 
-  const AdapterState    HOLDING         = 0;
-  const AdapterState    ACTIVE          = 1;
-  const AdapterState    DISCARDING      = 2;
-  const AdapterState    INACTIVE        = 3;
-  const AdapterState    NON_EXISTENT    = 4;
-
   local interface Interceptor
   {
     readonly attribute string name;
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 7b515073623..6a2fd23f1b9 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -32,8 +32,6 @@
 #include "PortableInterceptorC.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.h"
-#include "tao/PolicyC.h"
-#include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -60,7 +58,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::Interceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::Interceptor>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_duplicate (
     PortableInterceptor::Interceptor_ptr p
   )
 {
@@ -69,7 +67,7 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::Interceptor>::release (
+TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_release (
     PortableInterceptor::Interceptor_ptr p
   )
 {
@@ -78,14 +76,14 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::Interceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::Interceptor>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_nil (void)
 {
   return PortableInterceptor::Interceptor::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::Interceptor>::marshal (
+TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_marshal (
     PortableInterceptor::Interceptor_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -583,7 +581,7 @@ CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::Current_ptr
-TAO::Objref_Traits<PortableInterceptor::Current>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::Current>::tao_duplicate (
     PortableInterceptor::Current_ptr p
   )
 {
@@ -592,7 +590,7 @@ TAO::Objref_Traits<PortableInterceptor::Current>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::Current>::release (
+TAO::Objref_Traits<PortableInterceptor::Current>::tao_release (
     PortableInterceptor::Current_ptr p
   )
 {
@@ -601,14 +599,14 @@ TAO::Objref_Traits<PortableInterceptor::Current>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::Current_ptr
-TAO::Objref_Traits<PortableInterceptor::Current>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::Current>::tao_nil (void)
 {
   return PortableInterceptor::Current::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::Current>::marshal (
+TAO::Objref_Traits<PortableInterceptor::Current>::tao_marshal (
     PortableInterceptor::Current_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -732,7 +730,7 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::RequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_duplicate (
     PortableInterceptor::RequestInfo_ptr p
   )
 {
@@ -741,7 +739,7 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release (
+TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_release (
     PortableInterceptor::RequestInfo_ptr p
   )
 {
@@ -750,14 +748,14 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::RequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_nil (void)
 {
   return PortableInterceptor::RequestInfo::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal (
+TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_marshal (
     PortableInterceptor::RequestInfo_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -877,7 +875,7 @@ PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ClientRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_duplicate (
     PortableInterceptor::ClientRequestInfo_ptr p
   )
 {
@@ -886,7 +884,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release (
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_release (
     PortableInterceptor::ClientRequestInfo_ptr p
   )
 {
@@ -895,14 +893,14 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ClientRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_nil (void)
 {
   return PortableInterceptor::ClientRequestInfo::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal (
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_marshal (
     PortableInterceptor::ClientRequestInfo_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1026,7 +1024,7 @@ PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ServerRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_duplicate (
     PortableInterceptor::ServerRequestInfo_ptr p
   )
 {
@@ -1035,7 +1033,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release (
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_release (
     PortableInterceptor::ServerRequestInfo_ptr p
   )
 {
@@ -1044,14 +1042,14 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ServerRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_nil (void)
 {
   return PortableInterceptor::ServerRequestInfo::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal (
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_marshal (
     PortableInterceptor::ServerRequestInfo_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1175,7 +1173,7 @@ PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ClientRequestInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_duplicate (
     PortableInterceptor::ClientRequestInterceptor_ptr p
   )
 {
@@ -1184,7 +1182,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release (
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_release (
     PortableInterceptor::ClientRequestInterceptor_ptr p
   )
 {
@@ -1193,14 +1191,14 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ClientRequestInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_nil (void)
 {
   return PortableInterceptor::ClientRequestInterceptor::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::marshal (
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_marshal (
     PortableInterceptor::ClientRequestInterceptor_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1324,7 +1322,7 @@ PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ServerRequestInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_duplicate (
     PortableInterceptor::ServerRequestInterceptor_ptr p
   )
 {
@@ -1333,7 +1331,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release (
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_release (
     PortableInterceptor::ServerRequestInterceptor_ptr p
   )
 {
@@ -1342,14 +1340,14 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ServerRequestInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_nil (void)
 {
   return PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal (
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_marshal (
     PortableInterceptor::ServerRequestInterceptor_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1484,7 +1482,7 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::PolicyFactory_ptr
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_duplicate (
     PortableInterceptor::PolicyFactory_ptr p
   )
 {
@@ -1493,7 +1491,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release (
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_release (
     PortableInterceptor::PolicyFactory_ptr p
   )
 {
@@ -1502,14 +1500,14 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::PolicyFactory_ptr
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_nil (void)
 {
   return PortableInterceptor::PolicyFactory::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal (
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_marshal (
     PortableInterceptor::PolicyFactory_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1629,7 +1627,7 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ORBInitInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_duplicate (
     PortableInterceptor::ORBInitInfo_ptr p
   )
 {
@@ -1638,7 +1636,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release (
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_release (
     PortableInterceptor::ORBInitInfo_ptr p
   )
 {
@@ -1647,14 +1645,14 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ORBInitInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_nil (void)
 {
   return PortableInterceptor::ORBInitInfo::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal (
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_marshal (
     PortableInterceptor::ORBInitInfo_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2070,7 +2068,7 @@ PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ORBInitializer_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate (
+TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_duplicate (
     PortableInterceptor::ORBInitializer_ptr p
   )
 {
@@ -2079,7 +2077,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release (
+TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_release (
     PortableInterceptor::ORBInitializer_ptr p
   )
 {
@@ -2088,14 +2086,14 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::ORBInitializer_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_nil (void)
 {
   return PortableInterceptor::ORBInitializer::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal (
+TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_marshal (
     PortableInterceptor::ORBInitializer_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 98d3b4e9bdb..677abef7e62 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -46,8 +46,7 @@
 #include "PI_ForwardC.h"
 #include "tao/Messaging_SyncScopeC.h"
 #include "tao/IOP_CodecC.h"
-#include "tao/PolicyC.h"
-#include "tao/CurrentC.h"
+#include "tao/Policy_ForwardC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -99,31 +98,6 @@ namespace PortableInterceptor
 {
 
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
-  const PortableInterceptor::AdapterState HOLDING = 0;
-
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
-  const PortableInterceptor::AdapterState ACTIVE = 1;
-
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
-  const PortableInterceptor::AdapterState DISCARDING = 2;
-
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
-  const PortableInterceptor::AdapterState INACTIVE = 3;
-
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
-  const PortableInterceptor::AdapterState NON_EXISTENT = 4;
-
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_)
@@ -2004,14 +1978,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::Interceptor>
   {
-    static PortableInterceptor::Interceptor_ptr duplicate (
+    static PortableInterceptor::Interceptor_ptr tao_duplicate (
         PortableInterceptor::Interceptor_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::Interceptor_ptr
       );
-    static PortableInterceptor::Interceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::Interceptor_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::Interceptor_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2025,14 +1999,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::Current>
   {
-    static PortableInterceptor::Current_ptr duplicate (
+    static PortableInterceptor::Current_ptr tao_duplicate (
         PortableInterceptor::Current_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::Current_ptr
       );
-    static PortableInterceptor::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::Current_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::Current_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2046,14 +2020,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::RequestInfo>
   {
-    static PortableInterceptor::RequestInfo_ptr duplicate (
+    static PortableInterceptor::RequestInfo_ptr tao_duplicate (
         PortableInterceptor::RequestInfo_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::RequestInfo_ptr
       );
-    static PortableInterceptor::RequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::RequestInfo_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::RequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2067,14 +2041,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInfo>
   {
-    static PortableInterceptor::ClientRequestInfo_ptr duplicate (
+    static PortableInterceptor::ClientRequestInfo_ptr tao_duplicate (
         PortableInterceptor::ClientRequestInfo_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::ClientRequestInfo_ptr
       );
-    static PortableInterceptor::ClientRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::ClientRequestInfo_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::ClientRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2088,14 +2062,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInfo>
   {
-    static PortableInterceptor::ServerRequestInfo_ptr duplicate (
+    static PortableInterceptor::ServerRequestInfo_ptr tao_duplicate (
         PortableInterceptor::ServerRequestInfo_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::ServerRequestInfo_ptr
       );
-    static PortableInterceptor::ServerRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::ServerRequestInfo_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::ServerRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2109,14 +2083,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInterceptor>
   {
-    static PortableInterceptor::ClientRequestInterceptor_ptr duplicate (
+    static PortableInterceptor::ClientRequestInterceptor_ptr tao_duplicate (
         PortableInterceptor::ClientRequestInterceptor_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::ClientRequestInterceptor_ptr
       );
-    static PortableInterceptor::ClientRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::ClientRequestInterceptor_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::ClientRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2130,14 +2104,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInterceptor>
   {
-    static PortableInterceptor::ServerRequestInterceptor_ptr duplicate (
+    static PortableInterceptor::ServerRequestInterceptor_ptr tao_duplicate (
         PortableInterceptor::ServerRequestInterceptor_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::ServerRequestInterceptor_ptr
       );
-    static PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::ServerRequestInterceptor_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::ServerRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2151,14 +2125,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::PolicyFactory>
   {
-    static PortableInterceptor::PolicyFactory_ptr duplicate (
+    static PortableInterceptor::PolicyFactory_ptr tao_duplicate (
         PortableInterceptor::PolicyFactory_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::PolicyFactory_ptr
       );
-    static PortableInterceptor::PolicyFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::PolicyFactory_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::PolicyFactory_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2172,14 +2146,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitInfo>
   {
-    static PortableInterceptor::ORBInitInfo_ptr duplicate (
+    static PortableInterceptor::ORBInitInfo_ptr tao_duplicate (
         PortableInterceptor::ORBInitInfo_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::ORBInitInfo_ptr
       );
-    static PortableInterceptor::ORBInitInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::ORBInitInfo_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::ORBInitInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -2193,14 +2167,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitializer>
   {
-    static PortableInterceptor::ORBInitializer_ptr duplicate (
+    static PortableInterceptor::ORBInitializer_ptr tao_duplicate (
         PortableInterceptor::ORBInitializer_ptr
       );
-    static void release (
+    static void tao_release (
         PortableInterceptor::ORBInitializer_ptr
       );
-    static PortableInterceptor::ORBInitializer_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableInterceptor::ORBInitializer_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableInterceptor::ORBInitializer_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
index a007761a246..06239a7fdc0 100644
--- a/TAO/tao/PortableServer.mpc
+++ b/TAO/tao/PortableServer.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, objreftemplate, iorinterceptor {
   sharedname   = TAO_PortableServer
   dynamicflags = TAO_PORTABLESERVER_BUILD_DLL
 
@@ -22,8 +22,4 @@ project : taolib, core {
   Resource_Files {
     PortableServer
   }
-
-  PIDL_Files {
-    PortableServer
-  }
 }
diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.cpp b/TAO/tao/PortableServer/AMH_Response_Handler.cpp
new file mode 100644
index 00000000000..b22c6deee0a
--- /dev/null
+++ b/TAO/tao/PortableServer/AMH_Response_Handler.cpp
@@ -0,0 +1,273 @@
+// $Id$
+
+#include "AMH_Response_Handler.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/Transport.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORB.h"
+#include "tao/Pluggable_Messaging.h"
+#include "tao/Pluggable_Messaging_Utils.h"
+#include "tao/GIOP_Utils.h"
+#include "tao/debug.h"
+#include "tao/Buffer_Allocator_T.h"
+#include "ace/Copy_Disabled.h"
+
+TAO_AMH_Response_Handler::TAO_AMH_Response_Handler ()
+  : mesg_base_ (0)
+  , request_id_ (0)
+  , transport_ (0)
+  , orb_core_ (0)
+  , argument_flag_ (1)
+  , exception_type_ (TAO_GIOP_NO_EXCEPTION)
+  , reply_status_ (TAO_RS_UNINITIALIZED)
+  , allocator_ (0)
+{
+}
+
+TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void)
+{
+  this->transport_->remove_reference ();
+
+  // Since we are destroying the object we put a huge lock around the
+  // whole destruction process (just paranoid).
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+
+    if (this->response_expected_ == 0) //oneway ?
+      {
+        return;
+      }
+
+    // If the ResponseHandler is being destroyed before a reply has
+    // been sent to the client, we send a system exception
+    // CORBA::NO_RESPONSE, with minor code to indicate the problem.
+    if (this->reply_status_ == TAO_RS_SENT)
+      {
+        return;
+      }
+
+    // If sending the exception to the client fails, then we just give
+    // up, release the transport and return.
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
+      {
+        CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code
+                               (TAO_AMH_REPLY_LOCATION_CODE,
+                                EFAULT),
+                               CORBA::COMPLETED_NO);
+        this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHALL
+      {
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+  }
+}
+
+void
+TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request,
+                               TAO_AMH_BUFFER_ALLOCATOR* allocator)
+{
+  mesg_base_ = server_request.mesg_base_;
+  request_id_ = server_request.request_id_;
+  response_expected_  = server_request.response_expected_;
+  transport_ = server_request.transport ();
+  orb_core_ = server_request.orb_core ();
+  allocator_ = allocator;
+
+  this->transport_->add_reference ();
+}
+
+void
+TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL)
+{
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+    if (this->reply_status_ != TAO_RS_UNINITIALIZED)
+      {
+        // Looks like someone is trying to call an AMH method
+        // more than once
+        //
+        // We assume that the servant has already processed the
+        // request and is now trying to send back the reply.  Hence we
+        // say that the operation has completed but let the server
+        // anyway that it is not doing something right.
+        ACE_THROW (CORBA::BAD_INV_ORDER
+                          (CORBA::SystemException::_tao_minor_code
+                                  (TAO_AMH_REPLY_LOCATION_CODE,
+                                   EEXIST),
+                           CORBA::COMPLETED_YES));
+      }
+  }
+
+  // Construct our reply generator.
+  TAO_Pluggable_Reply_Params_Base reply_params;
+  reply_params.request_id_ = this->request_id_;
+  reply_params.service_context_notowned (&(this->reply_service_context_.service_info ()));
+  reply_params.argument_flag_ = this->argument_flag_;
+
+  if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION)
+    {
+      reply_params.reply_status_ = TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION;
+    }
+  else
+    {
+      reply_params.reply_status_ = this->exception_type_;
+    }
+
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+
+    this->mesg_base_->generate_reply_header (this->_tao_out,
+                                             reply_params);
+
+    // We are done initialising the reply
+    this->reply_status_ = TAO_RS_INITIALIZED;
+  }
+
+}
+
+void
+TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL)
+{
+
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+
+    // If the reply has not been initialised, raise an exception to the
+    // server-app saying it is not doing something right.
+    if (this->reply_status_ != TAO_RS_INITIALIZED)
+      {
+        ACE_THROW (CORBA::BAD_INV_ORDER (
+                          CORBA::SystemException::_tao_minor_code (
+                                                  TAO_AMH_REPLY_LOCATION_CODE,
+                                                  ENOTSUP),
+                          CORBA::COMPLETED_YES));
+      }
+    this->reply_status_ = TAO_RS_SENDING;
+  }
+
+  // Send the message.
+  int result = this->transport_->send_message (this->_tao_out,
+                                               0,
+                                               TAO_Transport::TAO_REPLY);
+
+  if (result == -1)
+    {
+      if (TAO_debug_level > 0)
+        {
+          // No exception but some kind of error, yet a response
+          // is required.
+          ACE_ERROR ((
+                      LM_ERROR,
+                      ACE_TEXT ("TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n"),
+                      ACE_TEXT ("TAO_AMH_Response_Handler::_tao_rh_send_reply")
+                      ));
+        }
+    }
+
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+    this->reply_status_ = TAO_RS_SENT;
+  }
+}
+
+void
+TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex
+                                                  ACE_ENV_ARG_DECL)
+{
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+    if (this->reply_status_ != TAO_RS_UNINITIALIZED)
+      {
+        ACE_THROW (CORBA::BAD_INV_ORDER (
+                                         CORBA::SystemException::_tao_minor_code (
+                                                                                  TAO_AMH_REPLY_LOCATION_CODE,
+                                                                                  ENOTSUP),
+                                         CORBA::COMPLETED_YES));
+      }
+    this->reply_status_ = TAO_RS_SENDING;
+  }
+
+  TAO_Pluggable_Reply_Params_Base reply_params;
+  reply_params.request_id_ = this->request_id_;
+  reply_params.svc_ctx_.length (0);
+  reply_params.service_context_notowned (&this->reply_service_context_.service_info ());
+  reply_params.argument_flag_ = 1;
+  reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION;
+  // @@ It appears as if there should be a more efficient way to do
+  //    this: the caller already knows this because it is part of the
+  //    ExceptionHolder information.
+  if (CORBA::SystemException::_downcast (&ex))
+    reply_params.reply_status_ = TAO_GIOP_SYSTEM_EXCEPTION;
+
+  if (this->mesg_base_->generate_exception_reply (this->_tao_out,
+                                                  reply_params,
+                                                  ex) == -1)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+
+  // Send the Exception
+  if (this->transport_->send_message (this->_tao_out,
+                                      0,
+                                      TAO_Transport::TAO_REPLY) == -1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("TAO: (%P|%t|%N|%l):  ")
+                  ACE_TEXT ("TAO_AMH_Response_Handler: could not send exception reply\n")));
+    }
+
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+    this->reply_status_ = TAO_RS_SENT;
+  }
+}
+
+void
+TAO_AMH_Response_Handler::_remove_ref (void)
+{
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX,
+               mon,
+               this->refcount_lock_);
+    
+    --this->refcount_;
+
+    if (this->refcount_ > 0)
+      return;
+  }
+
+  if (this->allocator_)
+    {
+      TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (allocator_);
+
+      allocator.release(this);
+    }
+  else
+    {
+      delete this;
+    }
+
+  return;
+}
+
+namespace TAO
+{
+  void
+  ARH_Refcount_Functor::operator () (
+      TAO_AMH_Response_Handler *arh)
+    ACE_THROW_SPEC (())
+  {
+    (void) arh->_remove_ref ();
+  }
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.h b/TAO/tao/PortableServer/AMH_Response_Handler.h
new file mode 100644
index 00000000000..cd94fbab058
--- /dev/null
+++ b/TAO/tao/PortableServer/AMH_Response_Handler.h
@@ -0,0 +1,216 @@
+// -*- C++ -*-
+
+// =========================================================================
+/**
+ *  @file   AMH_Response_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Mayur Deshpande <mayur@ics.uci.edu>
+ *
+ */
+// =========================================================================
+
+#ifndef TAO_AMH_RESPONSE_HANDLER_H
+#define TAO_AMH_RESPONSE_HANDLER_H
+
+#include "portableserver_export.h"
+
+#include "tao/Allocator.h"
+#include "tao/Service_Context.h"
+#include "tao/CDR.h"
+#include "tao/LocalObject.h"
+#include "tao/Buffer_Allocator_T.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class TAO_Transport;
+class TAO_Pluggable_Messaging;
+class TAO_Output_CDR;
+class TAO_ORB_Core;
+class TAO_ServerRequest;
+class ACE_Allocator;
+
+typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR;
+
+/**
+ * @class TAO_AMH_Response_Handler
+ *
+ * @brief Class representing an Asynchronous-Method-Handling (AMH)
+ * ResponseHandler (RH) object.
+ *
+ * Class encapsulates state required to send a response back to the
+ * client independent of the thread that originally created the state
+ * on the activation-record.  Thus the required state (copied from
+ * TAO_Server_Request) is 'stored' on the heap.
+ *
+ * One RH is created for every client request and the RH can be used
+ * only once i.e.,  the asynchronous method can be called only once.
+ * This class also encapsulates various initialisation and
+ * response-sending functionality that is common to all RHs (generated
+ * by the IDL compiler). Thus the IDL-compiler has to generate less
+ * code which in turn reduces the overall code size for an
+ * application.
+ */
+class TAO_PortableServer_Export TAO_AMH_Response_Handler
+// @@ Mayur, this is not the correct way to use
+//    TAO_LocalRefCounted_Object.  Application code is supposed to use
+//    it when necessary.  You're forcing applications to use a
+//    reference counted version of their AMH_Response_Handler.  This
+//    isn't consistent with the specified semantics detailed in the
+//    CCM spec.  Please remove this and place it where appropriate in
+//    your AMH tests and examples.
+  : virtual public TAO_Local_RefCounted_Object
+{
+public:
+
+  /// Constructor
+  TAO_AMH_Response_Handler ();
+
+  /// Destructor
+  /**
+   * Releases the transport and in case of an error, sends the appropriate
+   * exception back to the client
+   */
+  virtual ~TAO_AMH_Response_Handler (void);
+
+  /**
+   * Stores necessary information from a TAO_Server_Request onto the heap
+   */
+  virtual void init(TAO_ServerRequest &server_request,
+                    TAO_AMH_BUFFER_ALLOCATOR* allocator);
+
+  /// @name Mutators for refcount
+  //@{
+  virtual void _remove_ref (void);
+  //@}
+
+protected:
+
+  /// Sets up the various parameters in anticipation of returning a reply
+  /// to the client. return/OUT/INOUT arguments are marshalled into the
+  /// Output stream after this method has been called.
+  void _tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Sends the marshalled reply back to the client.
+  void _tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Send back an exception to the client.
+  void _tao_rh_send_exception (CORBA::Exception &ex
+                               ACE_ENV_ARG_DECL);
+
+protected:
+
+  /// The outgoing CDR stream
+  /**
+   * The IDL-generated ResponseHandler implementations used this field
+   * to marshal the response.
+   * Making it a field instead of a public accessor makes the code in
+   * the generated ResponseHandler implementation a lot more readable.
+   */
+  TAO_OutputCDR _tao_out;
+
+private:
+
+  // Private and undefined, standard C++ idiom to prohibit copying.
+  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&))
+  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&))
+
+private:
+  /// Pointer to the original message-base
+  TAO_Pluggable_Messaging *mesg_base_;
+
+  /// Copy of the request-id of the original Server-Request
+  CORBA::ULong request_id_;
+
+  CORBA::Boolean response_expected_;
+
+  /// Handle to transport through which the reply will be sent
+  /// Copy of transport in original Server_Request
+  TAO_Transport *transport_;
+
+  /// A pointer to the ORB Core for the context where the request was
+  /// created.
+  TAO_ORB_Core *orb_core_;
+
+  /// The reply service context
+  TAO_Service_Context reply_service_context_;
+
+  /// Alwyas set to true (we always have something to return to the
+  /// client
+  // @@ Mayur: I think not!  This is used to generate padding in GIOP
+  //    1.2 messages (where the payload must start on an 8-byte
+  //    boundary.  But some replys have no payload (only header), in
+  //    those cases you cannot insert the padding.  We need the
+  //    ResponseHandler to set this field correctly!
+  CORBA::Boolean argument_flag_;
+
+  //  TAO_GIOP_ReplyStatusType exception_type_;
+  /// Exception type (will be NO_EXCEPTION in the majority of the
+  /// cases).
+  // @@ Mayur: I do not think we need this one, we can deduce the type
+  //    of reply depending on the _tao_rh_*() method called.
+  CORBA::ULong exception_type_;
+
+  /**
+   * Various states the ResponseHandler can be in.
+   *
+   * These states represent various states the RH can be in and
+   * the states are used not only in implementing the 'once-only semantics of
+   * RHs, but in making sure well the call thread-safe as well.
+   */
+  enum Reply_Status
+    {
+      TAO_RS_UNINITIALIZED,
+      TAO_RS_INITIALIZED,
+      TAO_RS_SENDING,
+      TAO_RS_SENT
+    };
+  Reply_Status reply_status_;
+  // I would use the "state pattern"..
+  // Carlos, Isn't that an overkill?
+  // @@ Mayur: it depends on what form of the "State Pattern" you
+  //    use.  The more generic form, as described in GoF, uses a class
+  //    for each state, super-elegant but indeed a bit heavy handed.
+  //    The lighter-weight form (using a state variable
+
+  /// Mutex to ensure the AMH-RH method call is thread-safe.
+  ACE_SYNCH_MUTEX mutex_;
+
+  /// Allocator used to allocate this object. If zero then we are allocated
+  /// from the heap
+  TAO_AMH_BUFFER_ALLOCATOR* allocator_;
+};
+
+namespace TAO
+{
+  /**
+   * @class ARH_Refcount_Functor
+   *
+   * @brief Functor for refcounting of TAO_AMH_Response_Handler
+   *
+   * This is used to safely handle the destruction of
+   * TAO_AMH_Response_Handler objects which are created on the
+   * heap. We cannot use auto_ptr <> since it calls delete on the
+   * pointer, and calling delete on TAO_AMH_Response_Handler *
+   * will not work. Hence this functor will be used with Auto_Functor
+   * class to handle the memory safely.
+   *
+   * @todo Ideally, this class can be a generic class. But that
+   * requires quite a bit of cleanup within TAO to be more useful.
+   */
+  class TAO_PortableServer_Export ARH_Refcount_Functor
+  {
+  public:
+    void operator() (TAO_AMH_Response_Handler *arh)
+      ACE_THROW_SPEC (());
+  };
+
+}
+
+#endif /* TAO_AMH_RESPONSE_HANDLER_H */
diff --git a/TAO/tao/PortableServer/Default_ORT.pidl b/TAO/tao/PortableServer/Default_ORT.pidl
new file mode 100644
index 00000000000..0817f88a146
--- /dev/null
+++ b/TAO/tao/PortableServer/Default_ORT.pidl
@@ -0,0 +1,51 @@
+// -*- IDL -*-
+/**
+ * @file Default_ORT.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the TAO_Default_ORT module.
+ *
+ * This file is used to generate Default_ORTC.{h,i,cpp}, using the following
+ * command:
+ *
+ *   tao_idl.exe
+ *        -o orig -Ge 1 -GT -Sc
+ *        -I../..
+ *        -Wb,export_macro=TAO_PortableServer_Export \
+ *        -Wb,export_include="portableserver_export.h" \
+ *        -Wb,pre_include="ace/pre.h"
+ *        -Wb,post_include="ace/post.h"
+ *        Default_ORT.pidl
+ *
+ * and then:
+ *
+ * cp orig/Default_ORTC.{h,i,cpp} .
+ * patch < diffs/Default_ORT.diff
+ *
+ * The code left in Default_ORTC.{h,i,cpp} is
+ * ready for use.
+ *
+ *
+ * @note The diffs were generated using:
+ *
+ *   rm diffs/Default_ORT.diff
+ *   for i in Default_ORTC.{h,i,cpp}; do
+ *     diff -wub orig/$i $i >> diffs/Default_ORT.diff
+ *   done
+ */
+
+#ifndef TAO_DEFAULT_ORT_PIDL
+#define TAO_DEFAULT_ORT_PIDL
+
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
+
+module TAO_Default_ORT
+{
+  valuetype ObjectReferenceTemplate
+    : PortableInterceptor::ObjectReferenceTemplate
+  {
+  };
+};
+
+#endif /* TAO_DEFAULT_ORT_PIDL */
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
new file mode 100644
index 00000000000..030e2282cb1
--- /dev/null
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -0,0 +1,412 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:323
+
+
+#include "Default_ORTC.h"
+#include "tao/CDR.h"
+#include "tao/Valuetype/ValueFactory.h"
+#include "tao/Typecode.h"
+#include "tao/Any_Impl_T.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "Default_ORTC.i"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:64
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x44656661), 
+  ACE_NTOHL (0x756c745f), 
+  ACE_NTOHL (0x4f52542f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x6174653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0
+    24,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
+    0, // value modifier
+  CORBA::tk_null, // no stateful base valuetype
+
+0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate (
+    CORBA::tk_value,
+    sizeof (_oc_TAO_Default_ORT_ObjectReferenceTemplate),
+    (char *) &_oc_TAO_Default_ORT_ObjectReferenceTemplate,
+    0,
+    sizeof (TAO_Default_ORT::ObjectReferenceTemplate)
+  );
+
+namespace TAO_Default_ORT
+{
+  ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate =
+    &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+void
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_add_ref (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
+  )
+{
+  CORBA::add_ref (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+void
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_remove_ref (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
+  )
+{
+  CORBA::remove_ref (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+void
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_release (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
+  )
+{
+  CORBA::remove_ref (p);
+}
+
+TAO_Default_ORT::ObjectReferenceTemplate *
+TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
+{
+  if (v == 0)
+    {
+      return 0;
+    }
+  
+  return dynamic_cast< ::TAO_Default_ORT::ObjectReferenceTemplate * > (v);
+}
+
+const char *
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
+{
+  return this->_tao_obv_static_repository_id ();
+}
+
+void
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ObjectReferenceTemplate *_tao_tmp_pointer =
+    ACE_static_cast (
+        ObjectReferenceTemplate *,
+        _tao_void_pointer
+      );
+  CORBA::remove_ref (_tao_tmp_pointer);
+}
+
+CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR & strm)
+{
+  return this->_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (strm);
+}
+
+CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_InputCDR & strm)
+{
+  return this->_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (strm);
+}
+
+CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
+    TAO_InputCDR &strm,
+    ObjectReferenceTemplate *&new_object
+  )
+{
+  CORBA::ValueBase *base = 0;
+  CORBA::ValueFactory_var factory;
+  CORBA::Boolean retval =
+    CORBA::ValueBase::_tao_unmarshal_pre (
+        strm,
+        factory.out (),
+        base,
+        ObjectReferenceTemplate::_tao_obv_static_repository_id ()
+      );
+  
+  if (retval == 0)
+    {
+      return 0;
+    }
+  
+  if (factory.in () != 0)
+    {
+      base = factory->create_for_unmarshal ();
+      
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+      
+      retval = base->_tao_unmarshal_v (strm);
+      
+      if (retval == 0)
+        {
+          return 0;
+        }
+    }
+  
+  // Now base must be null or point to the unmarshaled object.
+  // Align the pointer to the right subobject.
+  new_object = ObjectReferenceTemplate::_downcast (base);
+  return retval;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
+
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
+{}
+
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+{}
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm)
+{
+  return _tao_marshal_state (strm);
+}
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &strm)
+{
+  return _tao_unmarshal_state (strm);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_cs.cpp:57
+
+
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value (
+    CORBA::ValueBase *&_tao_elem
+  ) const
+{
+  CORBA::add_ref (this->value_);
+  _tao_elem = this->value_;
+  return 1;
+}
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate *_tao_elem
+  )
+{
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate **_tao_elem
+  )
+{
+  TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::insert (
+      _tao_any,
+      TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
+      TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::extract (
+        _tao_any,
+        TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
+        TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+        _tao_elem
+      );
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_valuetype.cpp:490
+
+void
+CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
+{
+  if (vt != 0)
+    {
+      vt->_add_ref ();
+    }
+}
+
+void
+CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
+{
+  if (vt != 0)
+    {
+      vt->_remove_ref ();
+    }
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
+
+CORBA::Boolean
+operator<< (
+    TAO_OutputCDR &strm,
+    const TAO_Default_ORT::ObjectReferenceTemplate *_tao_valuetype
+  )
+{
+  return
+    CORBA::ValueBase::_tao_marshal (
+        strm,
+        ACE_const_cast (
+            TAO_Default_ORT::ObjectReferenceTemplate *,
+            _tao_valuetype
+          ),
+        (ptrdiff_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast
+      );
+}
+
+CORBA::Boolean
+operator>> (
+    TAO_InputCDR &strm,
+    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_valuetype
+  )
+{
+  return TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (strm, _tao_valuetype);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/marshal_cs.cpp:44
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &)
+{
+  return (
+      1
+    );
+}
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR &)
+{
+  return (
+    1
+  );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1628
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Value_Traits<
+        TAO_Default_ORT::ObjectReferenceTemplate
+      >;
+
+  template class
+    TAO_Value_Var_T<
+        TAO_Default_ORT::ObjectReferenceTemplate
+        
+      >;
+  
+  template class
+    TAO_Value_Out_T<
+        TAO_Default_ORT::ObjectReferenceTemplate
+        
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        TAO_Default_ORT::ObjectReferenceTemplate
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Value_Traits< \
+        TAO_Default_ORT::ObjectReferenceTemplate \
+      >
+
+# pragma instantiate \
+    TAO_Value_Var_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate \
+        
+      >
+  
+# pragma instantiate \
+    TAO_Value_Out_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate \
+        
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h
new file mode 100644
index 00000000000..5ec169a3ec4
--- /dev/null
+++ b/TAO/tao/PortableServer/Default_ORTC.h
@@ -0,0 +1,257 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:171
+
+#ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_
+#define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace TAO_Default_ORT
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_valuetype.cpp:527
+  
+  
+
+#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
+#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
+  
+  class ObjectReferenceTemplate;
+  typedef
+    TAO_Value_Var_T<
+        ObjectReferenceTemplate
+      >
+    ObjectReferenceTemplate_var;
+  
+  typedef
+    TAO_Value_Out_T<
+        ObjectReferenceTemplate
+      >
+    ObjectReferenceTemplate_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_ch.cpp:56
+
+#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
+#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
+  
+  class TAO_PortableServer_Export ObjectReferenceTemplate
+    : public virtual PortableInterceptor::ObjectReferenceTemplate
+  {
+  public:
+    typedef ObjectReferenceTemplate_var _var_type;
+    
+    static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
+    
+    // (TAO extensions or internals)
+    static CORBA::Boolean _tao_unmarshal (
+        TAO_InputCDR &,
+        ObjectReferenceTemplate *&
+      );
+    
+    virtual const char* _tao_obv_repository_id (void) const;
+    
+    static const char* _tao_obv_static_repository_id (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/valuetype_ch.cpp:250
+  
+  protected:
+    ObjectReferenceTemplate (void);
+    
+    virtual ~ObjectReferenceTemplate (void);
+    
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
+    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+    
+  private:
+    ObjectReferenceTemplate (const ObjectReferenceTemplate &);
+    void operator= (const ObjectReferenceTemplate &);
+    
+  protected:
+    virtual CORBA::Boolean
+    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0;
+    
+    virtual CORBA::Boolean
+    _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module TAO_Default_ORT
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/obv_module.cpp:55
+
+namespace OBV_TAO_Default_ORT
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
+
+#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
+#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
+  
+  // OBV_ class
+  class TAO_PortableServer_Export ObjectReferenceTemplate
+    : public virtual TAO_Default_ORT::ObjectReferenceTemplate
+  {
+  public:
+    
+  protected:
+    ObjectReferenceTemplate (void);
+    virtual ~ObjectReferenceTemplate (void);
+    
+  protected:
+    virtual CORBA::Boolean
+    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &);
+    
+    virtual CORBA::Boolean
+    _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
+    
+    CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &);
+    CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
+  
+  private:
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
+#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>
+  {
+    static void tao_add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+    static void tao_remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+    static void tao_release (TAO_Default_ORT::ObjectReferenceTemplate *);
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_ch.cpp:54
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&);
+
+// TAO_IDL - Generated from
+// be\be_valuetype.cpp:434
+
+namespace CORBA
+{
+  TAO_NAMESPACE_STORAGE_CLASS void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+  TAO_NAMESPACE_STORAGE_CLASS void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:978
+
+#if defined (__ACE_INLINE__)
+#include "Default_ORTC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/Default_ORTC.i b/TAO/tao/PortableServer/Default_ORTC.i
new file mode 100644
index 00000000000..dcda17bcba3
--- /dev/null
+++ b/TAO/tao/PortableServer/Default_ORTC.i
@@ -0,0 +1,45 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_valuetype/valuetype_ci.cpp:56
+
+ACE_INLINE
+TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
+{}
+
+ACE_INLINE
+TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+{}
+
+ACE_INLINE const char* 
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
+{
+  return "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0";
+}
+
diff --git a/TAO/tao/PortableServer/IORInfo.cpp b/TAO/tao/PortableServer/IORInfo.cpp
new file mode 100644
index 00000000000..df689cc906b
--- /dev/null
+++ b/TAO/tao/PortableServer/IORInfo.cpp
@@ -0,0 +1,210 @@
+#include "tao/PortableServer/IORInfo.h"
+#include "tao/PortableServer/POA.h"
+
+#include "tao/PolicyC.h"
+#include "tao/IOPC.h"
+#include "tao/ORB_Constants.h"
+
+
+ACE_RCSID (PortableServer,
+           IORInfo,
+           "$Id$")
+
+
+#if !defined (__ACE_INLINE__)
+# include "IORInfo.inl"
+#endif /* __ACE_INLINE__ */
+
+
+TAO_IORInfo::TAO_IORInfo (TAO_POA *poa)
+  : poa_ (poa),
+    components_established_ (0)
+{
+}
+
+TAO_IORInfo::~TAO_IORInfo (void)
+{
+}
+
+CORBA::Policy_ptr
+TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
+                                   ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+  TAO_POA_Policy_Set &policies =
+    this->poa_->policies ();
+
+  // @@ This brain damaged implementation exists due to the fact
+  //    neither TAO_POA nor TAO_POA_Policy_Set exposes any methods
+  //    useful for retrieving a given Policy in the POA's PolicyList.
+  //    So, I use the lame interfaces for now.
+  //          -Ossama
+  const CORBA::ULong num_policies = policies.num_policies ();
+  for (CORBA::ULong i = 0; i < num_policies; ++i)
+    {
+      // @@ This incurs at least two locks per loop iteration due
+      //    to the reference counting found within the policy
+      //    object reference!!!
+      CORBA::Policy_var policy = policies.get_policy_by_index (i);
+
+      CORBA::PolicyType ptype =
+        policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      if (ptype == type)
+        return policy._retn ();
+    }
+
+  // TODO: Now check the global ORB policies.
+  // ........
+
+  // No policy matching the given PolicyType was found.
+  ACE_THROW_RETURN (CORBA::INV_POLICY (CORBA::OMGVMCID | 3,
+                                       CORBA::COMPLETED_NO),
+                    CORBA::Policy::_nil ());
+}
+
+void
+TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
+                                ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (this->components_established_)
+    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                     CORBA::COMPLETED_NO));
+
+  // Add the given tagged component to all profiles.
+  this->poa_->save_ior_component (component
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_IORInfo::add_ior_component_to_profile (
+    const IOP::TaggedComponent &component,
+    IOP::ProfileId profile_id
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (this->components_established_)
+    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                     CORBA::COMPLETED_NO));
+
+  this->poa_->save_ior_component_and_profile_id (component,
+                                                 profile_id
+                                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+PortableInterceptor::AdapterManagerId
+TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return this->poa_->get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+PortableInterceptor::AdapterState
+TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableInterceptor::NON_EXISTENT);
+
+  return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+PortableInterceptor::ObjectReferenceTemplate *
+TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  // Return the Object Reference Template whenever an IOR Interceptor
+  // is invoked.  Its value is the template created for the adapter
+  // policies and the IOR Interceptor calls to add_ior_component and
+  // add_ior_component_to_profile.  It's a const value and its value
+  // never changes.
+  PortableInterceptor::ObjectReferenceTemplate *adapter_template =
+    this->poa_->get_adapter_template ();
+
+  if (adapter_template == 0)
+    {
+      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                              CORBA::COMPLETED_NO),
+                        0);
+    }
+
+  CORBA::add_ref (adapter_template);
+
+  return adapter_template;
+}
+
+PortableInterceptor::ObjectReferenceFactory *
+TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  // Return the current_factory that is used to create the object
+  // references by the adapter.  Though initially, its value is the
+  // same as the adapter_template, unlike adapter_template, its value
+  // can be changed.  The value of the current_factory can be changed
+  // only during the call to components_established method.
+  PortableInterceptor::ObjectReferenceFactory *adapter_factory =
+    this->poa_->get_obj_ref_factory ();
+
+  if (adapter_factory == 0)
+    {
+      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                              CORBA::COMPLETED_NO),
+                        0);
+    }
+
+  CORBA::add_ref (adapter_factory);
+
+  return adapter_factory;
+}
+
+void
+TAO_IORInfo::current_factory (
+    PortableInterceptor::ObjectReferenceFactory * current_factory
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->poa_->set_obj_ref_factory (current_factory
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (this->poa_ == 0)
+    {
+      // Although not defined by the spec, duplicate the behavior used
+      // by the ORBInitInfo object once CORBA::ORB_init() has been
+      // called.  Specifically, the IORInfo object is no longer valid
+      // once the POA has invoked all IORInterceptor interception
+      // points.  This also prevents memory access violations from
+      // occuring if the POA is destroyed before this IORInfo object.
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE,
+                                          CORBA::COMPLETED_NO));
+    }
+}
diff --git a/TAO/tao/PortableServer/IORInfo.h b/TAO/tao/PortableServer/IORInfo.h
new file mode 100644
index 00000000000..5b168a59fe4
--- /dev/null
+++ b/TAO/tao/PortableServer/IORInfo.h
@@ -0,0 +1,173 @@
+// -*- C++ -*-
+
+// ===================================================================
+/**
+ *  @file   IORInfo.h
+ *
+ *  $Id$
+ *
+ *  @author Ossama Othman <ossama@uci.edu>
+ */
+// ===================================================================
+
+#ifndef TAO_IOR_INFO_H
+#define TAO_IOR_INFO_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/IORInterceptor/IORInterceptorC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+
+/// Forward declarations.
+class TAO_POA;
+
+
+/**
+ * @class TAO_IORInfo
+ *
+ * @brief This class exposes an interface that allows IORInterceptors add
+ * tagged components to IORs.
+ */
+class TAO_IORInfo
+  : public virtual PortableInterceptor::IORInfo,
+    public virtual TAO_Local_RefCounted_Object
+{
+public:
+
+  /// Constructor.
+  TAO_IORInfo (TAO_POA *poa);
+
+  /**
+   * @name PortableInterceptor::IORInfo Methods
+   *
+   * Methods exposed by the PortableInterceptor::IORInfo interface.
+   */
+  //@{
+
+  /// Return the policy matching the given policy type that is in
+  /// effect for the object whose IOR is being created.
+  virtual CORBA::Policy_ptr get_effective_policy (
+      CORBA::PolicyType type
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  /// Add the given tagged component to all profiles.
+  virtual void add_ior_component (
+      const IOP::TaggedComponent & component
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  /// Add the given tagged component to all profiles matching the given
+  /// ProfileId.
+  virtual void add_ior_component_to_profile (
+      const IOP::TaggedComponent & component,
+      IOP::ProfileId profile_id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::AdapterManagerId manager_id (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::AdapterState state (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::ObjectReferenceFactory * current_factory (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void current_factory (
+      PortableInterceptor::ObjectReferenceFactory * current_factory
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  //@}
+
+  /// Invalidate this IORInfo instance.
+  /**
+   * Once the IOR interception points have been invoked, this IORInfo
+   * instance is no longer valid.
+   */
+  void invalidate (void);
+
+  /// Inform the this IORInfo object that the
+  /// IORInterceptor::components_established() interception point has
+  /// been called.
+  /**
+   * This method is used so to inform the IORInfo when the
+   * add_ior_component() and add_ior_component_to_profile() methods
+   * are invalid.  They are only valid in the
+   * IORInterceptor::establish_components() interception point.
+   */
+  void components_established (void);
+
+protected:
+
+  /// Protected destructor to enforce proper memory managment through
+  /// the reference counting mechanism.
+  ~TAO_IORInfo (void);
+
+  /// Check if this IORInfo instance is valid.
+  /**
+   * Once all IORInterceptor interception points have been called,
+   * this IORInfo object is no longer valid.  Throw an exception in
+   * that case.
+   */
+  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
+
+private:
+
+  /// Prevent copying through the copy constructor and the assignment
+  /// operator.
+  ACE_UNIMPLEMENTED_FUNC (
+    TAO_IORInfo (const TAO_IORInfo &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_IORInfo &))
+
+private:
+
+  /// Pointer to POA
+  TAO_POA *poa_;
+
+  /// True if the IORInterceptor::components_established()
+  /// interception point was called.  False otherwise.
+  /**
+   * This flag is used to prevent the add_ior_component() and
+   * add_ior_component_to_profile() methods from being incorrectly
+   * called after the IORInterceptor::establish_components()
+   * interception point has been called.
+   */
+  CORBA::Boolean components_established_;
+
+};
+
+#if defined (__ACE_INLINE__)
+# include "IORInfo.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_IOR_INFO_H */
diff --git a/TAO/tao/PortableServer/IORInfo.inl b/TAO/tao/PortableServer/IORInfo.inl
new file mode 100644
index 00000000000..3a94b482656
--- /dev/null
+++ b/TAO/tao/PortableServer/IORInfo.inl
@@ -0,0 +1,15 @@
+// -*- C++ -*-
+//
+// $Id$
+
+ACE_INLINE void
+TAO_IORInfo::invalidate (void)
+{
+  this->poa_ = 0;
+}
+
+ACE_INLINE void
+TAO_IORInfo::components_established (void)
+{
+  this->components_established_ = 1;
+}
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp
index 69eb28988f7..d41ca21cfa3 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp
@@ -48,7 +48,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ImR_LocatorC.inl"
+#include "ImR_LocatorC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -60,7 +60,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -74,13 +74,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -93,13 +93,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -112,13 +112,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -134,7 +134,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -151,7 +151,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Administration>
     : public
@@ -165,13 +165,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Locator::ServerNameList>
     : public
@@ -194,7 +194,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::Locator_ptr
-TAO::Objref_Traits<ImplementationRepository::Locator>::duplicate (
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_duplicate (
     ImplementationRepository::Locator_ptr p
   )
 {
@@ -203,7 +203,7 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<ImplementationRepository::Locator>::release (
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_release (
     ImplementationRepository::Locator_ptr p
   )
 {
@@ -212,14 +212,14 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::Locator_ptr
-TAO::Objref_Traits<ImplementationRepository::Locator>::nil (void)
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_nil (void)
 {
   return ImplementationRepository::Locator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::Locator>::marshal (
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_marshal (
     ImplementationRepository::Locator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -228,12 +228,12 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST_CS_)
@@ -287,29 +287,29 @@ static const CORBA::Long _oc_ImplementationRepository_Locator_ServerNameList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   56,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f4c6f63),
-  ACE_NTOHL (0x61746f72),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x7665724e),
-  ACE_NTOHL (0x616d654c),
-  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f4c6f63), 
+  ACE_NTOHL (0x61746f72), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x7665724e), 
+  ACE_NTOHL (0x616d654c), 
+  ACE_NTOHL (0x6973743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Locator/ServerNameList:1.0
     15,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724e61),
-  ACE_NTOHL (0x6d654c69),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724e61), 
+  ACE_NTOHL (0x6d654c69), 
   ACE_NTOHL (0x73740000),  // name = ServerNameList
     CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string,
+    CORBA::tk_string, 
     0U, // string length
     0U,
 
@@ -344,39 +344,39 @@ void ImplementationRepository::Locator::activate_server_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_activator
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_activate_server_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_activate_server_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       },
-
+      
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
         ImplementationRepository::CannotActivate::_alloc,
         ImplementationRepository::_tc_CannotActivate
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -385,7 +385,7 @@ void ImplementationRepository::Locator::activate_server_in_activator (
       28,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_activate_server_in_activator_exceptiondata,
       2
@@ -411,25 +411,25 @@ void ImplementationRepository::Locator::remove_server_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_activator
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_remove_server_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_remove_server_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -437,7 +437,7 @@ void ImplementationRepository::Locator::remove_server_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -446,7 +446,7 @@ void ImplementationRepository::Locator::remove_server_in_activator (
       26,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_remove_server_in_activator_exceptiondata,
       1
@@ -472,25 +472,25 @@ void ImplementationRepository::Locator::shutdown_server_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_activator
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -498,7 +498,7 @@ void ImplementationRepository::Locator::shutdown_server_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -507,7 +507,7 @@ void ImplementationRepository::Locator::shutdown_server_in_activator (
       28,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata,
       1
@@ -533,25 +533,25 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_activator
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -559,7 +559,7 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -568,7 +568,7 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_activator (
       36,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata,
       1
@@ -594,17 +594,17 @@ CORBA::Long ImplementationRepository::Locator::register_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< CORBA::Long>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
   TAO::Arg_Traits< ::ImplementationRepository::Administration>::in_arg_val _tao_admin (admin);
   TAO::Arg_Traits< ::ImplementationRepository::Locator::ServerNameList>::in_arg_val _tao_servers (servers);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -612,7 +612,7 @@ CORBA::Long ImplementationRepository::Locator::register_activator (
       &_tao_admin,
       &_tao_servers
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -621,10 +621,10 @@ CORBA::Long ImplementationRepository::Locator::register_activator (
       18,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -644,23 +644,23 @@ void ImplementationRepository::Locator::unregister_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
   TAO::Arg_Traits< CORBA::Long>::in_arg_val _tao_token (token);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_activator,
       &_tao_token
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -669,7 +669,7 @@ void ImplementationRepository::Locator::unregister_activator (
       20,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -693,18 +693,18 @@ void ImplementationRepository::Locator::server_is_running_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
   TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val _tao_addr (addr);
   TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -713,9 +713,9 @@ void ImplementationRepository::Locator::server_is_running_in_activator (
       &_tao_addr,
       &_tao_server_object
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -723,7 +723,7 @@ void ImplementationRepository::Locator::server_is_running_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -732,7 +732,7 @@ void ImplementationRepository::Locator::server_is_running_in_activator (
       30,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata,
       1
@@ -759,17 +759,17 @@ void ImplementationRepository::Locator::find_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -777,9 +777,9 @@ void ImplementationRepository::Locator::find_in_activator (
       &_tao_activator,
       &_tao_info
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -787,7 +787,7 @@ void ImplementationRepository::Locator::find_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -796,7 +796,7 @@ void ImplementationRepository::Locator::find_in_activator (
       17,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata,
       1
@@ -819,14 +819,14 @@ ImplementationRepository::Locator::ImplementationRepository_Locator_setup_colloc
       this->the_TAO_Locator_Proxy_Broker_ =
         ::ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer (this);
     }
-
+  
   this->ImplementationRepository_Administration_setup_collocation ();
 }
 
 ImplementationRepository::Locator::~Locator (void)
 {}
 
-void
+void 
 ImplementationRepository::Locator::_tao_any_destructor (void *_tao_void_pointer)
 {
   Locator *_tao_tmp_pointer =
@@ -871,7 +871,7 @@ ImplementationRepository::Locator::_duplicate (Locator_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -925,19 +925,19 @@ static const CORBA::Long _oc_ImplementationRepository_Locator[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f4c6f63),
-  ACE_NTOHL (0x61746f72),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f4c6f63), 
+  ACE_NTOHL (0x61746f72), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Locator:1.0
     8,
-  ACE_NTOHL (0x4c6f6361),
+  ACE_NTOHL (0x4c6f6361), 
   ACE_NTOHL (0x746f7200),  // name = Locator
   };
 
@@ -1010,7 +1010,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1080,20 +1080,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -1103,7 +1103,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -1113,27 +1113,27 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-
+        
       }
-
+    
     return _tao_marshal_flag;
-
+  
   }
 
 return 0;
@@ -1159,21 +1159,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::ImplementationRepository::Locator RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -1346,7 +1346,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         ImplementationRepository::Locator
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         ImplementationRepository::Locator
@@ -1528,7 +1528,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         ImplementationRepository::Locator
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         ImplementationRepository::Locator
@@ -1544,4 +1544,5 @@ CORBA::Boolean operator>> (
         ImplementationRepository::Locator \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h
index 04204a62336..4ef0decde0c 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.h
+++ b/TAO/tao/PortableServer/ImR_LocatorC.h
@@ -74,13 +74,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -90,22 +90,22 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR__VAR_OUT_CH_
-
+  
   class Locator;
   typedef Locator *Locator_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Locator
       >
     Locator_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Locator
@@ -113,13 +113,13 @@ namespace ImplementationRepository
     Locator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_CH_
-
+  
   class TAO_PortableServer_Export Locator
     : public virtual ::ImplementationRepository::Administration
   {
@@ -127,42 +127,42 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<Locator>;
     typedef Locator_ptr _ptr_type;
     typedef Locator_var _var_type;
-
+    
     // The static operations.
     static Locator_ptr _duplicate (Locator_ptr obj);
-
+    
     static Locator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _nil (void)
     {
       return (Locator_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST_CH_
-
+    
     class ServerNameList;
-
+    
     typedef
       TAO_MngSeq_Var_T<
           ServerNameList,
           TAO_SeqElem_String_Manager
         >
       ServerNameList_var;
-
+    
     typedef
       TAO_MngSeq_Out_T<
           ServerNameList,
@@ -170,7 +170,7 @@ namespace ImplementationRepository
           TAO_SeqElem_String_Manager
         >
       ServerNameList_out;
-
+    
     class TAO_PortableServer_Export ServerNameList
       : public
           TAO_Unbounded_String_Sequence
@@ -181,27 +181,27 @@ namespace ImplementationRepository
       ServerNameList (
           CORBA::ULong max,
           CORBA::ULong length,
-          char ** buffer,
+          char ** buffer, 
           CORBA::Boolean release = 0
         );
       ServerNameList (const ServerNameList &);
       ~ServerNameList (void);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       typedef ServerNameList_var _var_type;
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_ServerNameList;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void activate_server_in_activator (
         const char * server,
         const char * activator
@@ -212,10 +212,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void remove_server_in_activator (
         const char * server,
         const char * activator
@@ -225,10 +225,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void shutdown_server_in_activator (
         const char * server,
         const char * activator
@@ -238,10 +238,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void server_is_shutting_down_in_activator (
         const char * server,
         const char * activator
@@ -251,10 +251,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Long register_activator (
         const char * activator,
         ::ImplementationRepository::Administration_ptr admin,
@@ -264,10 +264,10 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void unregister_activator (
         const char * activator,
         ::CORBA::Long token
@@ -276,10 +276,10 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void server_is_running_in_activator (
         const char * server,
         const char * activator,
@@ -291,10 +291,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void find_in_activator (
         const char * server,
         const char * activator,
@@ -305,34 +305,34 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Locator_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Locator (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Locator_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Locator (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Locator (
         TAO_Stub *objref,
@@ -340,21 +340,21 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Locator (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Locator (const Locator &);
-
+    
     void operator= (const Locator &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Locator;
 
 // TAO_IDL - Generated from
@@ -382,18 +382,18 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::Locator>
   {
-    static ImplementationRepository::Locator_ptr duplicate (
+    static ImplementationRepository::Locator_ptr tao_duplicate (
         ImplementationRepository::Locator_ptr
       );
-    static void release (
+    static void tao_release (
         ImplementationRepository::Locator_ptr
       );
-    static ImplementationRepository::Locator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ImplementationRepository::Locator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         ImplementationRepository::Locator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -444,7 +444,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:976
 
 #if defined (__ACE_INLINE__)
-#include "ImR_LocatorC.inl"
+#include "ImR_LocatorC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -458,3 +458,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.i b/TAO/tao/PortableServer/ImR_LocatorC.i
new file mode 100644
index 00000000000..4908d458454
--- /dev/null
+++ b/TAO/tao/PortableServer/ImR_LocatorC.i
@@ -0,0 +1,64 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___CI_)
+#define _IMPLEMENTATIONREPOSITORY_LOCATOR___CI_
+
+ACE_INLINE
+ImplementationRepository::Locator::Locator (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
+    the_TAO_Locator_Proxy_Broker_ (0)
+{
+  this->ImplementationRepository_Locator_setup_collocation ();
+}
+
+ACE_INLINE
+ImplementationRepository::Locator::Locator (
+    IOP::IOR *ior,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_Locator_Proxy_Broker_ (0)
+{
+}
+
+#endif /* end #if !defined */
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index fed027a95c4..9dc87f23eac 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:629
 
 #ifndef _TAO_IDL_IMR_LOCATORS_CPP_
@@ -66,7 +66,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ImR_LocatorS.inl"
+#include "ImR_LocatorS.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -78,7 +78,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -92,13 +92,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -111,13 +111,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -130,13 +130,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -152,7 +152,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -169,7 +169,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Administration>
     : public
@@ -183,13 +183,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Locator::ServerNameList>
     : public
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.h b/TAO/tao/PortableServer/ImR_LocatorS.h
index 95551511324..47a4e377bfc 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.h
+++ b/TAO/tao/PortableServer/ImR_LocatorS.h
@@ -60,85 +60,85 @@
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class Locator;
   typedef Locator *Locator_ptr;
-
+  
   class _TAO_Locator_ThruPOA_Proxy_Impl;
   class _TAO_Locator_Direct_Proxy_Impl;
   class _TAO_Locator_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Locator
     : public virtual POA_ImplementationRepository::Administration
   {
   protected:
     Locator (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::Locator _stub_type;
     typedef ::ImplementationRepository::Locator_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::Locator_var _stub_var_type;
-
+    
     Locator (const Locator& rhs);
     virtual ~Locator (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::Locator *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void activate_server_in_activator (
         const char * server,
         const char * activator
@@ -149,17 +149,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       )) = 0;
-
+    
     static void activate_server_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void remove_server_in_activator (
         const char * server,
         const char * activator
@@ -169,17 +169,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void remove_server_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void shutdown_server_in_activator (
         const char * server,
         const char * activator
@@ -189,17 +189,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void shutdown_server_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void server_is_shutting_down_in_activator (
         const char * server,
         const char * activator
@@ -209,17 +209,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void server_is_shutting_down_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual CORBA::Long register_activator (
         const char * activator,
         ::ImplementationRepository::Administration_ptr admin,
@@ -229,17 +229,17 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void register_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void unregister_activator (
         const char * activator,
         ::CORBA::Long token
@@ -248,17 +248,17 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void unregister_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void server_is_running_in_activator (
         const char * server,
         const char * activator,
@@ -270,17 +270,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void server_is_running_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void find_in_activator (
         const char * server,
         const char * activator,
@@ -291,169 +291,169 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void find_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     activate_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     activate_server_with_startup_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     register_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     reregister_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     remove_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     shutdown_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     server_is_running_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     server_is_shutting_down_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     find_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     list_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     shutdown_repo_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     find_ior_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_Locator_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Locator_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Locator_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -466,34 +466,34 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_Locator_Strategized_Proxy_Broker *
     the_TAO_Locator_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_Locator_ThruPOA_Proxy_Impl
     : public virtual ::POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_Locator_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Locator_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -506,10 +506,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     remove_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -521,10 +521,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -536,10 +536,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_shutting_down_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -551,10 +551,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     register_activator (
         TAO_Abstract_ServantBase *servant,
@@ -565,10 +565,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     unregister_activator (
         TAO_Abstract_ServantBase *servant,
@@ -579,10 +579,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_running_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -594,10 +594,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -609,13 +609,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     activate_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -625,13 +625,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     activate_server_with_startup (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -641,13 +641,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     register_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -657,13 +657,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     reregister_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -673,13 +673,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     remove_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -688,13 +688,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     shutdown_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -703,13 +703,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     server_is_running (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -718,13 +718,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     server_is_shutting_down (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -733,13 +733,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     find (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -748,13 +748,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     list (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -762,13 +762,13 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     shutdown_repo (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -776,13 +776,13 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     find_ior (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -792,29 +792,29 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
   class TAO_PortableServer_Export _TAO_Locator_Direct_Proxy_Impl
     : public virtual ::POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl
   {
   public:
     _TAO_Locator_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Locator_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -827,10 +827,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     remove_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -842,10 +842,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -857,10 +857,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_shutting_down_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -872,10 +872,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     register_activator (
         TAO_Abstract_ServantBase *servant,
@@ -886,10 +886,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     unregister_activator (
         TAO_Abstract_ServantBase *servant,
@@ -900,10 +900,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_running_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -915,10 +915,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -930,13 +930,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     activate_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -946,13 +946,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     activate_server_with_startup (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -962,13 +962,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     register_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -978,13 +978,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     reregister_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -994,13 +994,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     remove_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1009,13 +1009,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     shutdown_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1024,13 +1024,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     server_is_running (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1039,13 +1039,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     server_is_shutting_down (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1054,13 +1054,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     find (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1069,13 +1069,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     list (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1083,13 +1083,13 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     shutdown_repo (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1097,13 +1097,13 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     find_ior (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1113,24 +1113,24 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 
 // TAO_IDL - Generated from
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 } // module ImplementationRepository
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1012
 
 
 #if defined (__ACE_INLINE__)
-#include "ImR_LocatorS.inl"
+#include "ImR_LocatorS.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.i b/TAO/tao/PortableServer/ImR_LocatorS.i
new file mode 100644
index 00000000000..3c6b37372ed
--- /dev/null
+++ b/TAO/tao/PortableServer/ImR_LocatorS.i
@@ -0,0 +1,858 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::activate_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::activate_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::activate_server_with_startup_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::activate_server_with_startup_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::register_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::register_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::reregister_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::reregister_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::remove_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::remove_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::shutdown_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::shutdown_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::server_is_running_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::server_is_running_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::server_is_shutting_down_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::find_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::find_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::list_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::list_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::shutdown_repo_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::shutdown_repo_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::find_ior_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::find_ior_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound,
+    ::ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound,
+    ::ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_with_startup (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound,
+    ::ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_with_startup (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound,
+    ::ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::AlreadyRegistered,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::AlreadyRegistered,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::reregister_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::AlreadyRegistered,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::reregister_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::AlreadyRegistered,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_running (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_running (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::list (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::list (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_repo (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_repo (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_repo (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_repo (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find_ior (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find_ior (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find_ior (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find_ior (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
diff --git a/TAO/tao/PortableServer/ImplRepo.pidl b/TAO/tao/PortableServer/ImplRepo.pidl
index cbeb5fc3708..2cc3e94bfe9 100644
--- a/TAO/tao/PortableServer/ImplRepo.pidl
+++ b/TAO/tao/PortableServer/ImplRepo.pidl
@@ -17,52 +17,52 @@
 
 module ImplementationRepository
 {
-  /**
-   * @brief Server Side IR Object
-   *
-   * This object, which exists on the servers that use the
-   * Implementation Repository (IR), is used to control or check the
-   * status of the server by the IR.
-   */
   interface ServerObject
+    // = TITLE
+    //    Server Side IR Object
+    //
+    // = DESCRIPTION
+    //    This object, which exists on the servers that use the
+    //    Implementation Repository (IR), is used to control or check the
+    //    status of the server by the IR.
   {
-    /// Check the liveness of a server.
     void ping ();
+    // Check the liveness of a server.
 
-    /// Try to shutdown the server gracefully.
     void shutdown ();
+    // Try to shutdown the server gracefully.
   };
 
   // = Exceptions
 
-  /// Object already bound in the Implementation Repository
   exception AlreadyRegistered {};
+  // Object already bound in the Implementation Repository
 
-  /// The server could not be restarted.
   exception CannotActivate
   {
     string reason;
   };
+  // The server could not be restarted.
 
-  /// Object not found in the Implementation Repository
   exception NotFound {};
+  // Object not found in the Implementation Repository
 
-  /// One environment variable/value pair.
   struct EnvironmentVariable
+  // One environment variable/value pair.
   {
     string name;
     string value;
   };
 
-  /// This is used in places that require a partial IOR with
-  /// just the ObjectKey missing.
   typedef string Address;
+  // This is used in places that require a partial IOR with
+  // just the ObjectKey missing.
 
-  /// Complete Environment.
   typedef sequence<EnvironmentVariable> EnvironmentList;
+  // Complete Environment.
 
-  /// The type of Activation
   enum ActivationMode {NORMAL, MANUAL, PER_CLIENT, AUTO_START};
+  // The type of Activation
 
   /// Options used to start up the server.
   struct StartupOptions
@@ -83,8 +83,8 @@ module ImplementationRepository
     string activator;
   };
 
-  /// All the information about one server.
   struct ServerInformation
+  // All the information about one server.
   {
     /// The logical server this server is part of.
     string logical_server;
@@ -104,115 +104,118 @@ module ImplementationRepository
   /// Forward declaration.
   interface ServerInformationIterator;
 
-  /**
-    * @brief The Implementation Repository Administration Interface
-    *
-    * This interface exports all the administration functionality of
-    * the Implementation Repository.
-    */
+
   interface Administration
+    // = TITLE
+    //    The Implementation Repository Administration Interface
+    //
+    // = DESCRIPTION
+    //    This interface exports all the administration functionality of
+    //    the Implementation Repository.
   {
-    /// Activate server that is named @a server.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.  The <CannotActivate> exception
-    /// is raised when <server> is found in the Repository but could not be
-    /// activated.
     void activate_server (in string server)
       raises (NotFound, CannotActivate);
+    // Activate server that is named <server>.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.  The <CannotActivate> exception
+    // is raised when <server> is found in the Repository but could not be
+    // activated.
 
     string activate_server_with_startup (in string server,
                                          in long check_startup)
       raises (NotFound, CannotActivate);
 
-    /// Register the <options> to specify how the <server> should be
-    /// restarted when a client asks for it.
-    ///
-    /// The <AlreadyRegistered> exception is raised when <server> has
-    /// already been registered with the Implementation Repository.
-    /// The <NotFound> exception is raised when the activator specified
-    /// in the options is not registered.
     void register_server (in string server,
                           in StartupOptions options)
       raises (AlreadyRegistered, NotFound);
+    // Register the <options> to specify how the <server> should be
+    // restarted when a client asks for it.
+    //
+    // The <AlreadyRegistered> exception is raised when <server> has
+    // already been registered with the Implementation Repository.
+    // The <NotFound> exception is raised when the activator specified
+    // in the options is not registered.
 
-    /// Update the <options> to specify how the <server> should be
-    /// restarted when a client asks for it.  Will register the server
-    /// if not already registered.
-    /// The <AlreadyRegistered> exception is raised when <server> has
-    /// already been registered with a different activator.
-    /// The <NotFound> exception is raised when the activator specified
-    /// in the options is not registered.
     void reregister_server (in string server,
                             in StartupOptions options)
                             raises(AlreadyRegistered, NotFound);
+    // Update the <options> to specify how the <server> should be
+    // restarted when a client asks for it.  Will register the server
+    // if not already registered.
+    // The <AlreadyRegistered> exception is raised when <server> has
+    // already been registered with a different activator.
+    // The <NotFound> exception is raised when the activator specified
+    // in the options is not registered.
 
-    /// Remove <server> from the Implementation Repository.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void remove_server (in string server)
       raises (NotFound);
+    // Remove <server> from the Implementation Repository.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Tries to shutdown the server, first gracefully, then ungracefully.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void shutdown_server (in string server)
       raises (NotFound);
+    // Tries to shutdown the server, first gracefully, then ungracefully.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Used to notify the Implementation Repository that <server> is alive
-    /// and well at <addr>.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void server_is_running (in string server,
                                in Address addr,
                                in ServerObject server_object)
       raises (NotFound);
+    // Used to notify the Implementation Repository that <server> is alive
+    // and well at <addr>.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Used to tell the Implementation Repository that <server> is shutting
-    /// down.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void server_is_shutting_down (in string server)
       raises (NotFound);
+    // Used to tell the Implementation Repository that <server> is shutting
+    // down.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Returns the startup information for a given <server>.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void find (in string server,
                out ServerInformation info)
       raises (NotFound);
+    // Returns the startup information for a given <server>.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Returns at most <how_many> servers in <server_list>.  If there
-    /// are additional servers, they can be received through the
-    /// <server_iterator>.  If there are no more servers, then
-    /// <server_iterator> is null.
     void list (in unsigned long how_many,
                out ServerInformationList server_list,
                out ServerInformationIterator server_iterator);
+    // Returns at most <how_many> servers in <server_list>.  If there
+    // are additional servers, they can be received through the
+    // <server_iterator>.  If there are no more servers, then
+    // <server_iterator> is null.
 
-    /// Shuts down the repository
     void shutdown_repo() ;
+    // Shuts down the repository
 
     string find_ior (in string object_name)
       raises (NotFound);
 
   };
 
-  /// Interface for iterating over servers returned with
-  /// Administration::list ().
   interface ServerInformationIterator
   {
-    /// This operation returns at most the requested number of
-    /// servers.
+    // = TITLE
+    // Interface for iterating over servers returned with
+    // Administration::list ().
+
     boolean next_n (in unsigned long how_many,
                     out ServerInformationList server_list);
+    // This operation returns at most the requested number of
+    // servers.
 
-    /// This operation destroys the iterator.
     void destroy ();
+    // This operation destroys the iterator.
   };
 };
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 143506a5db1..c524a0b68cf 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -50,7 +50,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ImplRepoC.inl"
+#include "ImplRepoC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -62,7 +62,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -76,13 +76,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -95,13 +95,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -114,13 +114,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -136,7 +136,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -160,7 +160,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::ServerObject_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::duplicate (
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_duplicate (
     ImplementationRepository::ServerObject_ptr p
   )
 {
@@ -169,7 +169,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::release (
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_release (
     ImplementationRepository::ServerObject_ptr p
   )
 {
@@ -178,14 +178,14 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::ServerObject_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::nil (void)
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_nil (void)
 {
   return ImplementationRepository::ServerObject::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal (
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_marshal (
     ImplementationRepository::ServerObject_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -194,7 +194,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -213,19 +213,19 @@ void ImplementationRepository::ServerObject::ping (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerObject_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -234,7 +234,7 @@ void ImplementationRepository::ServerObject::ping (
       4,
       this->the_TAO_ServerObject_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -253,19 +253,19 @@ void ImplementationRepository::ServerObject::shutdown (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerObject_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -274,7 +274,7 @@ void ImplementationRepository::ServerObject::shutdown (
       8,
       this->the_TAO_ServerObject_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -298,7 +298,7 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se
 ImplementationRepository::ServerObject::~ServerObject (void)
 {}
 
-void
+void 
 ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerObject *_tao_tmp_pointer =
@@ -343,7 +343,7 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -393,22 +393,22 @@ static const CORBA::Long _oc_ImplementationRepository_ServerObject[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x7665724f),
-  ACE_NTOHL (0x626a6563),
-  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x7665724f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/ServerObject:1.0
     13,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724f62),
-  ACE_NTOHL (0x6a656374),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724f62), 
+  ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x0),  // name = ServerObject
   };
 
@@ -426,7 +426,7 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_ServerObject;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
@@ -509,7 +509,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -522,7 +522,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -539,24 +539,24 @@ static const CORBA::Long _oc_ImplementationRepository_AlreadyRegistered[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416c72),
-  ACE_NTOHL (0x65616479),
-  ACE_NTOHL (0x52656769),
-  ACE_NTOHL (0x73746572),
-  ACE_NTOHL (0x65643a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416c72), 
+  ACE_NTOHL (0x65616479), 
+  ACE_NTOHL (0x52656769), 
+  ACE_NTOHL (0x73746572), 
+  ACE_NTOHL (0x65643a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/AlreadyRegistered:1.0
     18,
-  ACE_NTOHL (0x416c7265),
-  ACE_NTOHL (0x61647952),
-  ACE_NTOHL (0x65676973),
-  ACE_NTOHL (0x74657265),
+  ACE_NTOHL (0x416c7265), 
+  ACE_NTOHL (0x61647952), 
+  ACE_NTOHL (0x65676973), 
+  ACE_NTOHL (0x74657265), 
   ACE_NTOHL (0x64000000),  // name = AlreadyRegistered
   0, // member count
   };
@@ -575,7 +575,7 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_AlreadyRegistered;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
@@ -660,7 +660,7 @@ void ImplementationRepository::CannotActivate::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -673,7 +673,7 @@ void ImplementationRepository::CannotActivate::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -706,28 +706,28 @@ static const CORBA::Long _oc_ImplementationRepository_CannotActivate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f43616e),
-  ACE_NTOHL (0x6e6f7441),
-  ACE_NTOHL (0x63746976),
-  ACE_NTOHL (0x6174653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f43616e), 
+  ACE_NTOHL (0x6e6f7441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x6174653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/CannotActivate:1.0
     15,
-  ACE_NTOHL (0x43616e6e),
-  ACE_NTOHL (0x6f744163),
-  ACE_NTOHL (0x74697661),
+  ACE_NTOHL (0x43616e6e), 
+  ACE_NTOHL (0x6f744163), 
+  ACE_NTOHL (0x74697661), 
   ACE_NTOHL (0x74650000),  // name = CannotActivate
   1, // member count
     7,
-  ACE_NTOHL (0x72656173),
+  ACE_NTOHL (0x72656173), 
   ACE_NTOHL (0x6f6e0000),  // name = reason
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -745,7 +745,7 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_CannotActivate;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
@@ -828,7 +828,7 @@ void ImplementationRepository::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -841,7 +841,7 @@ void ImplementationRepository::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -858,20 +858,20 @@ static const CORBA::Long _oc_ImplementationRepository_NotFound[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f4e6f74),
-  ACE_NTOHL (0x466f756e),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f4e6f74), 
+  ACE_NTOHL (0x466f756e), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/NotFound:1.0
     9,
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
   };
@@ -897,36 +897,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f456e76),
-  ACE_NTOHL (0x69726f6e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x56617269),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f456e76), 
+  ACE_NTOHL (0x69726f6e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x56617269), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
     20,
-  ACE_NTOHL (0x456e7669),
-  ACE_NTOHL (0x726f6e6d),
-  ACE_NTOHL (0x656e7456),
-  ACE_NTOHL (0x61726961),
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e7456), 
+  ACE_NTOHL (0x61726961), 
   ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
   2, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   6,
-  ACE_NTOHL (0x76616c75),
+  ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -944,10 +944,10 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -964,21 +964,21 @@ static const CORBA::Long _oc_ImplementationRepository_Address[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416464),
-  ACE_NTOHL (0x72657373),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416464), 
+  ACE_NTOHL (0x72657373), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
     8,
-  ACE_NTOHL (0x41646472),
+  ACE_NTOHL (0x41646472), 
   ACE_NTOHL (0x65737300),  // name = Address
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -996,7 +996,7 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_Address;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
@@ -1056,23 +1056,23 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f456e76),
-  ACE_NTOHL (0x69726f6e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f456e76), 
+  ACE_NTOHL (0x69726f6e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
     16,
-  ACE_NTOHL (0x456e7669),
-  ACE_NTOHL (0x726f6e6d),
-  ACE_NTOHL (0x656e744c),
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e744c), 
   ACE_NTOHL (0x69737400),  // name = EnvironmentList
     CORBA::tk_sequence, // typecode kind
   148, // encapsulation length
@@ -1081,36 +1081,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
     132, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       53,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f456e76),
-      ACE_NTOHL (0x69726f6e),
-      ACE_NTOHL (0x6d656e74),
-      ACE_NTOHL (0x56617269),
-      ACE_NTOHL (0x61626c65),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f456e76), 
+      ACE_NTOHL (0x69726f6e), 
+      ACE_NTOHL (0x6d656e74), 
+      ACE_NTOHL (0x56617269), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
             20,
-      ACE_NTOHL (0x456e7669),
-      ACE_NTOHL (0x726f6e6d),
-      ACE_NTOHL (0x656e7456),
-      ACE_NTOHL (0x61726961),
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e7456), 
+      ACE_NTOHL (0x61726961), 
       ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
       2, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       6,
-      ACE_NTOHL (0x76616c75),
+      ACE_NTOHL (0x76616c75), 
       ACE_NTOHL (0x65000000),  // name = value
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
     0U,
@@ -1138,37 +1138,37 @@ static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416374),
-  ACE_NTOHL (0x69766174),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x6f64653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416374), 
+  ACE_NTOHL (0x69766174), 
+  ACE_NTOHL (0x696f6e4d), 
+  ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
   15,
-  ACE_NTOHL (0x41637469),
-  ACE_NTOHL (0x76617469),
-  ACE_NTOHL (0x6f6e4d6f),
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x6f6e4d6f), 
   ACE_NTOHL (0x64650000),  // name = ActivationMode
   4, // member count
   7,
-  ACE_NTOHL (0x4e4f524d),
+  ACE_NTOHL (0x4e4f524d), 
   ACE_NTOHL (0x414c0000),  // name = NORMAL
   7,
-  ACE_NTOHL (0x4d414e55),
+  ACE_NTOHL (0x4d414e55), 
   ACE_NTOHL (0x414c0000),  // name = MANUAL
   11,
-  ACE_NTOHL (0x5045525f),
-  ACE_NTOHL (0x434c4945),
+  ACE_NTOHL (0x5045525f), 
+  ACE_NTOHL (0x434c4945), 
   ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
   11,
-  ACE_NTOHL (0x4155544f),
-  ACE_NTOHL (0x5f535441),
+  ACE_NTOHL (0x4155544f), 
+  ACE_NTOHL (0x5f535441), 
   ACE_NTOHL (0x52540000),  // name = AUTO_START
   };
 
@@ -1193,56 +1193,56 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f537461),
-  ACE_NTOHL (0x72747570),
-  ACE_NTOHL (0x4f707469),
-  ACE_NTOHL (0x6f6e733a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f537461), 
+  ACE_NTOHL (0x72747570), 
+  ACE_NTOHL (0x4f707469), 
+  ACE_NTOHL (0x6f6e733a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
     15,
-  ACE_NTOHL (0x53746172),
-  ACE_NTOHL (0x7475704f),
-  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x53746172), 
+  ACE_NTOHL (0x7475704f), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e730000),  // name = StartupOptions
   5, // member count
     13,
-  ACE_NTOHL (0x636f6d6d),
-  ACE_NTOHL (0x616e645f),
-  ACE_NTOHL (0x6c696e65),
+  ACE_NTOHL (0x636f6d6d), 
+  ACE_NTOHL (0x616e645f), 
+  ACE_NTOHL (0x6c696e65), 
   ACE_NTOHL (0x0),  // name = command_line
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   12,
-  ACE_NTOHL (0x656e7669),
-  ACE_NTOHL (0x726f6e6d),
+  ACE_NTOHL (0x656e7669), 
+  ACE_NTOHL (0x726f6e6d), 
   ACE_NTOHL (0x656e7400),  // name = environment
     CORBA::tk_alias, // typecode kind for typedefs
   236, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     49,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f456e76),
-    ACE_NTOHL (0x69726f6e),
-    ACE_NTOHL (0x6d656e74),
-    ACE_NTOHL (0x4c697374),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f456e76), 
+    ACE_NTOHL (0x69726f6e), 
+    ACE_NTOHL (0x6d656e74), 
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
         16,
-    ACE_NTOHL (0x456e7669),
-    ACE_NTOHL (0x726f6e6d),
-    ACE_NTOHL (0x656e744c),
+    ACE_NTOHL (0x456e7669), 
+    ACE_NTOHL (0x726f6e6d), 
+    ACE_NTOHL (0x656e744c), 
     ACE_NTOHL (0x69737400),  // name = EnvironmentList
         CORBA::tk_sequence, // typecode kind
     148, // encapsulation length
@@ -1251,95 +1251,95 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
       132, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         53,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f456e76),
-        ACE_NTOHL (0x69726f6e),
-        ACE_NTOHL (0x6d656e74),
-        ACE_NTOHL (0x56617269),
-        ACE_NTOHL (0x61626c65),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f456e76), 
+        ACE_NTOHL (0x69726f6e), 
+        ACE_NTOHL (0x6d656e74), 
+        ACE_NTOHL (0x56617269), 
+        ACE_NTOHL (0x61626c65), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
                 20,
-        ACE_NTOHL (0x456e7669),
-        ACE_NTOHL (0x726f6e6d),
-        ACE_NTOHL (0x656e7456),
-        ACE_NTOHL (0x61726961),
+        ACE_NTOHL (0x456e7669), 
+        ACE_NTOHL (0x726f6e6d), 
+        ACE_NTOHL (0x656e7456), 
+        ACE_NTOHL (0x61726961), 
         ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
         2, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         6,
-        ACE_NTOHL (0x76616c75),
+        ACE_NTOHL (0x76616c75), 
         ACE_NTOHL (0x65000000),  // name = value
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   18,
-  ACE_NTOHL (0x776f726b),
-  ACE_NTOHL (0x696e675f),
-  ACE_NTOHL (0x64697265),
-  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x776f726b), 
+  ACE_NTOHL (0x696e675f), 
+  ACE_NTOHL (0x64697265), 
+  ACE_NTOHL (0x63746f72), 
   ACE_NTOHL (0x79000000),  // name = working_directory
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   11,
-  ACE_NTOHL (0x61637469),
-  ACE_NTOHL (0x76617469),
+  ACE_NTOHL (0x61637469), 
+  ACE_NTOHL (0x76617469), 
   ACE_NTOHL (0x6f6e0000),  // name = activation
     CORBA::tk_enum, // typecode kind
   136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f416374),
-    ACE_NTOHL (0x69766174),
-    ACE_NTOHL (0x696f6e4d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f416374), 
+    ACE_NTOHL (0x69766174), 
+    ACE_NTOHL (0x696f6e4d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
     15,
-    ACE_NTOHL (0x41637469),
-    ACE_NTOHL (0x76617469),
-    ACE_NTOHL (0x6f6e4d6f),
+    ACE_NTOHL (0x41637469), 
+    ACE_NTOHL (0x76617469), 
+    ACE_NTOHL (0x6f6e4d6f), 
     ACE_NTOHL (0x64650000),  // name = ActivationMode
     4, // member count
     7,
-    ACE_NTOHL (0x4e4f524d),
+    ACE_NTOHL (0x4e4f524d), 
     ACE_NTOHL (0x414c0000),  // name = NORMAL
     7,
-    ACE_NTOHL (0x4d414e55),
+    ACE_NTOHL (0x4d414e55), 
     ACE_NTOHL (0x414c0000),  // name = MANUAL
     11,
-    ACE_NTOHL (0x5045525f),
-    ACE_NTOHL (0x434c4945),
+    ACE_NTOHL (0x5045525f), 
+    ACE_NTOHL (0x434c4945), 
     ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
     11,
-    ACE_NTOHL (0x4155544f),
-    ACE_NTOHL (0x5f535441),
+    ACE_NTOHL (0x4155544f), 
+    ACE_NTOHL (0x5f535441), 
     ACE_NTOHL (0x52540000),  // name = AUTO_START
-
+    
   10,
-  ACE_NTOHL (0x61637469),
-  ACE_NTOHL (0x7661746f),
+  ACE_NTOHL (0x61637469), 
+  ACE_NTOHL (0x7661746f), 
   ACE_NTOHL (0x72000000),  // name = activator
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -1357,10 +1357,10 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_StartupOptions;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 ImplementationRepository::StartupOptions::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1377,95 +1377,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
     18,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e000000),  // name = ServerInformation
   4, // member count
     15,
-  ACE_NTOHL (0x6c6f6769),
-  ACE_NTOHL (0x63616c5f),
-  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x6c6f6769), 
+  ACE_NTOHL (0x63616c5f), 
+  ACE_NTOHL (0x73657276), 
   ACE_NTOHL (0x65720000),  // name = logical_server
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   7,
-  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x73657276), 
   ACE_NTOHL (0x65720000),  // name = server
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   8,
-  ACE_NTOHL (0x73746172),
+  ACE_NTOHL (0x73746172), 
   ACE_NTOHL (0x74757000),  // name = startup
     CORBA::tk_struct, // typecode kind
   584, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f537461),
-    ACE_NTOHL (0x72747570),
-    ACE_NTOHL (0x4f707469),
-    ACE_NTOHL (0x6f6e733a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f537461), 
+    ACE_NTOHL (0x72747570), 
+    ACE_NTOHL (0x4f707469), 
+    ACE_NTOHL (0x6f6e733a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
         15,
-    ACE_NTOHL (0x53746172),
-    ACE_NTOHL (0x7475704f),
-    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x53746172), 
+    ACE_NTOHL (0x7475704f), 
+    ACE_NTOHL (0x7074696f), 
     ACE_NTOHL (0x6e730000),  // name = StartupOptions
     5, // member count
         13,
-    ACE_NTOHL (0x636f6d6d),
-    ACE_NTOHL (0x616e645f),
-    ACE_NTOHL (0x6c696e65),
+    ACE_NTOHL (0x636f6d6d), 
+    ACE_NTOHL (0x616e645f), 
+    ACE_NTOHL (0x6c696e65), 
     ACE_NTOHL (0x0),  // name = command_line
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
     12,
-    ACE_NTOHL (0x656e7669),
-    ACE_NTOHL (0x726f6e6d),
+    ACE_NTOHL (0x656e7669), 
+    ACE_NTOHL (0x726f6e6d), 
     ACE_NTOHL (0x656e7400),  // name = environment
         CORBA::tk_alias, // typecode kind for typedefs
     236, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       49,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f456e76),
-      ACE_NTOHL (0x69726f6e),
-      ACE_NTOHL (0x6d656e74),
-      ACE_NTOHL (0x4c697374),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f456e76), 
+      ACE_NTOHL (0x69726f6e), 
+      ACE_NTOHL (0x6d656e74), 
+      ACE_NTOHL (0x4c697374), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
             16,
-      ACE_NTOHL (0x456e7669),
-      ACE_NTOHL (0x726f6e6d),
-      ACE_NTOHL (0x656e744c),
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e744c), 
       ACE_NTOHL (0x69737400),  // name = EnvironmentList
             CORBA::tk_sequence, // typecode kind
       148, // encapsulation length
@@ -1474,120 +1474,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
         132, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           53,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f456e76),
-          ACE_NTOHL (0x69726f6e),
-          ACE_NTOHL (0x6d656e74),
-          ACE_NTOHL (0x56617269),
-          ACE_NTOHL (0x61626c65),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f456e76), 
+          ACE_NTOHL (0x69726f6e), 
+          ACE_NTOHL (0x6d656e74), 
+          ACE_NTOHL (0x56617269), 
+          ACE_NTOHL (0x61626c65), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
                     20,
-          ACE_NTOHL (0x456e7669),
-          ACE_NTOHL (0x726f6e6d),
-          ACE_NTOHL (0x656e7456),
-          ACE_NTOHL (0x61726961),
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e7456), 
+          ACE_NTOHL (0x61726961), 
           ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
           2, // member count
                     5,
-          ACE_NTOHL (0x6e616d65),
+          ACE_NTOHL (0x6e616d65), 
           ACE_NTOHL (0x0),  // name = name
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
           6,
-          ACE_NTOHL (0x76616c75),
+          ACE_NTOHL (0x76616c75), 
           ACE_NTOHL (0x65000000),  // name = value
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         0U,
 
 
     18,
-    ACE_NTOHL (0x776f726b),
-    ACE_NTOHL (0x696e675f),
-    ACE_NTOHL (0x64697265),
-    ACE_NTOHL (0x63746f72),
+    ACE_NTOHL (0x776f726b), 
+    ACE_NTOHL (0x696e675f), 
+    ACE_NTOHL (0x64697265), 
+    ACE_NTOHL (0x63746f72), 
     ACE_NTOHL (0x79000000),  // name = working_directory
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
     11,
-    ACE_NTOHL (0x61637469),
-    ACE_NTOHL (0x76617469),
+    ACE_NTOHL (0x61637469), 
+    ACE_NTOHL (0x76617469), 
     ACE_NTOHL (0x6f6e0000),  // name = activation
         CORBA::tk_enum, // typecode kind
     136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
       48,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f416374),
-      ACE_NTOHL (0x69766174),
-      ACE_NTOHL (0x696f6e4d),
-      ACE_NTOHL (0x6f64653a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f416374), 
+      ACE_NTOHL (0x69766174), 
+      ACE_NTOHL (0x696f6e4d), 
+      ACE_NTOHL (0x6f64653a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
       15,
-      ACE_NTOHL (0x41637469),
-      ACE_NTOHL (0x76617469),
-      ACE_NTOHL (0x6f6e4d6f),
+      ACE_NTOHL (0x41637469), 
+      ACE_NTOHL (0x76617469), 
+      ACE_NTOHL (0x6f6e4d6f), 
       ACE_NTOHL (0x64650000),  // name = ActivationMode
       4, // member count
       7,
-      ACE_NTOHL (0x4e4f524d),
+      ACE_NTOHL (0x4e4f524d), 
       ACE_NTOHL (0x414c0000),  // name = NORMAL
       7,
-      ACE_NTOHL (0x4d414e55),
+      ACE_NTOHL (0x4d414e55), 
       ACE_NTOHL (0x414c0000),  // name = MANUAL
       11,
-      ACE_NTOHL (0x5045525f),
-      ACE_NTOHL (0x434c4945),
+      ACE_NTOHL (0x5045525f), 
+      ACE_NTOHL (0x434c4945), 
       ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
       11,
-      ACE_NTOHL (0x4155544f),
-      ACE_NTOHL (0x5f535441),
+      ACE_NTOHL (0x4155544f), 
+      ACE_NTOHL (0x5f535441), 
       ACE_NTOHL (0x52540000),  // name = AUTO_START
-
+      
     10,
-    ACE_NTOHL (0x61637469),
-    ACE_NTOHL (0x7661746f),
+    ACE_NTOHL (0x61637469), 
+    ACE_NTOHL (0x7661746f), 
     ACE_NTOHL (0x72000000),  // name = activator
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   9,
-  ACE_NTOHL (0x6c6f6361),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x6c6f6361), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = location
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f416464),
-    ACE_NTOHL (0x72657373),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f416464), 
+    ACE_NTOHL (0x72657373), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
         8,
-    ACE_NTOHL (0x41646472),
+    ACE_NTOHL (0x41646472), 
     ACE_NTOHL (0x65737300),  // name = Address
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -1606,10 +1606,10 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_ServerInformation;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 ImplementationRepository::ServerInformation::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1619,7 +1619,7 @@ ImplementationRepository::ServerInformation::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
@@ -1679,26 +1679,26 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e4c69),
-  ACE_NTOHL (0x73743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e4c69), 
+  ACE_NTOHL (0x73743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0
     22,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e4c6973),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x74000000),  // name = ServerInformationList
     CORBA::tk_sequence, // typecode kind
   852, // encapsulation length
@@ -1707,95 +1707,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
     836, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       51,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f536572),
-      ACE_NTOHL (0x76657249),
-      ACE_NTOHL (0x6e666f72),
-      ACE_NTOHL (0x6d617469),
-      ACE_NTOHL (0x6f6e3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f536572), 
+      ACE_NTOHL (0x76657249), 
+      ACE_NTOHL (0x6e666f72), 
+      ACE_NTOHL (0x6d617469), 
+      ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
             18,
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x6572496e),
-      ACE_NTOHL (0x666f726d),
-      ACE_NTOHL (0x6174696f),
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x6572496e), 
+      ACE_NTOHL (0x666f726d), 
+      ACE_NTOHL (0x6174696f), 
       ACE_NTOHL (0x6e000000),  // name = ServerInformation
       4, // member count
             15,
-      ACE_NTOHL (0x6c6f6769),
-      ACE_NTOHL (0x63616c5f),
-      ACE_NTOHL (0x73657276),
+      ACE_NTOHL (0x6c6f6769), 
+      ACE_NTOHL (0x63616c5f), 
+      ACE_NTOHL (0x73657276), 
       ACE_NTOHL (0x65720000),  // name = logical_server
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       7,
-      ACE_NTOHL (0x73657276),
+      ACE_NTOHL (0x73657276), 
       ACE_NTOHL (0x65720000),  // name = server
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       8,
-      ACE_NTOHL (0x73746172),
+      ACE_NTOHL (0x73746172), 
       ACE_NTOHL (0x74757000),  // name = startup
             CORBA::tk_struct, // typecode kind
       584, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         48,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f537461),
-        ACE_NTOHL (0x72747570),
-        ACE_NTOHL (0x4f707469),
-        ACE_NTOHL (0x6f6e733a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f537461), 
+        ACE_NTOHL (0x72747570), 
+        ACE_NTOHL (0x4f707469), 
+        ACE_NTOHL (0x6f6e733a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
                 15,
-        ACE_NTOHL (0x53746172),
-        ACE_NTOHL (0x7475704f),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x53746172), 
+        ACE_NTOHL (0x7475704f), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = StartupOptions
         5, // member count
                 13,
-        ACE_NTOHL (0x636f6d6d),
-        ACE_NTOHL (0x616e645f),
-        ACE_NTOHL (0x6c696e65),
+        ACE_NTOHL (0x636f6d6d), 
+        ACE_NTOHL (0x616e645f), 
+        ACE_NTOHL (0x6c696e65), 
         ACE_NTOHL (0x0),  // name = command_line
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         12,
-        ACE_NTOHL (0x656e7669),
-        ACE_NTOHL (0x726f6e6d),
+        ACE_NTOHL (0x656e7669), 
+        ACE_NTOHL (0x726f6e6d), 
         ACE_NTOHL (0x656e7400),  // name = environment
                 CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           49,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f456e76),
-          ACE_NTOHL (0x69726f6e),
-          ACE_NTOHL (0x6d656e74),
-          ACE_NTOHL (0x4c697374),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f456e76), 
+          ACE_NTOHL (0x69726f6e), 
+          ACE_NTOHL (0x6d656e74), 
+          ACE_NTOHL (0x4c697374), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
                     16,
-          ACE_NTOHL (0x456e7669),
-          ACE_NTOHL (0x726f6e6d),
-          ACE_NTOHL (0x656e744c),
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e744c), 
           ACE_NTOHL (0x69737400),  // name = EnvironmentList
                     CORBA::tk_sequence, // typecode kind
           148, // encapsulation length
@@ -1804,120 +1804,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
             132, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               53,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x496d706c),
-              ACE_NTOHL (0x656d656e),
-              ACE_NTOHL (0x74617469),
-              ACE_NTOHL (0x6f6e5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x2f456e76),
-              ACE_NTOHL (0x69726f6e),
-              ACE_NTOHL (0x6d656e74),
-              ACE_NTOHL (0x56617269),
-              ACE_NTOHL (0x61626c65),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x496d706c), 
+              ACE_NTOHL (0x656d656e), 
+              ACE_NTOHL (0x74617469), 
+              ACE_NTOHL (0x6f6e5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x2f456e76), 
+              ACE_NTOHL (0x69726f6e), 
+              ACE_NTOHL (0x6d656e74), 
+              ACE_NTOHL (0x56617269), 
+              ACE_NTOHL (0x61626c65), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
                             20,
-              ACE_NTOHL (0x456e7669),
-              ACE_NTOHL (0x726f6e6d),
-              ACE_NTOHL (0x656e7456),
-              ACE_NTOHL (0x61726961),
+              ACE_NTOHL (0x456e7669), 
+              ACE_NTOHL (0x726f6e6d), 
+              ACE_NTOHL (0x656e7456), 
+              ACE_NTOHL (0x61726961), 
               ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
               2, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
               6,
-              ACE_NTOHL (0x76616c75),
+              ACE_NTOHL (0x76616c75), 
               ACE_NTOHL (0x65000000),  // name = value
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             0U,
 
 
         18,
-        ACE_NTOHL (0x776f726b),
-        ACE_NTOHL (0x696e675f),
-        ACE_NTOHL (0x64697265),
-        ACE_NTOHL (0x63746f72),
+        ACE_NTOHL (0x776f726b), 
+        ACE_NTOHL (0x696e675f), 
+        ACE_NTOHL (0x64697265), 
+        ACE_NTOHL (0x63746f72), 
         ACE_NTOHL (0x79000000),  // name = working_directory
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         11,
-        ACE_NTOHL (0x61637469),
-        ACE_NTOHL (0x76617469),
+        ACE_NTOHL (0x61637469), 
+        ACE_NTOHL (0x76617469), 
         ACE_NTOHL (0x6f6e0000),  // name = activation
                 CORBA::tk_enum, // typecode kind
         136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           48,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f416374),
-          ACE_NTOHL (0x69766174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f416374), 
+          ACE_NTOHL (0x69766174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
           15,
-          ACE_NTOHL (0x41637469),
-          ACE_NTOHL (0x76617469),
-          ACE_NTOHL (0x6f6e4d6f),
+          ACE_NTOHL (0x41637469), 
+          ACE_NTOHL (0x76617469), 
+          ACE_NTOHL (0x6f6e4d6f), 
           ACE_NTOHL (0x64650000),  // name = ActivationMode
           4, // member count
           7,
-          ACE_NTOHL (0x4e4f524d),
+          ACE_NTOHL (0x4e4f524d), 
           ACE_NTOHL (0x414c0000),  // name = NORMAL
           7,
-          ACE_NTOHL (0x4d414e55),
+          ACE_NTOHL (0x4d414e55), 
           ACE_NTOHL (0x414c0000),  // name = MANUAL
           11,
-          ACE_NTOHL (0x5045525f),
-          ACE_NTOHL (0x434c4945),
+          ACE_NTOHL (0x5045525f), 
+          ACE_NTOHL (0x434c4945), 
           ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
           11,
-          ACE_NTOHL (0x4155544f),
-          ACE_NTOHL (0x5f535441),
+          ACE_NTOHL (0x4155544f), 
+          ACE_NTOHL (0x5f535441), 
           ACE_NTOHL (0x52540000),  // name = AUTO_START
-
+          
         10,
-        ACE_NTOHL (0x61637469),
-        ACE_NTOHL (0x7661746f),
+        ACE_NTOHL (0x61637469), 
+        ACE_NTOHL (0x7661746f), 
         ACE_NTOHL (0x72000000),  // name = activator
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       9,
-      ACE_NTOHL (0x6c6f6361),
-      ACE_NTOHL (0x74696f6e),
+      ACE_NTOHL (0x6c6f6361), 
+      ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = location
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         41,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f416464),
-        ACE_NTOHL (0x72657373),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f416464), 
+        ACE_NTOHL (0x72657373), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
                 8,
-        ACE_NTOHL (0x41646472),
+        ACE_NTOHL (0x41646472), 
         ACE_NTOHL (0x65737300),  // name = Address
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -1946,7 +1946,7 @@ namespace ImplementationRepository
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::Administration_ptr
-TAO::Objref_Traits<ImplementationRepository::Administration>::duplicate (
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_duplicate (
     ImplementationRepository::Administration_ptr p
   )
 {
@@ -1955,7 +1955,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<ImplementationRepository::Administration>::release (
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_release (
     ImplementationRepository::Administration_ptr p
   )
 {
@@ -1964,14 +1964,14 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::Administration_ptr
-TAO::Objref_Traits<ImplementationRepository::Administration>::nil (void)
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_nil (void)
 {
   return ImplementationRepository::Administration::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::Administration>::marshal (
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_marshal (
     ImplementationRepository::Administration_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1980,7 +1980,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2002,37 +2002,37 @@ void ImplementationRepository::Administration::activate_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       },
-
+      
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
         ImplementationRepository::CannotActivate::_alloc,
         ImplementationRepository::_tc_CannotActivate
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2041,7 +2041,7 @@ void ImplementationRepository::Administration::activate_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_activate_server_exceptiondata,
       2
@@ -2068,39 +2068,39 @@ char * ImplementationRepository::Administration::activate_server_with_startup (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< CORBA::Long>::in_arg_val _tao_check_startup (check_startup);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_check_startup
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       },
-
+      
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
         ImplementationRepository::CannotActivate::_alloc,
         ImplementationRepository::_tc_CannotActivate
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2109,14 +2109,14 @@ char * ImplementationRepository::Administration::activate_server_with_startup (
       28,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata,
       2
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -2138,39 +2138,39 @@ void ImplementationRepository::Administration::register_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_options
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_register_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/AlreadyRegistered:1.0",
         ImplementationRepository::AlreadyRegistered::_alloc,
         ImplementationRepository::_tc_AlreadyRegistered
       },
-
+      
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2179,7 +2179,7 @@ void ImplementationRepository::Administration::register_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_register_server_exceptiondata,
       2
@@ -2206,39 +2206,39 @@ void ImplementationRepository::Administration::reregister_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_options
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_reregister_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_reregister_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/AlreadyRegistered:1.0",
         ImplementationRepository::AlreadyRegistered::_alloc,
         ImplementationRepository::_tc_AlreadyRegistered
       },
-
+      
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2247,7 +2247,7 @@ void ImplementationRepository::Administration::reregister_server (
       17,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_reregister_server_exceptiondata,
       2
@@ -2272,23 +2272,23 @@ void ImplementationRepository::Administration::remove_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2296,7 +2296,7 @@ void ImplementationRepository::Administration::remove_server (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2305,7 +2305,7 @@ void ImplementationRepository::Administration::remove_server (
       13,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_remove_server_exceptiondata,
       1
@@ -2330,23 +2330,23 @@ void ImplementationRepository::Administration::shutdown_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2354,7 +2354,7 @@ void ImplementationRepository::Administration::shutdown_server (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2363,7 +2363,7 @@ void ImplementationRepository::Administration::shutdown_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata,
       1
@@ -2390,17 +2390,17 @@ void ImplementationRepository::Administration::server_is_running (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val _tao_addr (addr);
   TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -2408,9 +2408,9 @@ void ImplementationRepository::Administration::server_is_running (
       &_tao_addr,
       &_tao_server_object
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2418,7 +2418,7 @@ void ImplementationRepository::Administration::server_is_running (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2427,7 +2427,7 @@ void ImplementationRepository::Administration::server_is_running (
       17,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_running_exceptiondata,
       1
@@ -2452,23 +2452,23 @@ void ImplementationRepository::Administration::server_is_shutting_down (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2476,7 +2476,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2485,7 +2485,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
       23,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata,
       1
@@ -2511,25 +2511,25 @@ void ImplementationRepository::Administration::find (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_info
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_find_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2537,7 +2537,7 @@ void ImplementationRepository::Administration::find (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2546,7 +2546,7 @@ void ImplementationRepository::Administration::find (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_find_exceptiondata,
       1
@@ -2572,17 +2572,17 @@ void ImplementationRepository::Administration::list (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator (server_iterator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -2590,7 +2590,7 @@ void ImplementationRepository::Administration::list (
       &_tao_server_list,
       &_tao_server_iterator
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2599,7 +2599,7 @@ void ImplementationRepository::Administration::list (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2618,19 +2618,19 @@ void ImplementationRepository::Administration::shutdown_repo (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2639,7 +2639,7 @@ void ImplementationRepository::Administration::shutdown_repo (
       13,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2660,23 +2660,23 @@ char * ImplementationRepository::Administration::find_ior (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_object_name (object_name);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_object_name
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_find_ior_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_find_ior_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2684,7 +2684,7 @@ char * ImplementationRepository::Administration::find_ior (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2693,14 +2693,14 @@ char * ImplementationRepository::Administration::find_ior (
       8,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_find_ior_exceptiondata,
       1
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -2723,7 +2723,7 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio
 ImplementationRepository::Administration::~Administration (void)
 {}
 
-void
+void 
 ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
   Administration *_tao_tmp_pointer =
@@ -2768,7 +2768,7 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2818,22 +2818,22 @@ static const CORBA::Long _oc_ImplementationRepository_Administration[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f41646d),
-  ACE_NTOHL (0x696e6973),
-  ACE_NTOHL (0x74726174),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f41646d), 
+  ACE_NTOHL (0x696e6973), 
+  ACE_NTOHL (0x74726174), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Administration:1.0
     15,
-  ACE_NTOHL (0x41646d69),
-  ACE_NTOHL (0x6e697374),
-  ACE_NTOHL (0x72617469),
+  ACE_NTOHL (0x41646d69), 
+  ACE_NTOHL (0x6e697374), 
+  ACE_NTOHL (0x72617469), 
   ACE_NTOHL (0x6f6e0000),  // name = Administration
   };
 
@@ -2858,7 +2858,7 @@ namespace ImplementationRepository
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::ServerInformationIterator_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplicate (
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_duplicate (
     ImplementationRepository::ServerInformationIterator_ptr p
   )
 {
@@ -2867,7 +2867,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplica
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release (
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_release (
     ImplementationRepository::ServerInformationIterator_ptr p
   )
 {
@@ -2876,14 +2876,14 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::ServerInformationIterator_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::nil (void)
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_nil (void)
 {
   return ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal (
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_marshal (
     ImplementationRepository::ServerInformationIterator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2892,7 +2892,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2913,23 +2913,23 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   TAO::Arg_Traits< CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_how_many,
       &_tao_server_list
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2938,10 +2938,10 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
       6,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -2959,19 +2959,19 @@ void ImplementationRepository::ServerInformationIterator::destroy (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2980,7 +2980,7 @@ void ImplementationRepository::ServerInformationIterator::destroy (
       7,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3004,7 +3004,7 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se
 ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {}
 
-void
+void 
 ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformationIterator *_tao_tmp_pointer =
@@ -3049,7 +3049,7 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -3099,28 +3099,28 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e4974),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x6f723a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e4974), 
+  ACE_NTOHL (0x65726174), 
+  ACE_NTOHL (0x6f723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0
     26,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e497465),
-  ACE_NTOHL (0x7261746f),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e497465), 
+  ACE_NTOHL (0x7261746f), 
   ACE_NTOHL (0x72000000),  // name = ServerInformationIterator
   };
 
@@ -3193,7 +3193,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -3203,12 +3203,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_val
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -3219,7 +3219,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_val
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -3278,7 +3278,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -3288,12 +3288,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -3304,7 +3304,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -3363,7 +3363,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -3373,12 +3373,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -3389,7 +3389,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value (
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -3448,7 +3448,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3506,7 +3506,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3588,11 +3588,11 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
         _tao_any,
         ImplementationRepository::_tc_ActivationMode,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3650,7 +3650,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3708,7 +3708,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3894,21 +3894,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::ImplementationRepository::ServerObject RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -4048,20 +4048,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -4071,7 +4071,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -4081,28 +4081,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
@@ -4121,12 +4121,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::Activat
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = static_cast<ImplementationRepository::ActivationMode> (_tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -4198,20 +4198,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -4221,7 +4221,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -4231,28 +4231,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
@@ -4276,21 +4276,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -4312,21 +4312,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -4362,7 +4362,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         ImplementationRepository::ServerObject
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         ImplementationRepository::ServerObject
@@ -4604,7 +4604,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         ImplementationRepository::ServerInformationIterator
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         ImplementationRepository::ServerInformationIterator
@@ -4651,7 +4651,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         ImplementationRepository::Administration
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         ImplementationRepository::Administration
@@ -4696,7 +4696,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         ImplementationRepository::ServerObject
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         ImplementationRepository::ServerObject
@@ -4938,7 +4938,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         ImplementationRepository::ServerInformationIterator
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         ImplementationRepository::ServerInformationIterator
@@ -4985,7 +4985,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         ImplementationRepository::Administration
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         ImplementationRepository::Administration
@@ -5001,4 +5001,5 @@ CORBA::Boolean operator>> (
         ImplementationRepository::Administration \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 099445a71e4..dcbe6abf993 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -49,7 +49,6 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
-#include "tao/SystemException.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -74,13 +73,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -90,22 +89,22 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_
-
+  
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerObject
       >
     ServerObject_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerObject
@@ -113,13 +112,13 @@ namespace ImplementationRepository
     ServerObject_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
-
+  
   class TAO_PortableServer_Export ServerObject
     : public virtual CORBA::Object
   {
@@ -127,74 +126,74 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<ServerObject>;
     typedef ServerObject_ptr _ptr_type;
     typedef ServerObject_var _var_type;
-
+    
     // The static operations.
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
-
+    
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerObject_ptr _nil (void)
     {
       return (ServerObject_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     ServerObject (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerObject_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     ServerObject (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     ServerObject (
         TAO_Stub *objref,
@@ -202,41 +201,41 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~ServerObject (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerObject (const ServerObject &);
-
+    
     void operator= (const ServerObject &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
-
+  
   class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
   {
   public:
-
+    
     AlreadyRegistered (void);
     AlreadyRegistered (const AlreadyRegistered &);
     ~AlreadyRegistered (void);
 
     AlreadyRegistered &operator= (const AlreadyRegistered &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static AlreadyRegistered *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -248,44 +247,44 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
-
+  
   class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
   {
   public:
-
+    
     TAO_String_Manager reason;
     CannotActivate (void);
     CannotActivate (const CannotActivate &);
     ~CannotActivate (void);
 
     CannotActivate &operator= (const CannotActivate &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static CannotActivate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -297,50 +296,50 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     CannotActivate (
         const char * _tao_reason
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
-
+  
   class TAO_PortableServer_Export NotFound : public CORBA::UserException
   {
   public:
-
+    
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -352,87 +351,87 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
-
+  
   struct EnvironmentVariable;
-
+  
   typedef
     TAO_Var_Var_T<
         EnvironmentVariable
       >
     EnvironmentVariable_var;
-
+  
   typedef
     TAO_Out_T<
         EnvironmentVariable,
         EnvironmentVariable_var
       >
     EnvironmentVariable_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_PortableServer_Export EnvironmentVariable
   {
     typedef EnvironmentVariable_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager value;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentVariable;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:376
-
+  
   typedef char * Address;
   typedef CORBA::String_var Address_var;
   typedef CORBA::String_out Address_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-
+  
   class EnvironmentList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         EnvironmentList,
         EnvironmentVariable
       >
     EnvironmentList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         EnvironmentList,
@@ -440,7 +439,7 @@ namespace ImplementationRepository
         EnvironmentVariable
       >
     EnvironmentList_out;
-
+  
   class TAO_PortableServer_Export EnvironmentList
     : public
         TAO_Unbounded_Sequence<
@@ -453,27 +452,27 @@ namespace ImplementationRepository
     EnvironmentList (
         CORBA::ULong max,
         CORBA::ULong length,
-        EnvironmentVariable* buffer,
+        EnvironmentVariable* buffer, 
         CORBA::Boolean release = 0
       );
     EnvironmentList (const EnvironmentList &);
     ~EnvironmentList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef EnvironmentList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentList;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum ActivationMode
   {
     NORMAL,
@@ -481,39 +480,39 @@ namespace ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
-
+  
   typedef ActivationMode &ActivationMode_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ActivationMode;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
-
+  
   struct StartupOptions;
-
+  
   typedef
     TAO_Var_Var_T<
         StartupOptions
       >
     StartupOptions_var;
-
+  
   typedef
     TAO_Out_T<
         StartupOptions,
         StartupOptions_var
       >
     StartupOptions_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_PortableServer_Export StartupOptions
   {
     typedef StartupOptions_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager command_line;
     ImplementationRepository::EnvironmentList environment;
@@ -521,64 +520,64 @@ namespace ImplementationRepository
     ImplementationRepository::ActivationMode activation;
     TAO_String_Manager activator;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StartupOptions;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
-
+  
   struct ServerInformation;
-
+  
   typedef
     TAO_Var_Var_T<
         ServerInformation
       >
     ServerInformation_var;
-
+  
   typedef
     TAO_Out_T<
         ServerInformation,
         ServerInformation_var
       >
     ServerInformation_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_PortableServer_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager logical_server;
     TAO_String_Manager server;
     ImplementationRepository::StartupOptions startup;
     TAO_String_Manager location;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-
+  
   class ServerInformationList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ServerInformationList,
         ServerInformation
       >
     ServerInformationList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ServerInformationList,
@@ -586,7 +585,7 @@ namespace ImplementationRepository
         ServerInformation
       >
     ServerInformationList_out;
-
+  
   class TAO_PortableServer_Export ServerInformationList
     : public
         TAO_Unbounded_Sequence<
@@ -599,39 +598,39 @@ namespace ImplementationRepository
     ServerInformationList (
         CORBA::ULong max,
         CORBA::ULong length,
-        ServerInformation* buffer,
+        ServerInformation* buffer, 
         CORBA::Boolean release = 0
       );
     ServerInformationList (const ServerInformationList &);
     ~ServerInformationList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ServerInformationList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationList;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_
-
+  
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerInformationIterator
       >
     ServerInformationIterator_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerInformationIterator
@@ -639,22 +638,22 @@ namespace ImplementationRepository
     ServerInformationIterator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_
-
+  
   class Administration;
   typedef Administration *Administration_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Administration
       >
     Administration_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Administration
@@ -662,13 +661,13 @@ namespace ImplementationRepository
     Administration_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
-
+  
   class TAO_PortableServer_Export Administration
     : public virtual CORBA::Object
   {
@@ -676,30 +675,30 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<Administration>;
     typedef Administration_ptr _ptr_type;
     typedef Administration_var _var_type;
-
+    
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
-
+    
     static Administration_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Administration_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Administration_ptr _nil (void)
     {
       return (Administration_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -709,10 +708,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * activate_server_with_startup (
         const char * server,
         ::CORBA::Long check_startup
@@ -723,10 +722,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void register_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -737,10 +736,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void reregister_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -751,10 +750,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -763,10 +762,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -775,10 +774,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void server_is_running (
         const char * server,
         const char * addr,
@@ -789,10 +788,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -801,10 +800,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void find (
         const char * server,
         ::ImplementationRepository::ServerInformation_out info
@@ -814,10 +813,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -827,20 +826,20 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void shutdown_repo (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * find_ior (
         const char * object_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -849,34 +848,34 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Administration (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Administration_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Administration (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Administration (
         TAO_Stub *objref,
@@ -884,29 +883,29 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Administration (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Administration (const Administration &);
-
+    
     void operator= (const Administration &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-
+  
   class TAO_PortableServer_Export ServerInformationIterator
     : public virtual CORBA::Object
   {
@@ -914,30 +913,30 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<ServerInformationIterator>;
     typedef ServerInformationIterator_ptr _ptr_type;
     typedef ServerInformationIterator_var _var_type;
-
+    
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-
+    
     static ServerInformationIterator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerInformationIterator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerInformationIterator_ptr _nil (void)
     {
       return (ServerInformationIterator_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list
@@ -946,44 +945,44 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     ServerInformationIterator (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     ServerInformationIterator (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     ServerInformationIterator (
         TAO_Stub *objref,
@@ -991,21 +990,21 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~ServerInformationIterator (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerInformationIterator (const ServerInformationIterator &);
-
+    
     void operator= (const ServerInformationIterator &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator;
 
 // TAO_IDL - Generated from
@@ -1045,18 +1044,18 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::ServerObject>
   {
-    static ImplementationRepository::ServerObject_ptr duplicate (
+    static ImplementationRepository::ServerObject_ptr tao_duplicate (
         ImplementationRepository::ServerObject_ptr
       );
-    static void release (
+    static void tao_release (
         ImplementationRepository::ServerObject_ptr
       );
-    static ImplementationRepository::ServerObject_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ImplementationRepository::ServerObject_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         ImplementationRepository::ServerObject_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1066,18 +1065,18 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::ServerInformationIterator>
   {
-    static ImplementationRepository::ServerInformationIterator_ptr duplicate (
+    static ImplementationRepository::ServerInformationIterator_ptr tao_duplicate (
         ImplementationRepository::ServerInformationIterator_ptr
       );
-    static void release (
+    static void tao_release (
         ImplementationRepository::ServerInformationIterator_ptr
       );
-    static ImplementationRepository::ServerInformationIterator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ImplementationRepository::ServerInformationIterator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         ImplementationRepository::ServerInformationIterator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1087,18 +1086,18 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::Administration>
   {
-    static ImplementationRepository::Administration_ptr duplicate (
+    static ImplementationRepository::Administration_ptr tao_duplicate (
         ImplementationRepository::Administration_ptr
       );
-    static void release (
+    static void tao_release (
         ImplementationRepository::Administration_ptr
       );
-    static ImplementationRepository::Administration_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ImplementationRepository::Administration_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         ImplementationRepository::Administration_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1296,7 +1295,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:976
 
 #if defined (__ACE_INLINE__)
-#include "ImplRepoC.inl"
+#include "ImplRepoC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -1310,3 +1309,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
new file mode 100644
index 00000000000..36cc19fe639
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -0,0 +1,136 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
+
+ACE_INLINE
+ImplementationRepository::ServerObject::ServerObject (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
+    the_TAO_ServerObject_Proxy_Broker_ (0)
+{
+  this->ImplementationRepository_ServerObject_setup_collocation ();
+}
+
+ACE_INLINE
+ImplementationRepository::ServerObject::ServerObject (
+    IOP::IOR *ior,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_ServerObject_Proxy_Broker_ (0)
+{
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
+#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
+
+ACE_INLINE
+ImplementationRepository::Administration::Administration (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
+    the_TAO_Administration_Proxy_Broker_ (0)
+{
+  this->ImplementationRepository_Administration_setup_collocation ();
+}
+
+ACE_INLINE
+ImplementationRepository::Administration::Administration (
+    IOP::IOR *ior,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_Administration_Proxy_Broker_ (0)
+{
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
+
+ACE_INLINE
+ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
+    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
+{
+  this->ImplementationRepository_ServerInformationIterator_setup_collocation ();
+}
+
+ACE_INLINE
+ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
+    IOP::IOR *ior,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
+{
+}
+
+#endif /* end #if !defined */
+
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index ebc7d0a163e..033fa1df0b4 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:629
 
 #ifndef _TAO_IDL_IMPLREPOS_CPP_
@@ -67,7 +67,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ImplRepoS.inl"
+#include "ImplRepoS.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -79,7 +79,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -93,13 +93,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -112,13 +112,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -131,13 +131,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -153,7 +153,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index a7fc6e3a573..f3d282459c7 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -59,109 +59,109 @@
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-
+  
   class _TAO_ServerObject_ThruPOA_Proxy_Impl;
   class _TAO_ServerObject_Direct_Proxy_Impl;
   class _TAO_ServerObject_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerObject
     : public virtual PortableServer::ServantBase
   {
   protected:
     ServerObject (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::ServerObject _stub_type;
     typedef ::ImplementationRepository::ServerObject_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::ServerObject_var _stub_var_type;
-
+    
     ServerObject (const ServerObject& rhs);
     virtual ~ServerObject (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::ServerObject *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void ping_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void shutdown_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -169,29 +169,29 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerObject_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -204,33 +204,33 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_ServerObject_Strategized_Proxy_Broker *
     the_TAO_ServerObject_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     ping (
         TAO_Abstract_ServantBase *servant,
@@ -241,10 +241,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown (
         TAO_Abstract_ServantBase *servant,
@@ -256,28 +256,28 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl
   {
   public:
     _TAO_ServerObject_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     ping (
         TAO_Abstract_ServantBase *servant,
@@ -288,10 +288,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown (
         TAO_Abstract_ServantBase *servant,
@@ -303,90 +303,90 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
-
+  
+  
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class Administration;
   typedef Administration *Administration_ptr;
-
+  
   class _TAO_Administration_ThruPOA_Proxy_Impl;
   class _TAO_Administration_Direct_Proxy_Impl;
   class _TAO_Administration_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Administration
     : public virtual PortableServer::ServantBase
   {
   protected:
     Administration (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::Administration _stub_type;
     typedef ::ImplementationRepository::Administration_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::Administration_var _stub_var_type;
-
+    
     Administration (const Administration& rhs);
     virtual ~Administration (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::Administration *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -396,17 +396,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       )) = 0;
-
+    
     static void activate_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual char * activate_server_with_startup (
         const char * server,
         ::CORBA::Long check_startup
@@ -417,17 +417,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       )) = 0;
-
+    
     static void activate_server_with_startup_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void register_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -438,17 +438,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void register_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void reregister_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -459,17 +459,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void reregister_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -478,17 +478,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void remove_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -497,17 +497,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void shutdown_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void server_is_running (
         const char * server,
         const char * addr,
@@ -518,17 +518,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void server_is_running_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -537,17 +537,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void server_is_shutting_down_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void find (
         const char * server,
         ::ImplementationRepository::ServerInformation_out info
@@ -557,17 +557,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void find_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -577,34 +577,34 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void list_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void shutdown_repo (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void shutdown_repo_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual char * find_ior (
         const char * object_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -613,7 +613,7 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void find_ior_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -621,29 +621,29 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Administration_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Administration_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -656,33 +656,33 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_Administration_Strategized_Proxy_Broker *
     the_TAO_Administration_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_Administration_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server (
         TAO_Abstract_ServantBase *servant,
@@ -695,10 +695,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server_with_startup (
         TAO_Abstract_ServantBase *servant,
@@ -711,10 +711,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     register_server (
         TAO_Abstract_ServantBase *servant,
@@ -727,10 +727,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     reregister_server (
         TAO_Abstract_ServantBase *servant,
@@ -743,10 +743,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     remove_server (
         TAO_Abstract_ServantBase *servant,
@@ -758,10 +758,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_server (
         TAO_Abstract_ServantBase *servant,
@@ -773,10 +773,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_running (
         TAO_Abstract_ServantBase *servant,
@@ -788,10 +788,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_shutting_down (
         TAO_Abstract_ServantBase *servant,
@@ -803,10 +803,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find (
         TAO_Abstract_ServantBase *servant,
@@ -818,10 +818,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     list (
         TAO_Abstract_ServantBase *servant,
@@ -832,10 +832,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_repo (
         TAO_Abstract_ServantBase *servant,
@@ -846,10 +846,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find_ior (
         TAO_Abstract_ServantBase *servant,
@@ -862,28 +862,28 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
   class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl
   {
   public:
     _TAO_Administration_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Administration_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server (
         TAO_Abstract_ServantBase *servant,
@@ -896,10 +896,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server_with_startup (
         TAO_Abstract_ServantBase *servant,
@@ -912,10 +912,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     register_server (
         TAO_Abstract_ServantBase *servant,
@@ -928,10 +928,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     reregister_server (
         TAO_Abstract_ServantBase *servant,
@@ -944,10 +944,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     remove_server (
         TAO_Abstract_ServantBase *servant,
@@ -959,10 +959,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_server (
         TAO_Abstract_ServantBase *servant,
@@ -974,10 +974,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_running (
         TAO_Abstract_ServantBase *servant,
@@ -989,10 +989,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_shutting_down (
         TAO_Abstract_ServantBase *servant,
@@ -1004,10 +1004,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find (
         TAO_Abstract_ServantBase *servant,
@@ -1019,10 +1019,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     list (
         TAO_Abstract_ServantBase *servant,
@@ -1033,10 +1033,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_repo (
         TAO_Abstract_ServantBase *servant,
@@ -1047,10 +1047,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find_ior (
         TAO_Abstract_ServantBase *servant,
@@ -1063,90 +1063,90 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
-
+  
+  
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-
+  
   class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
   class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
   class _TAO_ServerInformationIterator_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerInformationIterator
     : public virtual PortableServer::ServantBase
   {
   protected:
     ServerInformationIterator (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::ServerInformationIterator _stub_type;
     typedef ::ImplementationRepository::ServerInformationIterator_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::ServerInformationIterator_var _stub_var_type;
-
+    
     ServerInformationIterator (const ServerInformationIterator& rhs);
     virtual ~ServerInformationIterator (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::ServerInformationIterator *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list
@@ -1155,24 +1155,24 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void next_n_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void destroy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -1180,29 +1180,29 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -1215,33 +1215,33 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_ServerInformationIterator_Strategized_Proxy_Broker *
     the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     next_n (
         TAO_Abstract_ServantBase *servant,
@@ -1252,10 +1252,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -1267,28 +1267,28 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     next_n (
         TAO_Abstract_ServantBase *servant,
@@ -1299,10 +1299,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -1314,24 +1314,24 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 
 // TAO_IDL - Generated from
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 } // module ImplementationRepository
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1012
 
 
 #if defined (__ACE_INLINE__)
-#include "ImplRepoS.inl"
+#include "ImplRepoS.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/PortableServer/ImplRepoS.i b/TAO/tao/PortableServer/ImplRepoS.i
new file mode 100644
index 00000000000..1d2df31bd57
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplRepoS.i
@@ -0,0 +1,26 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
new file mode 100644
index 00000000000..d34fb729be7
--- /dev/null
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
@@ -0,0 +1,102 @@
+#include "ObjectReferenceTemplate.h"
+#include "POA.h"
+
+#include "tao/CORBA_String.h"
+#include "tao/ORB_Constants.h"
+
+
+ACE_RCSID (PortableServer,
+           ObjectReferenceTemplate,
+           "$Id$")
+
+
+#if !defined (__ACE_INLINE__)
+# include "ObjectReferenceTemplate.inl"
+#endif /* ! __ACE_INLINE__ */
+
+
+TAO_ObjectReferenceTemplate::TAO_ObjectReferenceTemplate (
+  const char *server_id,
+  const char *orb_id,
+  TAO_POA * poa)
+  : server_id_ (server_id),
+    orb_id_ (orb_id),
+    poa_ (poa)
+{
+}
+
+TAO_ObjectReferenceTemplate::~TAO_ObjectReferenceTemplate (void)
+{
+}
+
+char *
+TAO_ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return CORBA::string_dup (this->server_id_);
+}
+
+char *
+TAO_ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return CORBA::string_dup (this->orb_id_);
+}
+
+PortableInterceptor::AdapterName *
+TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableInterceptor::AdapterName *adapter_name = 0;
+
+  if (this->adapter_name_ != 0)
+    {
+      ACE_NEW_THROW_EX (adapter_name,
+                        PortableInterceptor::AdapterName (
+                          *(this->adapter_name_)),
+                        CORBA::NO_MEMORY (
+                           CORBA::SystemException::_tao_minor_code (
+                              TAO_DEFAULT_MINOR_CODE,
+                              ENOMEM),
+                           CORBA::COMPLETED_NO));
+      ACE_CHECK_RETURN (0);
+
+      return adapter_name;
+    }
+  else
+    {
+      if (this->poa_ == 0)
+        ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+
+      this->adapter_name_ =
+        this->poa_->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      ACE_NEW_THROW_EX (adapter_name,
+                        PortableInterceptor::AdapterName (
+                          *(this->adapter_name_)),
+                        CORBA::NO_MEMORY (
+                           CORBA::SystemException::_tao_minor_code (
+                              TAO_DEFAULT_MINOR_CODE,
+                              ENOMEM),
+                           CORBA::COMPLETED_NO));
+      ACE_CHECK_RETURN (0);
+
+      return adapter_name;
+    }
+}
+
+CORBA::Object_ptr
+TAO_ObjectReferenceTemplate::make_object (
+    const char *,
+    const PortableInterceptor::ObjectId &
+  ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ))
+{
+  if (this->poa_ == 0)
+    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), CORBA::Object::_nil ());
+
+  return this->poa_->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
new file mode 100644
index 00000000000..6d805313cf7
--- /dev/null
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
@@ -0,0 +1,127 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file ObjectReferenceTemplate.h
+ *
+ * $Id$
+ *
+ * This is the implementation of the
+ * PortableInterceptor::ObjectReferenceTemplate ValueType.
+ *
+ * @author Priyanka Gontla <gontla_p@ociweb.com>
+ */
+//=============================================================================
+
+#ifndef TAO_OBJECT_REFERENCE_TEMPLATE_H
+#define TAO_OBJECT_REFERENCE_TEMPLATE_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PortableServer/portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Default_ORTC.h"
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+class TAO_POA;
+
+/**
+ * @class TAO_ObjectReferenceTemplate
+ *
+ * @brief Implementation of the PortableInterceptor::ObjectReferenceTemplate
+ *        interface.
+ */
+class TAO_PortableServer_Export TAO_ObjectReferenceTemplate
+  : public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate,
+    public virtual CORBA::DefaultValueRefCountBase
+{
+public:
+
+  /// Constructor
+  TAO_ObjectReferenceTemplate (const char *server_id,
+                               const char *orb_id,
+                               TAO_POA *poa);
+
+  /**
+   * @name PortableInterceptor::ObjectReferenceTemplate Methods
+   *
+   * Methods required by the
+   * PortableInterceptor::ObjectReferenceTemplate ValueType.
+   */
+  //@{
+  virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::AdapterName * adapter_name (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  //@}
+
+  /**
+   * @name PortableInterceptor::ObjectReferenceFactory Methods
+   *
+   * Methods required by the
+   * PortableInterceptor::ObjectReferenceFactory ValueType.
+   */
+  //@{
+  virtual CORBA::Object_ptr make_object (
+      const char * repository_id,
+      const PortableInterceptor::ObjectId & id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+  //@}
+
+  /// Set the underlying POA pointer.
+  /**
+   * Upon destruction of the POA that this ObjectReferenceTemplate is
+   * associated with, the underlying POA pointer will be set to zero
+   * to forcibly break all ties with the POA.  This is necessary to
+   * prevent this ObjectReferenceTemplate from invoking the POA after
+   * it has been destroyed.
+   */
+  void poa (TAO_POA * poa);
+
+protected:
+
+  /// Destructor
+  /**
+   * Protected destructor to enforce proper memory management via
+   * reference counting.
+   */
+  ~TAO_ObjectReferenceTemplate (void);
+
+private:
+
+  const char *server_id_;
+  const char *orb_id_;
+  PortableInterceptor::AdapterName_var adapter_name_;
+  TAO_POA *poa_;
+
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__ACE_INLINE__)
+# include "ObjectReferenceTemplate.inl"
+#endif /* ! __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_OBJECT_REFERENCE_TEMPLATE_H */
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.inl b/TAO/tao/PortableServer/ObjectReferenceTemplate.inl
new file mode 100644
index 00000000000..14de581cafc
--- /dev/null
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.inl
@@ -0,0 +1,9 @@
+// -*- C++ -*-
+//
+// $Id$
+
+ACE_INLINE void
+TAO_ObjectReferenceTemplate::poa (TAO_POA * poa)
+{
+  this->poa_ = poa;
+}
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index e51bd87f527..d1cb1630b7f 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "tao/SystemException.h"
-
 
 ACE_INLINE
 TAO_POA_Current::TAO_POA_Current (void)
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 5ee4eb96c18..e8b042b4ab7 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -14,10 +14,10 @@ ACE_RCSID (PortableServer,
 
 #include "tao/StringSeqC.h"
 
+#include "tao/PortableServer/IORInfo.h"
+#include "tao/PortableServer/ObjectReferenceTemplate.h"
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
-#include "tao/PortableServer/ORT_Adapter.h"
-#include "tao/PortableServer/ORT_Adapter_Factory.h"
-#include "tao/PortableInterceptorC.h"
+
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/Server_Strategy_Factory.h"
@@ -28,8 +28,8 @@ ACE_RCSID (PortableServer,
 #include "tao/Stub.h"
 #include "tao/Profile.h"
 #include "tao/TSS_Resources.h"
-#include "tao/IORInterceptor_Adapter.h"
 #include "tao/debug.h"
+#include "tao/IORInterceptor/IORInterceptor_List.h"
 #include "Default_Acceptor_Filter.h"
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_sys_time.h"
@@ -41,7 +41,6 @@ ACE_RCSID (PortableServer,
 
 // auto_ptr class
 #include "ace/Auto_Ptr.h"
-#include "ace/Dynamic_Service.h"
 
 #if !defined (__ACE_INLINE__)
 # include "POA.i"
@@ -172,14 +171,10 @@ TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPoli
 void
 TAO_POA::set_obj_ref_factory (
   PortableInterceptor::ObjectReferenceFactory *current_factory
-  ACE_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      // Activate a different factory
-      this->ort_adapter_->set_obj_ref_factory (current_factory
-                                               ACE_ENV_ARG_PARAMETER);
-    }
+  CORBA::add_ref (current_factory);
+  this->obj_ref_factory_ = current_factory;
 }
 
 TAO_POA::TAO_POA (const TAO_POA::String &name,
@@ -199,7 +194,6 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
     policies_ (policies),
     parent_ (parent),
     active_object_map_ (0),
-    ort_adapter_ (0),
     adapter_state_ (PortableInterceptor::HOLDING),
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -351,6 +345,22 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
     }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
+
+  // Create an ObjectReferenceTemplate for this POA.
+  ACE_NEW_THROW_EX (this->def_ort_template_,
+                    TAO_ObjectReferenceTemplate (
+                      this->orb_core_.server_id (),
+                      this->orb_core_.orbid (),
+                      this),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  this->ort_template_ = this->def_ort_template_;
+
+  // Must increase ref count since this->obj_ref_factory_ will
+  // descrease it upon destruction.
+  CORBA::add_ref (this->ort_template_.in ());
+  this->obj_ref_factory_ = this->ort_template_;
 }
 
 TAO_POA::~TAO_POA (void)
@@ -366,7 +376,6 @@ TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
 
   // Delete the active object map.
   delete this->active_object_map_;
-  active_object_map_ = 0;
 
   // Remove POA from the POAManager.
   int result = this->poa_manager_.remove_poa (this);
@@ -417,17 +426,6 @@ TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
 
   }
 
-  if (this->ort_adapter_ != 0)
-  {
-    TAO::ORT_Adapter_Factory *ort_factory =
-      this->ORT_adapter_factory ();
-
-    ort_factory->destroy (this->ort_adapter_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->ort_adapter_ = 0;
-  }
-
   CORBA::release (this);
 }
 
@@ -733,12 +731,11 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
         }
     }
 
-  TAO::ORT_Array array_obj_ref_template;
+  PortableInterceptor::ObjectReferenceTemplateSeq seq_obj_ref_template;
 
   CORBA::ULong i = 0;
 
-  // Gather all ObjectReferenceTemplates and change all adapter states
-  // to inactivate
+  //  Remove all children POAs
   for (CHILDREN::iterator iterator = this->children_.begin ();
        iterator != this->children_.end ();
        ++iterator)
@@ -747,47 +744,35 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
       // Get the adapter template related to the ChildPOA
       PortableInterceptor::ObjectReferenceTemplate *child_at =
-        child_poa->get_adapter_template_i ();
+        child_poa->get_adapter_template ();
 
-      // In case no ORT library is linked we get zero
-      if (child_at != 0)
-        {
-          // Add it to the sequence of object reference templates that
-          // will be destroyed.
-          array_obj_ref_template.size (i + 1);
+      CORBA::add_ref (child_at);
 
-          array_obj_ref_template[i] = child_at;
-        }
+      // Add it to the sequence of object reference templates that
+      // will be destroyed.
+      seq_obj_ref_template.length (i + 1);
 
-      child_poa->adapter_state_ =
-        PortableInterceptor::INACTIVE;
+      seq_obj_ref_template[i] = child_at;
 
-      ++i;
-    }
+      child_poa->adapter_state_ = PortableInterceptor::INACTIVE;
 
-  // Notify the state changes to the IORInterceptors
-  this->adapter_state_changed (array_obj_ref_template,
-                               PortableInterceptor::INACTIVE
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      child_poa->adapter_state_changed (seq_obj_ref_template,
+                                        child_poa->adapter_state_
+                                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
-  // Destroy all child POA's now.
-  for (CHILDREN::iterator destroy_iterator = this->children_.begin ();
-       destroy_iterator != this->children_.end ();
-       ++destroy_iterator)
-    {
-      TAO_POA *destroy_child_poa = (*destroy_iterator).int_id_;
+      ++i;
 
-      destroy_child_poa->destroy_i (etherealize_objects,
-                                    wait_for_completion
-                                    ACE_ENV_ARG_PARAMETER);
+      child_poa->destroy_i (etherealize_objects,
+                            wait_for_completion
+                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
   //
   // ImplRepo related.
   //
+#if (TAO_HAS_MINIMUM_CORBA == 0)
   if (this->cached_policies_.lifespan () == PortableServer::PERSISTENT)
     {
       this->imr_notify_shutdown ();
@@ -840,21 +825,6 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
       (non_servant_upcall_in_progress == 0 ||
        &non_servant_upcall_in_progress->poa () != this))
     {
-      TAO::ORT_Array my_array_obj_ref_template;
-
-      // Get the adapter template
-      PortableInterceptor::ObjectReferenceTemplate *adapter =
-        this->get_adapter_template_i ();
-
-      if (adapter != 0)
-        {
-          // Add it to the sequence of object reference templates, we just notify
-          // for ourselves that we are now non_existent, our childs will do it
-          // for themselves.
-          array_obj_ref_template.size (1);
-          array_obj_ref_template[0] = adapter;
-        }
-
       // According to the ORT spec, after a POA is destroyed, its state
       // has to be changed to NON_EXISTENT and all the registered
       // interceptors are to be informed. Since, the POA is destroyed
@@ -868,10 +838,14 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
       this->adapter_state_ = PortableInterceptor::NON_EXISTENT;
 
-      this->adapter_state_changed (array_obj_ref_template,
+      this->adapter_state_changed (seq_obj_ref_template,
                                    this->adapter_state_
                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
+
+      // Break all ties between the ObjectReferenceTemplate and this
+      // POA.
+      this->def_ort_template_->poa (0);
     }
   else
     {
@@ -1043,19 +1017,31 @@ TAO_POA::add_ior_component_to_profile (
 
 void
 TAO_POA::adapter_state_changed (
-   const TAO::ORT_Array &array_obj_ref_template,
+   const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template,
    PortableInterceptor::AdapterState state
    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
+  /// First get a list of all the interceptors.
+  TAO_IORInterceptor_List * interceptor_list =
+    this->orb_core_.ior_interceptor_list ();
 
-  if (ior_adapter)
+  if (interceptor_list == 0)
+    return;
+
+  TAO_IORInterceptor_List::TYPE & interceptors =
+    interceptor_list->interceptors ();
+
+  const size_t interceptor_count = interceptors.size ();
+
+  if (interceptor_count == 0)
+    return;
+
+  for (size_t i = 0; i < interceptor_count; ++i)
     {
-      ior_adapter->adapter_state_changed (array_obj_ref_template,
-                                          state
-                                          ACE_ENV_ARG_PARAMETER);
+      interceptors[i]->adapter_state_changed (seq_obj_ref_template,
+                                              state
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -1069,8 +1055,7 @@ TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   // This operation requires the USE_SERVANT_MANAGER policy; if not
   // present, the WrongPolicy exception is raised.
-  if (this->cached_policies_.request_processing () !=
-      PortableServer::USE_SERVANT_MANAGER)
+  if (this->cached_policies_.request_processing () != PortableServer::USE_SERVANT_MANAGER)
     {
       ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
                         PortableServer::ServantManager::_nil ());
@@ -1079,8 +1064,7 @@ TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL)
   // This operation returns the servant manager associated with the
   // POA.  If no servant manager has been associated with the POA, it
   // returns a null reference.
-  if (this->cached_policies_.servant_retention () ==
-      PortableServer::RETAIN)
+  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
     return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
   else
     return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
@@ -1937,32 +1921,14 @@ TAO_POA::create_reference_i (const char *intf,
                                    1,
                                    priority);
 
-  return this->invoke_key_to_object_helper_i (intf,
-                                              user_id
-                                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_POA::invoke_key_to_object_helper_i (const char * repository_id,
-                                        const PortableServer::ObjectId & id
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
   const PortableInterceptor::ObjectId &user_oid =
-    reinterpret_cast <const PortableInterceptor::ObjectId &>(id);
+    ACE_reinterpret_cast (const PortableInterceptor::ObjectId &,
+                          user_id);
 
   // Ask the ORT to create the object.
-  if (this->ORT_adapter_i ())
-    {
-      // Ask the ORT to create the object.
-      return this->ort_adapter_->make_object (repository_id,
+  return this->obj_ref_factory_->make_object (intf,
                                               user_oid
                                               ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return this->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
 }
 
 CORBA::Object_ptr
@@ -2039,8 +2005,13 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
                                    1,
                                    priority);
 
-  return this->invoke_key_to_object_helper_i (intf,
-                                              user_id
+  const PortableInterceptor::ObjectId &user_oid =
+    ACE_reinterpret_cast (const PortableInterceptor::ObjectId &,
+                          user_id);
+
+  // Ask the ORT to create the object.
+  return this->obj_ref_factory_->make_object (intf,
+                                              user_oid
                                               ACE_ENV_ARG_PARAMETER);
 }
 
@@ -2282,14 +2253,19 @@ TAO_POA::servant_to_reference_i (PortableServer::Servant servant
                                    1,
                                    priority);
 
+  const PortableInterceptor::ObjectId &user_oid =
+    ACE_reinterpret_cast (const PortableInterceptor::ObjectId &,
+                          user_id);
+
   // Ask the ORT to create the object.
   // @@NOTE:There is a possible deadlock lurking here. We held the
   // lock, and we are possibly trying to make a call into the
   // application code. Think what would happen if the app calls us
   // back. We need to get to this at some point.
-  return this->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
-                                              user_id
-                                              ACE_ENV_ARG_PARAMETER);
+  return this->obj_ref_factory_->make_object (
+    servant->_interface_repository_id (),
+    user_oid
+    ACE_ENV_ARG_PARAMETER);
 }
 
 PortableServer::Servant
@@ -2629,8 +2605,13 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
                                        1,
                                        priority);
 
-      return this->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
-                                                  id
+      const PortableInterceptor::ObjectId &user_oid =
+        ACE_reinterpret_cast (const PortableInterceptor::ObjectId &,
+                              id);
+
+      // Ask the ORT to create the object.
+      return this->obj_ref_factory_->make_object (servant->_interface_repository_id (),
+                                                  user_oid
                                                   ACE_ENV_ARG_PARAMETER);
     }
   else
@@ -3759,26 +3740,127 @@ TAO_POA::key_to_stub_i (const TAO::ObjectKey &key,
 void
 TAO_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
+  // Iterate over the registered IOR interceptors so that they may be
+  // given the opportunity to add tagged components to the profiles
+  // for this servant.
+  /// First get a list of all the interceptors.
+  TAO_IORInterceptor_List * interceptor_list =
+    this->orb_core_.ior_interceptor_list ();
+
+  if (interceptor_list == 0)
+    return;
+
+  TAO_IORInterceptor_List::TYPE & interceptors =
+    interceptor_list->interceptors ();
+
+  const size_t interceptor_count = interceptors.size ();
+
+  if (interceptor_count == 0)
+    return;
 
-  if (ior_adapter)
+  TAO_IORInfo *tao_info = 0;
+  ACE_NEW_THROW_EX (tao_info,
+                    TAO_IORInfo (this),
+                    CORBA::NO_MEMORY (
+                       CORBA::SystemException::_tao_minor_code (
+                          TAO_DEFAULT_MINOR_CODE,
+                          ENOMEM),
+                       CORBA::COMPLETED_NO));
+  ACE_CHECK;
+
+  PortableInterceptor::IORInfo_var info = tao_info;
+
+  // Release the POA during IORInterceptor calls to avoid potential
+  // deadlocks.
+  TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
+  ACE_UNUSED_ARG (non_servant_upcall);
+
+  for (size_t i = 0; i < interceptor_count; ++i)
     {
-      ior_adapter->establish_components (this ACE_ENV_ARG_PARAMETER);
+      ACE_TRY
+        {
+          interceptors[i]->establish_components (info.in ()
+                                                 ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          // According to the Portable Interceptors specification,
+          // IORInterceptor::establish_components() must not throw an
+          // exception.  If it does, then the ORB is supposed to
+          // ignore it and continue processing the remaining
+          // IORInterceptors.
+          if (TAO_debug_level > 1)
+            {
+              CORBA::String_var name = interceptors[i]->name (
+                ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+              // @@ What do we do if we get an exception here?
+
+              if (name.in () != 0)
+                {
+                  ACE_DEBUG ((LM_WARNING,
+                              "(%P|%t) Exception thrown while processing "
+                              "IORInterceptor \"%s\">\n",
+                              ACE_TEXT_CHAR_TO_TCHAR (name.in ())));
+                }
+
+              ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION,
+                                       "Ignoring exception in "
+                                       "IORInterceptor::establish_components");
+            }
+        }
+      ACE_ENDTRY;
       ACE_CHECK;
     }
+
+  tao_info->components_established ();
+
+  this->components_established (info.in ()
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // The IORInfo instance is no longer valid.  Invalidate it to
+  // prevent the user from peforming "illegal" operations.
+  tao_info->invalidate ();
 }
 
 void
 TAO_POA::components_established (PortableInterceptor::IORInfo_ptr info
                                  ACE_ENV_ARG_DECL)
 {
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
+  // Iterate over the registered IOR interceptors so that they may be
+  // given the opportunity to add tagged components to the profiles
+  // for this servant.
+  TAO_IORInterceptor_List * interceptor_list =
+    this->orb_core_.ior_interceptor_list ();
 
-  if (ior_adapter)
+    if (interceptor_list == 0)
+    return;
+
+  TAO_IORInterceptor_List::TYPE & interceptors =
+    interceptor_list->interceptors ();
+
+  const size_t interceptor_count = interceptors.size ();
+
+  // All the establish_components() interception points have been
+  // invoked. Now call the components_established() interception point
+  // on all the IORInterceptors.
+  for (size_t j = 0; j < interceptor_count; ++j)
     {
-      ior_adapter->components_established (info ACE_ENV_ARG_PARAMETER);
+      ACE_TRY
+        {
+          interceptors[j]->components_established (
+            info
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6,
+                                         CORBA::COMPLETED_NO));
+        }
+      ACE_ENDTRY;
       ACE_CHECK;
     }
 }
@@ -4088,82 +4170,6 @@ TAO_POA::imr_notify_shutdown (void)
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-TAO::ORT_Adapter_Factory *
-TAO_POA::ORT_adapter_factory (void)
-{
-  return ACE_Dynamic_Service<TAO::ORT_Adapter_Factory>::instance (
-           TAO_POA::ort_adapter_factory_name ());
-}
-
-TAO::ORT_Adapter *
-TAO_POA::ORT_adapter_i (void)
-{
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO::ORT_Adapter_Factory * ort_ap_factory =
-        this->ORT_adapter_factory ();
-
-      if (!ort_ap_factory)
-        return 0;
-
-      // Get the full adapter name of this POA, do this before we
-      // create the adapter so that in case this fails, we just
-      // return 0 and not a not activated adapter
-      PortableInterceptor::AdapterName *adapter_name =
-        this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->ort_adapter_ =
-          ort_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!ort_adapter_)
-        return 0;
-
-      // @todo We have to look at this, we activate it but hold the POA lock,
-      // in case we are called by ORT_adapter, we shouldn't keep the lock
-      // here, but then the ort_adapter should be guarded against multiple
-      // activations.
-      this->ort_adapter_->activate (this->orb_core_.server_id (),
-                                    this->orb_core_.orbid (),
-                                    adapter_name,
-                                    this
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Cannot initialize the "
-                           "object_reference_template_adapter\n");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  return this->ort_adapter_;
-}
-
-TAO::ORT_Adapter *
-TAO_POA::ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  // DCL ..
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  return this->ORT_adapter_i ();
-}
-
 TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa
                               ACE_ENV_ARG_DECL,
                               int check_for_destruction)
@@ -4298,53 +4304,6 @@ TAO_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id,
   this->priority_ = priority;
 }
 
-void
-TAO_POA::ort_adapter_factory_name (const char *name)
-{
-  TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_ =
-    name;
-}
-
-const char *
-TAO_POA::ort_adapter_factory_name (void)
-{
-  return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str();
-}
-
-// Initialize instance_ to 0, since this is what we test for in the call
-// to instance ().  Note that this does not require a constructor call, so
-// it is always initialized by the time that instance () can be called.
-TAO_POA_Static_Resources* TAO_POA_Static_Resources::instance_ = 0;
-
-// Force an instance to be created at module initialization time,
-// since we do not want to worry about double checked locking and
-// the race condition to initialize the lock.
-TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ =
-  TAO_POA_Static_Resources::instance ();
-
-TAO_POA_Static_Resources*
-TAO_POA_Static_Resources::instance (void)
-{
-  if (TAO_POA_Static_Resources::instance_ == 0)
-    {
-      // This new is never freed on purpose.  The data specified by
-      // it needs to be around for the last shared library that references
-      // this class.  This could occur in a destructor in a shared library
-      // that is unloaded after this one.  One solution to avoid this
-      // harmless memory leak would be to use reference counting.
-      ACE_NEW_RETURN (TAO_POA_Static_Resources::instance_,
-                      TAO_POA_Static_Resources (),
-                      0);
-    }
-
-  return TAO_POA_Static_Resources::instance_;
-}
-
-TAO_POA_Static_Resources::TAO_POA_Static_Resources (void)
-  : ort_adapter_factory_name_ ("ORT_Adapter_Factory")
-{
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>;
@@ -4362,11 +4321,13 @@ template class ACE_Write_Guard<ACE_Lock>;
 template class ACE_Read_Guard<ACE_Lock>;
 template class ACE_Array_Base <IOP::ProfileId>;
 
+//template class auto_ptr<TAO_Active_Object_Map_Iterator_Impl>;
 template class auto_ptr<TAO_Active_Object_Map>;
 
 #  if defined (ACE_LACKS_AUTO_PTR) \
       || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
            && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+//template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
 template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
 #  endif  /* ACE_LACKS_AUTO_PTR */
 
@@ -4388,11 +4349,13 @@ template class ACE_Node<TAO_POA *>;
 #pragma instantiate ACE_Write_Guard<ACE_Lock>
 #pragma instantiate ACE_Read_Guard<ACE_Lock>
 
+//#pragma instantiate auto_ptr<TAO_Active_Object_Map_Iterator_Impl>
 #pragma instantiate auto_ptr<TAO_Active_Object_Map>
 
 #  if defined (ACE_LACKS_AUTO_PTR) \
       || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
            && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+//#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
 #    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
 #  endif  /* ACE_LACKS_AUTO_PTR */
 
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 6de036d8770..a3c7f13b7b6 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -42,9 +42,12 @@
 #include "tao/LocalObject.h"
 
 // Portable Interceptor
-#include "tao/PI_ForwardC.h"
+#include "tao/PortableInterceptorC.h"
 
+// Map
 #include "ace/Hash_Map_Manager_T.h"
+
+// ACE_Array_Base
 #include "ace/Array_Base.h"
 
 // Locking
@@ -56,8 +59,6 @@
 // OctetSeq
 #include "tao/OctetSeqC.h"
 
-#include "ORT_Adapter.h"
-
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
@@ -67,11 +68,15 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+class TAO_Acceptor_Filter;
+class TAO_Acceptor_Registry;
 class TAO_Temporary_Creation_Time;
+class TAO_ObjectReferenceTemplate;
 
 class TAO_Creation_Time
 {
 public:
+
   TAO_Creation_Time (const ACE_Time_Value &creation_time);
 
   TAO_Creation_Time (void);
@@ -131,9 +136,6 @@ protected:
 
 // Forward Declaration
 class ServerObject_i;
-class TAO_Acceptor_Filter;
-class TAO_Acceptor_Registry;
-class TAO_IORInfo;
 
 namespace PortableInterceptor
 {
@@ -141,12 +143,6 @@ namespace PortableInterceptor
   typedef IORInfo *IORInfo_ptr;
 }
 
-namespace TAO
-{
-  class ORT_Adapter;
-  class ORT_Adapter_Factory;
-}
-
 /**
  * @class TAO_POA
  *
@@ -166,7 +162,7 @@ public:
   friend class TAO_POA_Current_Impl;
   friend class TAO_POA_Manager;
   friend class TAO_RT_Collocation_Resolver;
-  friend class TAO_IORInfo;
+  friend class TAO_ObjectReferenceTemplate;
 
   typedef ACE_CString String;
 
@@ -276,6 +272,20 @@ public:
   PortableInterceptor::AdapterName *adapter_name (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// Accessor methods to ObjectReferenceTemplate
+  PortableInterceptor::ObjectReferenceTemplate * get_adapter_template (void);
+
+  void set_adapter_template (PortableInterceptor::ObjectReferenceTemplate *
+                             object_ref_template
+                             ACE_ENV_ARG_DECL);
+
+  /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
+  PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void);
+
+  void set_obj_ref_factory (
+    PortableInterceptor::ObjectReferenceFactory *current_factory
+    ACE_ENV_ARG_DECL);
+
   /// Store the given TaggedComponent for eventual insertion into all
   /// object reference profiles.
   void save_ior_component (const IOP::TaggedComponent &component
@@ -396,9 +406,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
-  // Methods added by the
-  /// @name MIOP specification methods
-  //@{
+  // Methods added by the MIOP specification.
+
   virtual PortableServer::ObjectId * create_id_for_reference (
       CORBA::Object_ptr the_ref
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -437,23 +446,26 @@ public:
       CORBA::SystemException,
       PortableServer::NotAGroupObject
     ));
-  //@}
+
+  // End methods added by MIOP.
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+
   /// Accessor for POA policies.
   TAO_POA_Policy_Set &policies (void);
 
   /// Accessor for cached POA policies.
   TAO_POA_Cached_Policies &cached_policies (void);
 
-  /// This method gives the policies that are exposed to the client.
-  /// These policies are shipped within the IOR.
   virtual CORBA::PolicyList *client_exposed_policies (
       CORBA::Short object_priority
       ACE_ENV_ARG_DECL
     );
+  // This method gives the policies that are exposed to the client.
+  // These policies are shipped within the IOR.
+
 
-  /// Utility functions for the other
+  // Utility functions for the other
   static char* ObjectId_to_string (const PortableServer::ObjectId &id);
 
   static CORBA::WChar* ObjectId_to_wstring (
@@ -507,9 +519,9 @@ public:
 
   CORBA::Boolean cleanup_in_progress (void);
 
-  /// Calls protected static method used when POACurrent is not appropriate.
   static int parse_ir_object_key (const TAO::ObjectKey &object_key,
                                   PortableServer::ObjectId &user_id);
+  // Calls protected static method used when POACurrent is not appropriate.
 
   TAO_Object_Adapter &object_adapter (void);
 
@@ -546,12 +558,6 @@ public:
 
   CORBA::Boolean waiting_destruction (void) const;
 
-  static void ort_adapter_factory_name (const char *name);
-
-  static const char *ort_adapter_factory_name (void);
-
-  CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL);
-
 protected:
 
   /// Template method for creating new POA's of this type.
@@ -608,9 +614,10 @@ protected:
   /// Method to notify the IOR Interceptors when there is a state
   /// changed not related to POAManager.
   void adapter_state_changed (
-      const TAO::ORT_Array &array_obj_ref_template,
+      const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template,
       PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles.
@@ -652,32 +659,35 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+//
+// ImplRepo related.
+//
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  /// @name Implementation repository related methods
-  //@{
 
-  /// ImplRepo helper method, notify the ImplRepo on startup
   void imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL);
+  // ImplRepo helper method, notify the ImplRepo on startup
 
-  /// ImplRepo helper method, notify the ImplRepo on shutdown
   void imr_notify_shutdown (void);
-  //@}
+  // ImplRepo helper method, notify the ImplRepo on shutdown
+
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-  /// Wrapper for the ORB's key_to_object that will alter the object pointer
-  /// if the ImplRepo is used.
+  CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL);
+
   CORBA::Object_ptr key_to_object (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    TAO_ServantBase *servant,
                                    CORBA::Boolean collocated,
                                    CORBA::Short priority
                                    ACE_ENV_ARG_DECL);
+  // Wrapper for the ORB's key_to_object that will alter the object pointer
+  // if the ImplRepo is used.
 
-  /// Like key_to_stub() but assume that the ORB is not shutting down.
   virtual TAO_Stub* key_to_stub_i (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    CORBA::Short priority
                                    ACE_ENV_ARG_DECL);
+  // Like key_to_stub() but assume that the ORB is not shutting down.
 
   TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
@@ -850,24 +860,6 @@ protected:
   static TAO_POA_Policy_Set &default_poa_policies (void);
 
 protected:
-  /// Accessor methods to ObjectReferenceTemplate
-  PortableInterceptor::ObjectReferenceTemplate *
-    get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Accessor methods to ObjectReferenceTemplate, non locked version
-  PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void);
-
-  /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-  PortableInterceptor::ObjectReferenceFactory *
-    get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Set the object reference factory
-  void set_obj_ref_factory (
-    PortableInterceptor::ObjectReferenceFactory *current_factory
-    ACE_ENV_ARG_DECL);
-
 
   TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant &servant
@@ -882,23 +874,6 @@ protected:
       ACE_ENV_ARG_DECL
     );
 
-  CORBA::Object_ptr
-  invoke_key_to_object_helper_i (const char * repository_id,
-                                 const PortableServer::ObjectId & id
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Get the ORT adapter, in case there is no adapter yet, this method will
-  /// try to create one and hold the POA lock
-  TAO::ORT_Adapter *ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Get the ORT adapter, in case there is no adapter yet, this method will
-  /// try to create one but assumes the POA lock is already hole
-  TAO::ORT_Adapter *ORT_adapter_i (void);
-
-  TAO::ORT_Adapter_Factory *ORT_adapter_factory (void);
-
   const TAO_Creation_Time &creation_time (void);
 
   CORBA::Boolean persistent (void);
@@ -961,8 +936,13 @@ protected:
 
   CORBA::OctetSeq id_;
 
-  /// Pointer to the object reference template adapter.
-  TAO::ORT_Adapter *ort_adapter_;
+  /// Keep a copy of the pointer to the actual implementation around
+  /// so that we can call some TAO-specific methods on it.
+  TAO_ObjectReferenceTemplate * def_ort_template_;
+
+  PortableInterceptor::ObjectReferenceTemplate_var ort_template_;
+
+  PortableInterceptor::ObjectReferenceFactory_var obj_ref_factory_;
 
   /// Adapter can be accepting, rejecting etc.
   PortableInterceptor::AdapterState adapter_state_;
@@ -1010,7 +990,7 @@ protected:
 
   TAO_ORB_Core &orb_core_;
 
-  /// The object adapter we belong to
+  // The object adapter we belong to
   TAO_Object_Adapter *object_adapter_;
 
   CORBA::Boolean cleanup_in_progress_;
@@ -1094,56 +1074,6 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-/**
- * @class TAO_POA_Static_Resources
- *
- * @brief The static (global) resoures of all POA's.
- *
- * This class is used by the POA to store the resources global to
- * all POA's.  All instance variables that would have been
- * declared "static" in TAO_POA, should be declared in this class
- * to avoid the "static initialization order fiasco" as described in
- * http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.11.
- * Briefly, this is the problem that occurs if any static initializers
- * in any other code call into set static members of TAO_POA.
- * Since the order in which these initializers execute is unspecified,
- * uninitialized members can be accessed.
- */
-class TAO_PortableServer_Export TAO_POA_Static_Resources
-{
-public:
-
-  /// Return the singleton instance.
-  static TAO_POA_Static_Resources* instance (void);
-
-public:
-
-  /**
-   * Name of the factory object used to adapt function calls on the
-   * PortableInterceptor interfaces ORT. The default value is
-   * "ObjectReferenceTemplate_Adapter_Factory". If the ORT library is linked,
-   * the corresponding accessor function
-   * objectreferencefactory_adapter_factory_name() will be called to set
-   * the value to "Concrete_ObjectReferenceTemplate_Adapter_Factory".
-   */
-  ACE_CString ort_adapter_factory_name_;
-
-private:
-  /// Constructor.
-  TAO_POA_Static_Resources (void);
-
-private:
-  /// The singleton instance.
-  static TAO_POA_Static_Resources* instance_;
-
-  /// Mostly unused variable whose sole purpose is to enforce
-  /// the instantiation of a TAO_POA_Static_Resources instance
-  /// at initialization time.
-  static TAO_POA_Static_Resources* initialization_reference_;
-};
-
-// ****************************************************************
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i
index 9821fa6efb4..761d5d67c13 100644
--- a/TAO/tao/PortableServer/POA.i
+++ b/TAO/tao/PortableServer/POA.i
@@ -464,38 +464,15 @@ TAO_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_POA::get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      return this->ort_adapter_->get_adapter_template();
-    }
-
-  return 0;
-}
-
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_POA::get_adapter_template_i ()
+TAO_POA::get_adapter_template ()
 {
-  if (this->ORT_adapter_i ())
-    {
-      return this->ort_adapter_->get_adapter_template ();
-    }
-
-  return 0;
+  return this->ort_template_;
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
-TAO_POA::get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_POA::get_obj_ref_factory ()
 {
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      return this->ort_adapter_->get_obj_ref_factory();
-    }
-
-  return 0;
+  return this->obj_ref_factory_;
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 3c484a85c23..66a9c9eba95 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -3,9 +3,11 @@
 #include "POAManager.h"
 #include "POA.h"
 #include "poa_macros.h"
+#include "tao/IORInterceptor/IORInterceptorC.h"
 #include "tao/Server_Strategy_Factory.h"
+#include "tao/Interceptor_List.h"
 #include "tao/ORB_Core.h"
-#include "tao/IORInterceptor_Adapter.h"
+#include "tao/IORInterceptor/IORInterceptor_List.h"
 
 #if !defined (__ACE_INLINE__)
 # include "POAManager.i"
@@ -138,14 +140,29 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat
 {
   PortableInterceptor::AdapterState adapter_state = state;
 
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->object_adapter_.orb_core ().ior_interceptor_adapter ();
+  /// Whenever the POAManager state is changed, the
+  /// adapter_manager_state_changed method is to be invoked on all the IOR
+  ///  Interceptors.
+  TAO_IORInterceptor_List *interceptor_list =
+    this->object_adapter_.orb_core ().ior_interceptor_list ();
 
-  if (ior_adapter)
+  if (interceptor_list == 0)
+    return;
+
+  TAO_IORInterceptor_List::TYPE &interceptors =
+    interceptor_list->interceptors ();
+
+  const size_t interceptor_count = interceptors.size ();
+
+  if (interceptor_count == 0)
+    return;
+
+  for (size_t i = 0; i < interceptor_count; ++i)
     {
-      ior_adapter->adapter_manager_state_changed (TAO_POA_Manager::poa_manager_id_,
-                                                  adapter_state
-                                                  ACE_ENV_ARG_PARAMETER);
+      interceptors[i]->adapter_manager_state_changed (
+        TAO_POA_Manager::poa_manager_id_,
+        adapter_state
+        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 93db1c0d551..c0e8019d9a3 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -29,6 +29,7 @@
 #include "tao/LocalObject.h"
 
 #include "tao/PortableInterceptorC.h"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
 #include "ace/Unbounded_Set.h"
 
 // Forward decl.
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index d60d3dd08f7..b97eddf2681 100644
--- a/TAO/tao/PortableServer/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
@@ -3,8 +3,6 @@
 // $Id$
 
 #include "tao/Environment.h"
-#include "tao/SystemException.h"
-
 
 ACE_INLINE ACE_Lock &
 TAO_POA_Manager::lock (void)
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 485a2f16eaa..69813eb8593 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_codegen.cpp:631
 
 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_
@@ -64,7 +64,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "PolicyS.inl"
+#include "PolicyS.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -76,7 +76,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
 #define _CORBA_POLICY__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<CORBA::Policy>
     : public
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 712882698eb..8eca9c7ef37 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -59,126 +59,126 @@
 
 namespace POA_CORBA
 {
-
-
+  
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class Policy;
   typedef Policy *Policy_ptr;
-
+  
   class _TAO_Policy_ThruPOA_Proxy_Impl;
   class _TAO_Policy_Direct_Proxy_Impl;
   class _TAO_Policy_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Policy
     : public virtual PortableServer::ServantBase
   {
   protected:
     Policy (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::CORBA::Policy _stub_type;
     typedef ::CORBA::Policy_ptr _stub_ptr_type;
     typedef ::CORBA::Policy_var _stub_var_type;
-
+    
     Policy (const Policy& rhs);
     virtual ~Policy (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::CORBA::Policy *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void _get_policy_type_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void copy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void destroy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -186,29 +186,29 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Policy_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Policy_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -221,33 +221,33 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_Policy_Strategized_Proxy_Broker *
     the_TAO_Policy_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_Policy_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     _get_policy_type (
         TAO_Abstract_ServantBase *servant,
@@ -258,10 +258,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     copy (
         TAO_Abstract_ServantBase *servant,
@@ -272,10 +272,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -287,28 +287,28 @@ namespace POA_CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
 class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
   {
   public:
     _TAO_Policy_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Policy_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     _get_policy_type (
         TAO_Abstract_ServantBase *servant,
@@ -319,10 +319,10 @@ class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     copy (
         TAO_Abstract_ServantBase *servant,
@@ -333,10 +333,10 @@ class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -348,25 +348,25 @@ class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_codegen.cpp:1014
 
 #include "PolicyS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "PolicyS.inl"
+#include "PolicyS.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/PortableServer/PolicyS.i b/TAO/tao/PortableServer/PolicyS.i
new file mode 100644
index 00000000000..1d2df31bd57
--- /dev/null
+++ b/TAO/tao/PortableServer/PolicyS.i
@@ -0,0 +1,26 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
index 1bc94beb745..4630c6cffcb 100644
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ b/TAO/tao/PortableServer/PolicyS_T.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:720
 
 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
@@ -34,7 +34,7 @@
 #include "PolicyS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "PolicyS_T.inl"
+#include "PolicyS_T.i"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index dceb6d07e98..0228d829356 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -41,16 +41,16 @@
 #endif /* _MSC_VER */
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
 
 #if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
-
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  Policy_tie : public Policy
@@ -70,7 +70,7 @@ namespace POA_CORBA
     // ctor with T*, ownership flag and a POA
     ~Policy_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -82,47 +82,47 @@ namespace POA_CORBA
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
-
+    
     CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
-
+    
     ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
-
+    
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+  
   private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     Policy_tie (const Policy_tie &);
     void operator= (const Policy_tie &);
@@ -130,11 +130,11 @@ namespace POA_CORBA
 } // module CORBA
 #endif /* ACE_HAS_USING_KEYWORD */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1193
 
 #if defined (__ACE_INLINE__)
-#include "PolicyS_T.inl"
+#include "PolicyS_T.i"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i
new file mode 100644
index 00000000000..0305db45663
--- /dev/null
+++ b/TAO/tao/PortableServer/PolicyS_T.i
@@ -0,0 +1,173 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
+
+#if defined (ACE_HAS_USING_KEYWORD)
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::Policy_tie (T &t)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (0)
+{}
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::Policy_tie (T &t, PortableServer::POA_ptr poa)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (0)
+{}
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, CORBA::Boolean release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (release)
+{}
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (release)
+{}
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::~Policy_tie (void)
+{
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+}
+
+template <class T> ACE_INLINE T *
+POA_CORBA::Policy_tie<T>::_tied_object (void)
+{
+  return this->ptr_;
+}
+
+template <class T> ACE_INLINE void
+POA_CORBA::Policy_tie<T>::_tied_object (T &obj)
+{
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
+  this->ptr_ = &obj;
+  this->rel_ = 0;
+}
+
+template <class T> ACE_INLINE void
+POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+{
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
+  this->ptr_ = obj;
+  this->rel_ = release;
+}
+
+template <class T> ACE_INLINE CORBA::Boolean
+POA_CORBA::Policy_tie<T>::_is_owner (void)
+{
+  return this->rel_;
+}
+
+template <class T> ACE_INLINE void
+POA_CORBA::Policy_tie<T>::_is_owner (CORBA::Boolean b)
+{
+  this->rel_ = b;
+}
+
+template <class T> ACE_INLINE PortableServer::POA_ptr
+POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (!CORBA::is_nil (this->poa_.in ()))
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
+  return this->Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+// TAO_IDL - Generated from 
+// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
+template <class T> ACE_INLINE
+CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  return this->ptr_->policy_type (
+    ACE_ENV_SINGLE_ARG_PARAMETER
+  );
+}
+
+// TAO_IDL - Generated from 
+// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
+template <class T> ACE_INLINE
+::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  return this->ptr_->copy (
+    ACE_ENV_SINGLE_ARG_PARAMETER
+  );
+}
+
+// TAO_IDL - Generated from 
+// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
+template <class T> ACE_INLINE
+void POA_CORBA::Policy_tie<T>::destroy  (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  this->ptr_->destroy (
+    ACE_ENV_SINGLE_ARG_PARAMETER
+  );
+}
+
+#endif /* ACE_HAS_USING_KEYWORD */
+
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 55a2d2d6c2e..ece8be6870c 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -54,7 +54,7 @@ module PortableServer
 {
 # pragma version PortableServer 2.3
 
-  local interface POA;      // forward declaration
+  local interface POA;	    // forward declaration
   typedef sequence<POA> POAList;
   native Servant;
   typedef CORBA::OctetSeq ObjectId;
@@ -255,7 +255,7 @@ module PortableServer
                     in POAManager a_POAManager,
                     in CORBA::PolicyList policies)
       raises (AdapterAlreadyExists,
-              InvalidPolicy);
+	      InvalidPolicy);
 
     POA find_POA (in string adapter_name,
                   in boolean activate_it)
@@ -269,7 +269,7 @@ module PortableServer
     ThreadPolicy create_thread_policy (in ThreadPolicyValue value);
 
     LifespanPolicy create_lifespan_policy (
-        in LifespanPolicyValue value
+	in LifespanPolicyValue value
       );
 
     IdUniquenessPolicy  create_id_uniqueness_policy (
@@ -281,7 +281,7 @@ module PortableServer
       );
 
     ImplicitActivationPolicy create_implicit_activation_policy (
-        in ImplicitActivationPolicyValue value
+        in ImplicitActivationPolicyValue value\
       );
 
     ServantRetentionPolicy create_servant_retention_policy (
@@ -289,7 +289,7 @@ module PortableServer
       );
 
     RequestProcessingPolicy create_request_processing_policy (
-        in RequestProcessingPolicyValue value
+	in RequestProcessingPolicyValue value
       );
 
     // POA attributes
@@ -311,7 +311,7 @@ module PortableServer
 
     Servant get_servant ()
       raises (NoServant,
-              WrongPolicy);
+	      WrongPolicy);
 
     void set_servant (in Servant p_servant)
       raises (WrongPolicy);
@@ -320,13 +320,13 @@ module PortableServer
 
     ObjectId  activate_object (in Servant p_servant)
       raises (ServantAlreadyActive,
-              WrongPolicy);
+	      WrongPolicy);
 
     void activate_object_with_id (in ObjectId id,
                                   in Servant p_servant)
       raises (ServantAlreadyActive,
-              ObjectAlreadyActive,
-              WrongPolicy);
+	      ObjectAlreadyActive,
+	      WrongPolicy);
 
     void deactivate_object (in ObjectId oid)
       raises (ObjectNotActive, WrongPolicy);
@@ -337,32 +337,32 @@ module PortableServer
       raises (WrongPolicy);
 
     Object create_reference_with_id (in ObjectId oid,
-                                     in CORBA::RepositoryId intf)
+				     in CORBA::RepositoryId intf)
       raises (WrongPolicy);
 
     // Identity mapping operations:.
     ObjectId servant_to_id (in Servant p_servant)
       raises (ServantNotActive,
-              WrongPolicy);
+	      WrongPolicy);
 
     Object servant_to_reference (in Servant p_servant)
       raises (ServantNotActive, WrongPolicy);
 
     Servant reference_to_servant (in Object reference)
       raises (ObjectNotActive,
-              WrongAdapter,
-              WrongPolicy);
+	      WrongAdapter,
+	      WrongPolicy);
 
     ObjectId reference_to_id (in Object reference)
       raises (WrongAdapter,
-              WrongPolicy);
+	      WrongPolicy);
 
     Servant id_to_servant (in ObjectId oid)
       raises (ObjectNotActive, WrongPolicy);
 
     Object id_to_reference (in ObjectId oid)
       raises (ObjectNotActive,
-              WrongPolicy);
+	      WrongPolicy);
 
     readonly attribute CORBA::OctetSeq id;
 
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index f9e777c153b..d4d2f055929 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -42,7 +42,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "PortableServerC.inl"
+#include "PortableServerC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -466,7 +466,7 @@ void PortableServer::IDs::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ThreadPolicy_ptr
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_duplicate (
     PortableServer::ThreadPolicy_ptr p
   )
 {
@@ -475,7 +475,7 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::release (
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_release (
     PortableServer::ThreadPolicy_ptr p
   )
 {
@@ -484,14 +484,14 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ThreadPolicy_ptr
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_nil (void)
 {
   return PortableServer::ThreadPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_marshal (
     PortableServer::ThreadPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -617,7 +617,7 @@ PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::LifespanPolicy_ptr
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_duplicate (
     PortableServer::LifespanPolicy_ptr p
   )
 {
@@ -626,7 +626,7 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::release (
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_release (
     PortableServer::LifespanPolicy_ptr p
   )
 {
@@ -635,14 +635,14 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::LifespanPolicy_ptr
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_nil (void)
 {
   return PortableServer::LifespanPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_marshal (
     PortableServer::LifespanPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -766,7 +766,7 @@ PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::IdUniquenessPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_duplicate (
     PortableServer::IdUniquenessPolicy_ptr p
   )
 {
@@ -775,7 +775,7 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release (
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_release (
     PortableServer::IdUniquenessPolicy_ptr p
   )
 {
@@ -784,14 +784,14 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::IdUniquenessPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_nil (void)
 {
   return PortableServer::IdUniquenessPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_marshal (
     PortableServer::IdUniquenessPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -915,7 +915,7 @@ PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::IdAssignmentPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_duplicate (
     PortableServer::IdAssignmentPolicy_ptr p
   )
 {
@@ -924,7 +924,7 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release (
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_release (
     PortableServer::IdAssignmentPolicy_ptr p
   )
 {
@@ -933,14 +933,14 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::IdAssignmentPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_nil (void)
 {
   return PortableServer::IdAssignmentPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_marshal (
     PortableServer::IdAssignmentPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1066,7 +1066,7 @@ PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ImplicitActivationPolicy_ptr
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_duplicate (
     PortableServer::ImplicitActivationPolicy_ptr p
   )
 {
@@ -1075,7 +1075,7 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release (
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_release (
     PortableServer::ImplicitActivationPolicy_ptr p
   )
 {
@@ -1084,14 +1084,14 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ImplicitActivationPolicy_ptr
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_nil (void)
 {
   return PortableServer::ImplicitActivationPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_marshal (
     PortableServer::ImplicitActivationPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1219,7 +1219,7 @@ PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantRetentionPolicy_ptr
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_duplicate (
     PortableServer::ServantRetentionPolicy_ptr p
   )
 {
@@ -1228,7 +1228,7 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release (
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_release (
     PortableServer::ServantRetentionPolicy_ptr p
   )
 {
@@ -1237,14 +1237,14 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantRetentionPolicy_ptr
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_nil (void)
 {
   return PortableServer::ServantRetentionPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_marshal (
     PortableServer::ServantRetentionPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1372,7 +1372,7 @@ PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::RequestProcessingPolicy_ptr
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_duplicate (
     PortableServer::RequestProcessingPolicy_ptr p
   )
 {
@@ -1381,7 +1381,7 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release (
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_release (
     PortableServer::RequestProcessingPolicy_ptr p
   )
 {
@@ -1390,14 +1390,14 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::RequestProcessingPolicy_ptr
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_nil (void)
 {
   return PortableServer::RequestProcessingPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_marshal (
     PortableServer::RequestProcessingPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1523,7 +1523,7 @@ PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::POAManager_ptr
-TAO::Objref_Traits<PortableServer::POAManager>::duplicate (
+TAO::Objref_Traits<PortableServer::POAManager>::tao_duplicate (
     PortableServer::POAManager_ptr p
   )
 {
@@ -1532,7 +1532,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::POAManager>::release (
+TAO::Objref_Traits<PortableServer::POAManager>::tao_release (
     PortableServer::POAManager_ptr p
   )
 {
@@ -1541,14 +1541,14 @@ TAO::Objref_Traits<PortableServer::POAManager>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::POAManager_ptr
-TAO::Objref_Traits<PortableServer::POAManager>::nil (void)
+TAO::Objref_Traits<PortableServer::POAManager>::tao_nil (void)
 {
   return PortableServer::POAManager::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::POAManager>::marshal (
+TAO::Objref_Traits<PortableServer::POAManager>::tao_marshal (
     PortableServer::POAManager_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1771,7 +1771,7 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::AdapterActivator_ptr
-TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate (
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_duplicate (
     PortableServer::AdapterActivator_ptr p
   )
 {
@@ -1780,7 +1780,7 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::AdapterActivator>::release (
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_release (
     PortableServer::AdapterActivator_ptr p
   )
 {
@@ -1789,14 +1789,14 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::AdapterActivator_ptr
-TAO::Objref_Traits<PortableServer::AdapterActivator>::nil (void)
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_nil (void)
 {
   return PortableServer::AdapterActivator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::AdapterActivator>::marshal (
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_marshal (
     PortableServer::AdapterActivator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1916,7 +1916,7 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantManager_ptr
-TAO::Objref_Traits<PortableServer::ServantManager>::duplicate (
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_duplicate (
     PortableServer::ServantManager_ptr p
   )
 {
@@ -1925,7 +1925,7 @@ TAO::Objref_Traits<PortableServer::ServantManager>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ServantManager>::release (
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_release (
     PortableServer::ServantManager_ptr p
   )
 {
@@ -1934,14 +1934,14 @@ TAO::Objref_Traits<PortableServer::ServantManager>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantManager_ptr
-TAO::Objref_Traits<PortableServer::ServantManager>::nil (void)
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_nil (void)
 {
   return PortableServer::ServantManager::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantManager>::marshal (
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_marshal (
     PortableServer::ServantManager_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2061,7 +2061,7 @@ PortableServer::ServantManager::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantActivator_ptr
-TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate (
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_duplicate (
     PortableServer::ServantActivator_ptr p
   )
 {
@@ -2070,7 +2070,7 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ServantActivator>::release (
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_release (
     PortableServer::ServantActivator_ptr p
   )
 {
@@ -2079,14 +2079,14 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantActivator_ptr
-TAO::Objref_Traits<PortableServer::ServantActivator>::nil (void)
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_nil (void)
 {
   return PortableServer::ServantActivator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantActivator>::marshal (
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_marshal (
     PortableServer::ServantActivator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2210,7 +2210,7 @@ PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantLocator_ptr
-TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate (
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_duplicate (
     PortableServer::ServantLocator_ptr p
   )
 {
@@ -2219,7 +2219,7 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ServantLocator>::release (
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_release (
     PortableServer::ServantLocator_ptr p
   )
 {
@@ -2228,14 +2228,14 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantLocator_ptr
-TAO::Objref_Traits<PortableServer::ServantLocator>::nil (void)
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_nil (void)
 {
   return PortableServer::ServantLocator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantLocator>::marshal (
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_marshal (
     PortableServer::ServantLocator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2361,7 +2361,7 @@ PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::POA_ptr
-TAO::Objref_Traits<PortableServer::POA>::duplicate (
+TAO::Objref_Traits<PortableServer::POA>::tao_duplicate (
     PortableServer::POA_ptr p
   )
 {
@@ -2370,7 +2370,7 @@ TAO::Objref_Traits<PortableServer::POA>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::POA>::release (
+TAO::Objref_Traits<PortableServer::POA>::tao_release (
     PortableServer::POA_ptr p
   )
 {
@@ -2379,14 +2379,14 @@ TAO::Objref_Traits<PortableServer::POA>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::POA_ptr
-TAO::Objref_Traits<PortableServer::POA>::nil (void)
+TAO::Objref_Traits<PortableServer::POA>::tao_nil (void)
 {
   return PortableServer::POA::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::POA>::marshal (
+TAO::Objref_Traits<PortableServer::POA>::tao_marshal (
     PortableServer::POA_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3538,7 +3538,7 @@ PortableServer::POA::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::Current_ptr
-TAO::Objref_Traits<PortableServer::Current>::duplicate (
+TAO::Objref_Traits<PortableServer::Current>::tao_duplicate (
     PortableServer::Current_ptr p
   )
 {
@@ -3547,7 +3547,7 @@ TAO::Objref_Traits<PortableServer::Current>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::Current>::release (
+TAO::Objref_Traits<PortableServer::Current>::tao_release (
     PortableServer::Current_ptr p
   )
 {
@@ -3556,14 +3556,14 @@ TAO::Objref_Traits<PortableServer::Current>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::Current_ptr
-TAO::Objref_Traits<PortableServer::Current>::nil (void)
+TAO::Objref_Traits<PortableServer::Current>::tao_nil (void)
 {
   return PortableServer::Current::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::Current>::marshal (
+TAO::Objref_Traits<PortableServer::Current>::tao_marshal (
     PortableServer::Current_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -4767,3 +4767,4 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 4d3f66bc31b..f0e092c8013 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -3206,14 +3206,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::POA>
   {
-    static PortableServer::POA_ptr duplicate (
+    static PortableServer::POA_ptr tao_duplicate (
         PortableServer::POA_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::POA_ptr
       );
-    static PortableServer::POA_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::POA_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::POA_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3229,14 +3229,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ThreadPolicy>
   {
-    static PortableServer::ThreadPolicy_ptr duplicate (
+    static PortableServer::ThreadPolicy_ptr tao_duplicate (
         PortableServer::ThreadPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ThreadPolicy_ptr
       );
-    static PortableServer::ThreadPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ThreadPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ThreadPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3252,14 +3252,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::LifespanPolicy>
   {
-    static PortableServer::LifespanPolicy_ptr duplicate (
+    static PortableServer::LifespanPolicy_ptr tao_duplicate (
         PortableServer::LifespanPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::LifespanPolicy_ptr
       );
-    static PortableServer::LifespanPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::LifespanPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::LifespanPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3273,14 +3273,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdUniquenessPolicy>
   {
-    static PortableServer::IdUniquenessPolicy_ptr duplicate (
+    static PortableServer::IdUniquenessPolicy_ptr tao_duplicate (
         PortableServer::IdUniquenessPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::IdUniquenessPolicy_ptr
       );
-    static PortableServer::IdUniquenessPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::IdUniquenessPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::IdUniquenessPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3294,14 +3294,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdAssignmentPolicy>
   {
-    static PortableServer::IdAssignmentPolicy_ptr duplicate (
+    static PortableServer::IdAssignmentPolicy_ptr tao_duplicate (
         PortableServer::IdAssignmentPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::IdAssignmentPolicy_ptr
       );
-    static PortableServer::IdAssignmentPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::IdAssignmentPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::IdAssignmentPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3317,14 +3317,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ImplicitActivationPolicy>
   {
-    static PortableServer::ImplicitActivationPolicy_ptr duplicate (
+    static PortableServer::ImplicitActivationPolicy_ptr tao_duplicate (
         PortableServer::ImplicitActivationPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ImplicitActivationPolicy_ptr
       );
-    static PortableServer::ImplicitActivationPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ImplicitActivationPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ImplicitActivationPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3338,14 +3338,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantRetentionPolicy>
   {
-    static PortableServer::ServantRetentionPolicy_ptr duplicate (
+    static PortableServer::ServantRetentionPolicy_ptr tao_duplicate (
         PortableServer::ServantRetentionPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ServantRetentionPolicy_ptr
       );
-    static PortableServer::ServantRetentionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ServantRetentionPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ServantRetentionPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3359,14 +3359,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::RequestProcessingPolicy>
   {
-    static PortableServer::RequestProcessingPolicy_ptr duplicate (
+    static PortableServer::RequestProcessingPolicy_ptr tao_duplicate (
         PortableServer::RequestProcessingPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::RequestProcessingPolicy_ptr
       );
-    static PortableServer::RequestProcessingPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::RequestProcessingPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::RequestProcessingPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3382,14 +3382,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::POAManager>
   {
-    static PortableServer::POAManager_ptr duplicate (
+    static PortableServer::POAManager_ptr tao_duplicate (
         PortableServer::POAManager_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::POAManager_ptr
       );
-    static PortableServer::POAManager_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::POAManager_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::POAManager_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3405,14 +3405,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::AdapterActivator>
   {
-    static PortableServer::AdapterActivator_ptr duplicate (
+    static PortableServer::AdapterActivator_ptr tao_duplicate (
         PortableServer::AdapterActivator_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::AdapterActivator_ptr
       );
-    static PortableServer::AdapterActivator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::AdapterActivator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::AdapterActivator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3426,14 +3426,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantManager>
   {
-    static PortableServer::ServantManager_ptr duplicate (
+    static PortableServer::ServantManager_ptr tao_duplicate (
         PortableServer::ServantManager_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ServantManager_ptr
       );
-    static PortableServer::ServantManager_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ServantManager_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ServantManager_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3447,14 +3447,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantActivator>
   {
-    static PortableServer::ServantActivator_ptr duplicate (
+    static PortableServer::ServantActivator_ptr tao_duplicate (
         PortableServer::ServantActivator_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ServantActivator_ptr
       );
-    static PortableServer::ServantActivator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ServantActivator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ServantActivator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3468,14 +3468,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantLocator>
   {
-    static PortableServer::ServantLocator_ptr duplicate (
+    static PortableServer::ServantLocator_ptr tao_duplicate (
         PortableServer::ServantLocator_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ServantLocator_ptr
       );
-    static PortableServer::ServantLocator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ServantLocator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ServantLocator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3491,14 +3491,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::Current>
   {
-    static PortableServer::Current_ptr duplicate (
+    static PortableServer::Current_ptr tao_duplicate (
         PortableServer::Current_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::Current_ptr
       );
-    static PortableServer::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::Current_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::Current_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3892,7 +3892,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 // be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
-#include "PortableServerC.inl"
+#include "PortableServerC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -3906,3 +3906,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
new file mode 100644
index 00000000000..38aa32569ba
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 4e6f1ed2dd0..ff320d9ee3c 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -152,8 +152,8 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
   TAO_Stub *stub = 0;
 
   TAO_POA_Current_Impl *poa_current_impl =
-    static_cast<TAO_POA_Current_Impl *>
-                    (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+    ACE_static_cast(TAO_POA_Current_Impl *,
+                    TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
   CORBA::ORB_ptr servant_orb = 0;
 
@@ -162,6 +162,7 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
     {
       servant_orb = poa_current_impl->orb_core ().orb () ;
 
+
       stub =
         poa_current_impl->poa ()->key_to_stub (
             poa_current_impl->object_key (),
@@ -215,7 +216,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
 
   // Fetch the skeleton for this operation
   if (this->_find (opname, skel,
-         static_cast <unsigned int> (req.operation_length())) == -1)
+         ACE_static_cast (unsigned int, req.operation_length())) == -1)
     {
       ACE_THROW (CORBA::BAD_OPERATION ());
     }
@@ -281,7 +282,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest &req,
 
   // Fetch the skeleton for this operation
   if (this->_find (opname, skel,
-         static_cast <unsigned int> (req.operation_length())) == -1)
+         ACE_static_cast (unsigned int, req.operation_length())) == -1)
     {
       ACE_THROW (CORBA::BAD_OPERATION ());
     }
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 9ca8fb1a055..be7712f6f00 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -56,14 +56,14 @@ TAO_ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   // 64-bit platforms.
 
   if (sizeof (this) == 4)       // 32 bit address
-    id = static_cast <CORBA::ULong> (
-                     reinterpret_cast <ptrdiff_t>
-                                      (&(this->server_request_)));
+    id = ACE_static_cast (CORBA::ULong,
+                          ACE_reinterpret_cast (ptrdiff_t,
+                                                &(this->server_request_)));
 
   else if (sizeof (this) == 8)  // 64 bit address -- use lower 32 bits
-    id = static_cast <CORBA::ULong> (
-                     reinterpret_cast <ptrdiff_t>
-                               (&(this->server_request_)) & 0xFFFFFFFFu);
+    id = ACE_static_cast (CORBA::ULong,
+                          ACE_reinterpret_cast (ptrdiff_t,
+                               &(this->server_request_)) & 0xFFFFFFFFu);
 
   else
     // @@ Rather than fallback on the GIOP request ID, we should use
diff --git a/TAO/tao/PortableServer/diffs/Default_ORT.diff b/TAO/tao/PortableServer/diffs/Default_ORT.diff
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/Default_ORT.diff
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 8d0280f1a96..2562b36e5ee 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -8,7 +8,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Client_Strategy_Factory.h"
 #include "tao/CDR.h"
-#include "tao/SystemException.h"
 
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
@@ -298,7 +297,7 @@ TAO_Profile::create_tagged_profile (void)
 #else
       this->tagged_profile_->profile_data.length (length);
       CORBA::Octet *buffer =
-        this->tagged_profile_->profile_data.get_buffer ();
+        this->tagged_profile_.profile_data.get_buffer ();
 
       for (const ACE_Message_Block *i = encap.begin ();
            i != encap.end ();
@@ -593,7 +592,7 @@ TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL)
       //        updated.
       ACE_THROW (CORBA::BAD_PARAM (
                    CORBA::SystemException::_tao_minor_code (
-                      0,
+                      TAO_DEFAULT_MINOR_CODE,
                       EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -624,7 +623,7 @@ TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL)
       //        updated.
       ACE_THROW (CORBA::BAD_PARAM (
                    CORBA::SystemException::_tao_minor_code (
-                     0,
+                     TAO_DEFAULT_MINOR_CODE,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -637,12 +636,6 @@ TAO_Profile::supports_multicast (void) const
   return 0;
 }
 
-bool
-TAO_Profile::supports_non_blocking_oneways (void) const
-{
-  return !(this->version_.major == 1 && this->version_.minor == 0);
-}
-
 void
 TAO_Profile::addressing_mode (CORBA::Short addr
                               ACE_ENV_ARG_DECL)
@@ -659,7 +652,7 @@ TAO_Profile::addressing_mode (CORBA::Short addr
     default:
       ACE_THROW (CORBA::BAD_PARAM (
              CORBA::SystemException::_tao_minor_code (
-               0,
+               TAO_DEFAULT_MINOR_CODE,
                EINVAL),
              CORBA::COMPLETED_NO));
     }
@@ -673,7 +666,7 @@ TAO_Profile::parse_string (const char *ior
     {
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     0,
+                     TAO_DEFAULT_MINOR_CODE,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -705,7 +698,7 @@ TAO_Profile::parse_string (const char *ior
     {
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     0,
+                     TAO_DEFAULT_MINOR_CODE,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 4a2e5227c05..455101ebb2c 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -150,9 +150,6 @@ public:
   /// Returns true if this profile can specify multicast endpoints.
   virtual int supports_multicast (void) const;
 
-  /// Returns true if this profile supports non blocking oneways
-  virtual bool supports_non_blocking_oneways (void) const;
-
   /**
    * Set the addressing mode if a remote servant replies with
    * an addressing mode exception.  If this profile doesn't
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 42a79a32eb5..8e79ec8879d 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -1,5 +1,4 @@
 // $Id$
-
 #include "Profile_Transport_Resolver.h"
 #include "Profile.h"
 #include "Transport.h"
@@ -11,7 +10,6 @@
 #include "Connector_Registry.h"
 #include "Transport_Connector.h"
 #include "Endpoint.h"
-#include "SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Profile_Transport_Resolver.inl"
@@ -79,7 +77,6 @@ namespace TAO
           ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    // Select the endpoint
     es->select_endpoint (this,
                          max_time_val
                          ACE_ENV_ARG_PARAMETER);
@@ -98,7 +95,7 @@ namespace TAO
       {
         ACE_THROW (CORBA::INTERNAL (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             EINVAL),
                           CORBA::COMPLETED_NO));
       }
@@ -111,7 +108,6 @@ namespace TAO
       }
   }
 
-
   bool
   Profile_Transport_Resolver::try_connect (
       TAO_Transport_Descriptor_Interface *desc,
@@ -121,17 +117,18 @@ namespace TAO
   {
     TAO_Connector_Registry *conn_reg =
       this->stub_->orb_core ()->connector_registry (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
+                                    ACE_ENV_SINGLE_ARG_PARAMETER
+                                  );
     ACE_CHECK_RETURN (false);
 
     if (conn_reg == 0)
       {
         ACE_THROW_RETURN (CORBA::INTERNAL (
-                            CORBA::SystemException::_tao_minor_code (
-                              0,
-                              EINVAL),
-                            CORBA::COMPLETED_NO),
-                          false);
+            CORBA::SystemException::_tao_minor_code (
+              TAO_DEFAULT_MINOR_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO),
+                          0);
       }
 
     ACE_Time_Value connection_timeout;
@@ -151,7 +148,6 @@ namespace TAO
         max_wait_time = max_time_value;
       }
 
-
     // Obtain a connection.
     this->transport_ =
       conn_reg->get_connector (desc->endpoint ()->tag ())->connect (
@@ -161,20 +157,20 @@ namespace TAO
         ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (false);
 
-    // A timeout error occurred.
-    // If the user has set a roundtrip timeout policy, throw a timeout
-    // exception.  Otherwise, just fall through and return false to
-    // look at the next endpoint.
-    if (this->transport_ == 0
-        && is_conn_timeout == false
-        && errno == ETIME)
+    // A timeout error occurred
+    // If the user has set a roundtrip timeout policy, then throw a
+    // timeout exception, else just fall through and return false to
+    // look at the next endpoint
+    if (this->transport_ == 0 &&
+        errno == ETIME &&
+        is_conn_timeout == false)
       {
         ACE_THROW_RETURN (CORBA::TIMEOUT (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO_TIMEOUT_CONNECT_MINOR_CODE,
-                              errno),
-                            CORBA::COMPLETED_NO),
-                          false);
+            CORBA::SystemException::_tao_minor_code (
+                 TAO_TIMEOUT_CONNECT_MINOR_CODE,
+                 errno),
+            CORBA::COMPLETED_NO),
+            false);
       }
     else if (this->transport_ == 0)
       {
@@ -208,7 +204,7 @@ namespace TAO
                       CORBA::PolicyList (0),
                       CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   }
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 2dadf94bb98..482ce0a9f18 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -23,7 +23,7 @@
 
 #include "ace/CORBA_macros.h"
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 class TAO_Stub;
 class TAO_Profile;
@@ -34,6 +34,7 @@ class TAO_Transport_Descriptor_Interface;
 
 namespace CORBA
 {
+  class SystemException;
   class Environment;
   class Object;
   class PolicyList;
@@ -57,22 +58,13 @@ namespace TAO
    * object. This class helps in choosing the right profile, and pick
    * a transport from cache (or create a new transport if needed) that
    * represents the profile.
+   *
    */
   class TAO_Export Profile_Transport_Resolver
   {
   public:
-    /// Constructor
-    /**
-     * With @a block we tell whether this resolved should always deliver
-     * a connection by blocking or unblock before the connection is
-     * completely established. Please note that this has *nothing* to
-     * do with the synchronous or asynch connect strategy used for
-     * making connections. This is a local flag used by the clients of
-     * this to dictate some local behavior.
-     */
-    Profile_Transport_Resolver (CORBA::Object *p,
-                                TAO_Stub *stub,
-                                bool block = true);
+    Profile_Transport_Resolver (CORBA::Object *ep,
+                                TAO_Stub *);
 
     ~Profile_Transport_Resolver (void);
 
@@ -87,11 +79,11 @@ namespace TAO
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+
     //@{
     /**
      * Accessors and mutators for this class. The following methods
-     * are used by the clients of this class to access strategies and
-     * other internal workings.
+     * are used by the clients of this class to access.
      */
 
     /// Mutator for profile.
@@ -108,10 +100,6 @@ namespace TAO
 
     /// Accessor for the transport reserved for this invocation.
     TAO_Transport *transport (void) const;
-
-    /// Accessor to indicate whether we should deliver a connection
-    /// blocking for completed connections
-    bool blocked (void) const;
     //@}
 
     /// Signal to let the resolver know that the transport has been
@@ -175,9 +163,6 @@ namespace TAO
      * avoid.
      */
     CORBA::PolicyList *inconsistent_policies_;
-
-    /// Should we block while trying to make a connection
-    const bool blocked_;
   };
 } // TAO namespace end
 
diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl
index 69b8c78e9e7..6f660433689 100644
--- a/TAO/tao/Profile_Transport_Resolver.inl
+++ b/TAO/tao/Profile_Transport_Resolver.inl
@@ -5,15 +5,13 @@ namespace TAO
   ACE_INLINE
   Profile_Transport_Resolver::
       Profile_Transport_Resolver (CORBA::Object *p,
-                                  TAO_Stub *stub,
-                                  bool block)
+                                  TAO_Stub *stub)
     : obj_ (p)
       , stub_ (stub)
       , transport_ (0)
       , profile_ (0)
       , is_released_ (false)
       , inconsistent_policies_ (0)
-      , blocked_ (block)
   {
   }
 
@@ -41,12 +39,6 @@ namespace TAO
     return this->transport_;
   }
 
-  ACE_INLINE bool
-  Profile_Transport_Resolver::blocked (void) const
-  {
-    return this->blocked_;
-  }
-
   ACE_INLINE void
   Profile_Transport_Resolver::transport_released (void) const
   {
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
index ebf39bedab6..7af02255e7d 100644
--- a/TAO/tao/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA.mpc
@@ -24,8 +24,4 @@ project : taolib, core {
   Resource_Files {
     RTCORBA
   }
-
-  PIDL_Files {
-    RTCORBA
-  }
 }
diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
index ddc3c2c9dc9..47554523c2d 100644
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA/RTCORBA.pidl
@@ -52,6 +52,7 @@
 #ifndef _RT_CORBA_IDL_
 #define _RT_CORBA_IDL_
 
+#include <orb.idl>
 #include <IOP.pidl>
 #include <TimeBase.pidl>
 
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index 7c31e119b55..b6cec146889 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:303
+// be\be_codegen.cpp:323
 
 
 #include "RTCORBA.h"
@@ -45,7 +45,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "RTCORBAC.inl"
+#include "RTCORBAC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -74,26 +74,28 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
   return 1;
 }
 
+
+// TAO_IDL - Generated from
 // be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_NativePriority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4e617469), 
-  ACE_NTOHL (0x76655072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x4e617469),
+  ACE_NTOHL (0x76655072),
+  ACE_NTOHL (0x696f7269),
+  ACE_NTOHL (0x74793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/NativePriority:1.0
     15,
-  ACE_NTOHL (0x4e617469), 
-  ACE_NTOHL (0x76655072), 
-  ACE_NTOHL (0x696f7269), 
+  ACE_NTOHL (0x4e617469),
+  ACE_NTOHL (0x76655072),
+  ACE_NTOHL (0x696f7269),
   ACE_NTOHL (0x74790000),  // name = NativePriority
     CORBA::tk_short,
 
@@ -120,18 +122,18 @@ static const CORBA::Long _oc_RTCORBA_Priority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
     9,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
   ACE_NTOHL (0x0),  // name = Priority
     CORBA::tk_short,
 
@@ -158,20 +160,20 @@ static const CORBA::Long _oc_RTCORBA_NetworkPriority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4e657477), 
-  ACE_NTOHL (0x6f726b50), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x6974793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x4e657477),
+  ACE_NTOHL (0x6f726b50),
+  ACE_NTOHL (0x72696f72),
+  ACE_NTOHL (0x6974793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/NetworkPriority:1.0
     16,
-  ACE_NTOHL (0x4e657477), 
-  ACE_NTOHL (0x6f726b50), 
-  ACE_NTOHL (0x72696f72), 
+  ACE_NTOHL (0x4e657477),
+  ACE_NTOHL (0x6f726b50),
+  ACE_NTOHL (0x72696f72),
   ACE_NTOHL (0x69747900),  // name = NetworkPriority
     CORBA::tk_long,
 
@@ -198,20 +200,20 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4964), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4964),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolId:1.0
     13,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4964), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4964),
   ACE_NTOHL (0x0),  // name = ThreadpoolId
     CORBA::tk_ulong,
 
@@ -238,58 +240,58 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e653a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4c61),
+  ACE_NTOHL (0x6e653a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
     15,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4c61),
   ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
   3, // member count
     14,
-  ACE_NTOHL (0x6c616e65), 
-  ACE_NTOHL (0x5f707269), 
-  ACE_NTOHL (0x6f726974), 
+  ACE_NTOHL (0x6c616e65),
+  ACE_NTOHL (0x5f707269),
+  ACE_NTOHL (0x6f726974),
   ACE_NTOHL (0x79000000),  // name = lane_priority
     CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x5254434f),
+    ACE_NTOHL (0x5242412f),
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
         9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
 
   15,
-  ACE_NTOHL (0x73746174), 
-  ACE_NTOHL (0x69635f74), 
-  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x73746174),
+  ACE_NTOHL (0x69635f74),
+  ACE_NTOHL (0x68726561),
   ACE_NTOHL (0x64730000),  // name = static_threads
     CORBA::tk_ulong,
 
   16,
-  ACE_NTOHL (0x64796e61), 
-  ACE_NTOHL (0x6d69635f), 
-  ACE_NTOHL (0x74687265), 
+  ACE_NTOHL (0x64796e61),
+  ACE_NTOHL (0x6d69635f),
+  ACE_NTOHL (0x74687265),
   ACE_NTOHL (0x61647300),  // name = dynamic_threads
     CORBA::tk_ulong,
 
@@ -309,20 +311,20 @@ namespace RTCORBA
     &_tc_TAO_tc_RTCORBA_ThreadpoolLane;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 RTCORBA::ThreadpoolLane::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   ThreadpoolLane *_tao_tmp_pointer =
-    static_cast<ThreadpoolLane *> (_tao_void_pointer);
+    ACE_static_cast (ThreadpoolLane *, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CS_)
@@ -369,7 +371,7 @@ void RTCORBA::ThreadpoolLanes::_tao_any_destructor (
   )
 {
   ThreadpoolLanes * _tao_tmp_pointer =
-    static_cast<ThreadpoolLanes *> (_tao_void_pointer);
+    ACE_static_cast (ThreadpoolLanes *, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -382,20 +384,20 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e65733a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4c61),
+  ACE_NTOHL (0x6e65733a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0
     16,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4c61),
   ACE_NTOHL (0x6e657300),  // name = ThreadpoolLanes
     CORBA::tk_sequence, // typecode kind
   228, // encapsulation length
@@ -404,58 +406,58 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
     212, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       39,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x54687265), 
-      ACE_NTOHL (0x6164706f), 
-      ACE_NTOHL (0x6f6c4c61), 
-      ACE_NTOHL (0x6e653a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x5254434f),
+      ACE_NTOHL (0x5242412f),
+      ACE_NTOHL (0x54687265),
+      ACE_NTOHL (0x6164706f),
+      ACE_NTOHL (0x6f6c4c61),
+      ACE_NTOHL (0x6e653a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
             15,
-      ACE_NTOHL (0x54687265), 
-      ACE_NTOHL (0x6164706f), 
-      ACE_NTOHL (0x6f6c4c61), 
+      ACE_NTOHL (0x54687265),
+      ACE_NTOHL (0x6164706f),
+      ACE_NTOHL (0x6f6c4c61),
       ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
       3, // member count
             14,
-      ACE_NTOHL (0x6c616e65), 
-      ACE_NTOHL (0x5f707269), 
-      ACE_NTOHL (0x6f726974), 
+      ACE_NTOHL (0x6c616e65),
+      ACE_NTOHL (0x5f707269),
+      ACE_NTOHL (0x6f726974),
       ACE_NTOHL (0x79000000),  // name = lane_priority
             CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x5254434f),
+        ACE_NTOHL (0x5242412f),
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
                 9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
 
       15,
-      ACE_NTOHL (0x73746174), 
-      ACE_NTOHL (0x69635f74), 
-      ACE_NTOHL (0x68726561), 
+      ACE_NTOHL (0x73746174),
+      ACE_NTOHL (0x69635f74),
+      ACE_NTOHL (0x68726561),
       ACE_NTOHL (0x64730000),  // name = static_threads
             CORBA::tk_ulong,
 
       16,
-      ACE_NTOHL (0x64796e61), 
-      ACE_NTOHL (0x6d69635f), 
-      ACE_NTOHL (0x74687265), 
+      ACE_NTOHL (0x64796e61),
+      ACE_NTOHL (0x6d69635f),
+      ACE_NTOHL (0x74687265),
       ACE_NTOHL (0x61647300),  // name = dynamic_threads
             CORBA::tk_ulong,
 
@@ -485,32 +487,32 @@ static const CORBA::Long _oc_RTCORBA_PriorityModel[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x6c3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModel:1.0
   14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x4d6f6465),
   ACE_NTOHL (0x6c000000),  // name = PriorityModel
   2, // member count
   18,
-  ACE_NTOHL (0x434c4945), 
-  ACE_NTOHL (0x4e545f50), 
-  ACE_NTOHL (0x524f5041), 
-  ACE_NTOHL (0x47415445), 
+  ACE_NTOHL (0x434c4945),
+  ACE_NTOHL (0x4e545f50),
+  ACE_NTOHL (0x524f5041),
+  ACE_NTOHL (0x47415445),
   ACE_NTOHL (0x44000000),  // name = CLIENT_PROPAGATED
   16,
-  ACE_NTOHL (0x53455256), 
-  ACE_NTOHL (0x45525f44), 
-  ACE_NTOHL (0x45434c41), 
+  ACE_NTOHL (0x53455256),
+  ACE_NTOHL (0x45525f44),
+  ACE_NTOHL (0x45434c41),
   ACE_NTOHL (0x52454400),  // name = SERVER_DECLARED
   };
 
@@ -535,7 +537,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::PriorityModelPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::duplicate (
+TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_duplicate (
     RTCORBA::PriorityModelPolicy_ptr p
   )
 {
@@ -544,7 +546,7 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release (
+TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_release (
     RTCORBA::PriorityModelPolicy_ptr p
   )
 {
@@ -553,14 +555,14 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::PriorityModelPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::nil (void)
+TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_nil (void)
 {
   return RTCORBA::PriorityModelPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::marshal (
+TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_marshal (
     RTCORBA::PriorityModelPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -569,7 +571,7 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_PriorityModelPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -580,11 +582,11 @@ RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityModelPolicy *_tao_tmp_pointer =
-    static_cast<PriorityModelPolicy *> (_tao_void_pointer);
+    ACE_static_cast (PriorityModelPolicy *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -598,10 +600,10 @@ RTCORBA::PriorityModelPolicy::_narrow (
     {
       return PriorityModelPolicy::_nil ();
     }
-  
+
   PriorityModelPolicy_ptr proxy =
     dynamic_cast<PriorityModelPolicy_ptr> (_tao_objref);
-  
+
   return PriorityModelPolicy::_duplicate (proxy);
 }
 
@@ -615,10 +617,10 @@ RTCORBA::PriorityModelPolicy::_unchecked_narrow (
     {
       return PriorityModelPolicy::_nil ();
     }
-  
+
   PriorityModelPolicy_ptr proxy =
     dynamic_cast<PriorityModelPolicy_ptr> (_tao_objref);
-  
+
   return PriorityModelPolicy::_duplicate (proxy);
 }
 
@@ -629,7 +631,7 @@ RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -684,22 +686,22 @@ static const CORBA::Long _oc_RTCORBA_PriorityModelPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x6c506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0
     20,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x6c506f6c),
   ACE_NTOHL (0x69637900),  // name = PriorityModelPolicy
   };
 
@@ -724,7 +726,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::ThreadpoolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::duplicate (
+TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_duplicate (
     RTCORBA::ThreadpoolPolicy_ptr p
   )
 {
@@ -733,7 +735,7 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release (
+TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_release (
     RTCORBA::ThreadpoolPolicy_ptr p
   )
 {
@@ -742,14 +744,14 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::ThreadpoolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::nil (void)
+TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_nil (void)
 {
   return RTCORBA::ThreadpoolPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::marshal (
+TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_marshal (
     RTCORBA::ThreadpoolPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -758,7 +760,7 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_ThreadpoolPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -769,11 +771,11 @@ RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ThreadpoolPolicy *_tao_tmp_pointer =
-    static_cast<ThreadpoolPolicy *> (_tao_void_pointer);
+    ACE_static_cast (ThreadpoolPolicy *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -787,10 +789,10 @@ RTCORBA::ThreadpoolPolicy::_narrow (
     {
       return ThreadpoolPolicy::_nil ();
     }
-  
+
   ThreadpoolPolicy_ptr proxy =
     dynamic_cast<ThreadpoolPolicy_ptr> (_tao_objref);
-  
+
   return ThreadpoolPolicy::_duplicate (proxy);
 }
 
@@ -804,10 +806,10 @@ RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
     {
       return ThreadpoolPolicy::_nil ();
     }
-  
+
   ThreadpoolPolicy_ptr proxy =
     dynamic_cast<ThreadpoolPolicy_ptr> (_tao_objref);
-  
+
   return ThreadpoolPolicy::_duplicate (proxy);
 }
 
@@ -818,7 +820,7 @@ RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -873,22 +875,22 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0
     17,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ThreadpoolPolicy
   };
 
@@ -913,7 +915,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::ProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::duplicate (
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_duplicate (
     RTCORBA::ProtocolProperties_ptr p
   )
 {
@@ -922,7 +924,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release (
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_release (
     RTCORBA::ProtocolProperties_ptr p
   )
 {
@@ -931,14 +933,14 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::ProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::nil (void)
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_nil (void)
 {
   return RTCORBA::ProtocolProperties::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal (
+TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_marshal (
     RTCORBA::ProtocolProperties_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -947,7 +949,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_ProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -958,11 +960,11 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void)
 RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProtocolProperties *_tao_tmp_pointer =
-    static_cast<ProtocolProperties *> (_tao_void_pointer);
+    ACE_static_cast (ProtocolProperties *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -976,10 +978,10 @@ RTCORBA::ProtocolProperties::_narrow (
     {
       return ProtocolProperties::_nil ();
     }
-  
+
   ProtocolProperties_ptr proxy =
     dynamic_cast<ProtocolProperties_ptr> (_tao_objref);
-  
+
   return ProtocolProperties::_duplicate (proxy);
 }
 
@@ -993,10 +995,10 @@ RTCORBA::ProtocolProperties::_unchecked_narrow (
     {
       return ProtocolProperties::_nil ();
     }
-  
+
   ProtocolProperties_ptr proxy =
     dynamic_cast<ProtocolProperties_ptr> (_tao_objref);
-  
+
   return ProtocolProperties::_duplicate (proxy);
 }
 
@@ -1007,7 +1009,7 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1058,22 +1060,22 @@ static const CORBA::Long _oc_RTCORBA_ProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
+  ACE_NTOHL (0x65733a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
     19,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
   ACE_NTOHL (0x65730000),  // name = ProtocolProperties
   };
 
@@ -1098,104 +1100,104 @@ static const CORBA::Long _oc_RTCORBA_Protocol[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
     9,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
   ACE_NTOHL (0x0),  // name = Protocol
   3, // member count
     14,
-  ACE_NTOHL (0x70726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x5f747970), 
+  ACE_NTOHL (0x70726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x5f747970),
   ACE_NTOHL (0x65000000),  // name = protocol_type
     CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
-    ACE_NTOHL (0x643a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x494f502f),
+    ACE_NTOHL (0x50726f66),
+    ACE_NTOHL (0x696c6549),
+    ACE_NTOHL (0x643a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
         10,
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x50726f66),
+    ACE_NTOHL (0x696c6549),
     ACE_NTOHL (0x64000000),  // name = ProfileId
         CORBA::tk_ulong,
 
 
   24,
-  ACE_NTOHL (0x6f72625f), 
-  ACE_NTOHL (0x70726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x5f70726f), 
-  ACE_NTOHL (0x70657274), 
+  ACE_NTOHL (0x6f72625f),
+  ACE_NTOHL (0x70726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x5f70726f),
+  ACE_NTOHL (0x70657274),
   ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
     CORBA::tk_objref, // typecode kind
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     43,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65733a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x5254434f),
+    ACE_NTOHL (0x5242412f),
+    ACE_NTOHL (0x50726f74),
+    ACE_NTOHL (0x6f636f6c),
+    ACE_NTOHL (0x50726f70),
+    ACE_NTOHL (0x65727469),
+    ACE_NTOHL (0x65733a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
         19,
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x50726f74),
+    ACE_NTOHL (0x6f636f6c),
+    ACE_NTOHL (0x50726f70),
+    ACE_NTOHL (0x65727469),
     ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-    
+
   30,
-  ACE_NTOHL (0x7472616e), 
-  ACE_NTOHL (0x73706f72), 
-  ACE_NTOHL (0x745f7072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5f70), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x7472616e),
+  ACE_NTOHL (0x73706f72),
+  ACE_NTOHL (0x745f7072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c5f70),
+  ACE_NTOHL (0x726f7065),
+  ACE_NTOHL (0x72746965),
   ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
     CORBA::tk_objref, // typecode kind
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     43,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65733a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x5254434f),
+    ACE_NTOHL (0x5242412f),
+    ACE_NTOHL (0x50726f74),
+    ACE_NTOHL (0x6f636f6c),
+    ACE_NTOHL (0x50726f70),
+    ACE_NTOHL (0x65727469),
+    ACE_NTOHL (0x65733a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
         19,
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x50726f74),
+    ACE_NTOHL (0x6f636f6c),
+    ACE_NTOHL (0x50726f70),
+    ACE_NTOHL (0x65727469),
     ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-    
+
 };
 
 static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol (
@@ -1212,20 +1214,20 @@ namespace RTCORBA
     &_tc_TAO_tc_RTCORBA_Protocol;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 RTCORBA::Protocol::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   Protocol *_tao_tmp_pointer =
-    static_cast<Protocol *> (_tao_void_pointer);
+    ACE_static_cast (Protocol *, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CS_)
@@ -1272,7 +1274,7 @@ void RTCORBA::ProtocolList::_tao_any_destructor (
   )
 {
   ProtocolList * _tao_tmp_pointer =
-    static_cast<ProtocolList *> (_tao_void_pointer);
+    ACE_static_cast (ProtocolList *, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1285,20 +1287,20 @@ static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ProtocolList:1.0
     13,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x4c697374),
   ACE_NTOHL (0x0),  // name = ProtocolList
     CORBA::tk_sequence, // typecode kind
   400, // encapsulation length
@@ -1307,104 +1309,104 @@ static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
     384, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x50726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x5254434f),
+      ACE_NTOHL (0x5242412f),
+      ACE_NTOHL (0x50726f74),
+      ACE_NTOHL (0x6f636f6c),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
             9,
-      ACE_NTOHL (0x50726f74), 
-      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x50726f74),
+      ACE_NTOHL (0x6f636f6c),
       ACE_NTOHL (0x0),  // name = Protocol
       3, // member count
             14,
-      ACE_NTOHL (0x70726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x5f747970), 
+      ACE_NTOHL (0x70726f74),
+      ACE_NTOHL (0x6f636f6c),
+      ACE_NTOHL (0x5f747970),
       ACE_NTOHL (0x65000000),  // name = protocol_type
             CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
-        ACE_NTOHL (0x643a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x494f502f),
+        ACE_NTOHL (0x50726f66),
+        ACE_NTOHL (0x696c6549),
+        ACE_NTOHL (0x643a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
                 10,
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x50726f66),
+        ACE_NTOHL (0x696c6549),
         ACE_NTOHL (0x64000000),  // name = ProfileId
                 CORBA::tk_ulong,
 
 
       24,
-      ACE_NTOHL (0x6f72625f), 
-      ACE_NTOHL (0x70726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x5f70726f), 
-      ACE_NTOHL (0x70657274), 
+      ACE_NTOHL (0x6f72625f),
+      ACE_NTOHL (0x70726f74),
+      ACE_NTOHL (0x6f636f6c),
+      ACE_NTOHL (0x5f70726f),
+      ACE_NTOHL (0x70657274),
       ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
             CORBA::tk_objref, // typecode kind
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65733a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x5254434f),
+        ACE_NTOHL (0x5242412f),
+        ACE_NTOHL (0x50726f74),
+        ACE_NTOHL (0x6f636f6c),
+        ACE_NTOHL (0x50726f70),
+        ACE_NTOHL (0x65727469),
+        ACE_NTOHL (0x65733a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
                 19,
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x50726f74),
+        ACE_NTOHL (0x6f636f6c),
+        ACE_NTOHL (0x50726f70),
+        ACE_NTOHL (0x65727469),
         ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-        
+
       30,
-      ACE_NTOHL (0x7472616e), 
-      ACE_NTOHL (0x73706f72), 
-      ACE_NTOHL (0x745f7072), 
-      ACE_NTOHL (0x6f746f63), 
-      ACE_NTOHL (0x6f6c5f70), 
-      ACE_NTOHL (0x726f7065), 
-      ACE_NTOHL (0x72746965), 
+      ACE_NTOHL (0x7472616e),
+      ACE_NTOHL (0x73706f72),
+      ACE_NTOHL (0x745f7072),
+      ACE_NTOHL (0x6f746f63),
+      ACE_NTOHL (0x6f6c5f70),
+      ACE_NTOHL (0x726f7065),
+      ACE_NTOHL (0x72746965),
       ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
             CORBA::tk_objref, // typecode kind
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65733a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x5254434f),
+        ACE_NTOHL (0x5242412f),
+        ACE_NTOHL (0x50726f74),
+        ACE_NTOHL (0x6f636f6c),
+        ACE_NTOHL (0x50726f70),
+        ACE_NTOHL (0x65727469),
+        ACE_NTOHL (0x65733a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
                 19,
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x50726f74),
+        ACE_NTOHL (0x6f636f6c),
+        ACE_NTOHL (0x50726f70),
+        ACE_NTOHL (0x65727469),
         ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-        
+
 
     0U,
 
@@ -1431,7 +1433,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::ServerProtocolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::duplicate (
+TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_duplicate (
     RTCORBA::ServerProtocolPolicy_ptr p
   )
 {
@@ -1440,7 +1442,7 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release (
+TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_release (
     RTCORBA::ServerProtocolPolicy_ptr p
   )
 {
@@ -1449,14 +1451,14 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::ServerProtocolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::nil (void)
+TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_nil (void)
 {
   return RTCORBA::ServerProtocolPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::marshal (
+TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_marshal (
     RTCORBA::ServerProtocolPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1465,7 +1467,7 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_ServerProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1476,11 +1478,11 @@ RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerProtocolPolicy *_tao_tmp_pointer =
-    static_cast<ServerProtocolPolicy *> (_tao_void_pointer);
+    ACE_static_cast (ServerProtocolPolicy *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1494,10 +1496,10 @@ RTCORBA::ServerProtocolPolicy::_narrow (
     {
       return ServerProtocolPolicy::_nil ();
     }
-  
+
   ServerProtocolPolicy_ptr proxy =
     dynamic_cast<ServerProtocolPolicy_ptr> (_tao_objref);
-  
+
   return ServerProtocolPolicy::_duplicate (proxy);
 }
 
@@ -1511,10 +1513,10 @@ RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
     {
       return ServerProtocolPolicy::_nil ();
     }
-  
+
   ServerProtocolPolicy_ptr proxy =
     dynamic_cast<ServerProtocolPolicy_ptr> (_tao_objref);
-  
+
   return ServerProtocolPolicy::_duplicate (proxy);
 }
 
@@ -1525,7 +1527,7 @@ RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1580,24 +1582,24 @@ static const CORBA::Long _oc_RTCORBA_ServerProtocolPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0
     21,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ServerProtocolPolicy
   };
 
@@ -1622,7 +1624,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::ClientProtocolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::duplicate (
+TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_duplicate (
     RTCORBA::ClientProtocolPolicy_ptr p
   )
 {
@@ -1631,7 +1633,7 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release (
+TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_release (
     RTCORBA::ClientProtocolPolicy_ptr p
   )
 {
@@ -1640,14 +1642,14 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::ClientProtocolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::nil (void)
+TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_nil (void)
 {
   return RTCORBA::ClientProtocolPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::marshal (
+TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_marshal (
     RTCORBA::ClientProtocolPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1656,7 +1658,7 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_ClientProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1667,11 +1669,11 @@ RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientProtocolPolicy *_tao_tmp_pointer =
-    static_cast<ClientProtocolPolicy *> (_tao_void_pointer);
+    ACE_static_cast (ClientProtocolPolicy *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1685,10 +1687,10 @@ RTCORBA::ClientProtocolPolicy::_narrow (
     {
       return ClientProtocolPolicy::_nil ();
     }
-  
+
   ClientProtocolPolicy_ptr proxy =
     dynamic_cast<ClientProtocolPolicy_ptr> (_tao_objref);
-  
+
   return ClientProtocolPolicy::_duplicate (proxy);
 }
 
@@ -1702,10 +1704,10 @@ RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
     {
       return ClientProtocolPolicy::_nil ();
     }
-  
+
   ClientProtocolPolicy_ptr proxy =
     dynamic_cast<ClientProtocolPolicy_ptr> (_tao_objref);
-  
+
   return ClientProtocolPolicy::_duplicate (proxy);
 }
 
@@ -1716,7 +1718,7 @@ RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1771,24 +1773,24 @@ static const CORBA::Long _oc_RTCORBA_ClientProtocolPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0
     21,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ClientProtocolPolicy
   };
 
@@ -1813,7 +1815,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::PrivateConnectionPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::duplicate (
+TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_duplicate (
     RTCORBA::PrivateConnectionPolicy_ptr p
   )
 {
@@ -1822,7 +1824,7 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release (
+TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_release (
     RTCORBA::PrivateConnectionPolicy_ptr p
   )
 {
@@ -1831,14 +1833,14 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::PrivateConnectionPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::nil (void)
+TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_nil (void)
 {
   return RTCORBA::PrivateConnectionPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::marshal (
+TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_marshal (
     RTCORBA::PrivateConnectionPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1847,7 +1849,7 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_PrivateConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1858,11 +1860,11 @@ RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PrivateConnectionPolicy *_tao_tmp_pointer =
-    static_cast<PrivateConnectionPolicy *> (_tao_void_pointer);
+    ACE_static_cast (PrivateConnectionPolicy *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1876,10 +1878,10 @@ RTCORBA::PrivateConnectionPolicy::_narrow (
     {
       return PrivateConnectionPolicy::_nil ();
     }
-  
+
   PrivateConnectionPolicy_ptr proxy =
     dynamic_cast<PrivateConnectionPolicy_ptr> (_tao_objref);
-  
+
   return PrivateConnectionPolicy::_duplicate (proxy);
 }
 
@@ -1893,10 +1895,10 @@ RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
     {
       return PrivateConnectionPolicy::_nil ();
     }
-  
+
   PrivateConnectionPolicy_ptr proxy =
     dynamic_cast<PrivateConnectionPolicy_ptr> (_tao_objref);
-  
+
   return PrivateConnectionPolicy::_duplicate (proxy);
 }
 
@@ -1907,7 +1909,7 @@ RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1962,24 +1964,24 @@ static const CORBA::Long _oc_RTCORBA_PrivateConnectionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726976), 
-  ACE_NTOHL (0x61746543), 
-  ACE_NTOHL (0x6f6e6e65), 
-  ACE_NTOHL (0x6374696f), 
-  ACE_NTOHL (0x6e506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x50726976),
+  ACE_NTOHL (0x61746543),
+  ACE_NTOHL (0x6f6e6e65),
+  ACE_NTOHL (0x6374696f),
+  ACE_NTOHL (0x6e506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0
     24,
-  ACE_NTOHL (0x50726976), 
-  ACE_NTOHL (0x61746543), 
-  ACE_NTOHL (0x6f6e6e65), 
-  ACE_NTOHL (0x6374696f), 
-  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x50726976),
+  ACE_NTOHL (0x61746543),
+  ACE_NTOHL (0x6f6e6e65),
+  ACE_NTOHL (0x6374696f),
+  ACE_NTOHL (0x6e506f6c),
   ACE_NTOHL (0x69637900),  // name = PrivateConnectionPolicy
   };
 
@@ -2004,7 +2006,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::TCPProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::duplicate (
+TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_duplicate (
     RTCORBA::TCPProtocolProperties_ptr p
   )
 {
@@ -2013,7 +2015,7 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release (
+TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_release (
     RTCORBA::TCPProtocolProperties_ptr p
   )
 {
@@ -2022,14 +2024,14 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::TCPProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::nil (void)
+TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_nil (void)
 {
   return RTCORBA::TCPProtocolProperties::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::marshal (
+TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_marshal (
     RTCORBA::TCPProtocolProperties_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2038,7 +2040,7 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_TCPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2049,11 +2051,11 @@ RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   TCPProtocolProperties *_tao_tmp_pointer =
-    static_cast<TCPProtocolProperties *> (_tao_void_pointer);
+    ACE_static_cast (TCPProtocolProperties *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2067,10 +2069,10 @@ RTCORBA::TCPProtocolProperties::_narrow (
     {
       return TCPProtocolProperties::_nil ();
     }
-  
+
   TCPProtocolProperties_ptr proxy =
     dynamic_cast<TCPProtocolProperties_ptr> (_tao_objref);
-  
+
   return TCPProtocolProperties::_duplicate (proxy);
 }
 
@@ -2084,10 +2086,10 @@ RTCORBA::TCPProtocolProperties::_unchecked_narrow (
     {
       return TCPProtocolProperties::_nil ();
     }
-  
+
   TCPProtocolProperties_ptr proxy =
     dynamic_cast<TCPProtocolProperties_ptr> (_tao_objref);
-  
+
   return TCPProtocolProperties::_duplicate (proxy);
 }
 
@@ -2098,7 +2100,7 @@ RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2153,24 +2155,24 @@ static const CORBA::Long _oc_RTCORBA_TCPProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54435050), 
-  ACE_NTOHL (0x726f746f), 
-  ACE_NTOHL (0x636f6c50), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
-  ACE_NTOHL (0x733a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54435050),
+  ACE_NTOHL (0x726f746f),
+  ACE_NTOHL (0x636f6c50),
+  ACE_NTOHL (0x726f7065),
+  ACE_NTOHL (0x72746965),
+  ACE_NTOHL (0x733a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0
     22,
-  ACE_NTOHL (0x54435050), 
-  ACE_NTOHL (0x726f746f), 
-  ACE_NTOHL (0x636f6c50), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x54435050),
+  ACE_NTOHL (0x726f746f),
+  ACE_NTOHL (0x636f6c50),
+  ACE_NTOHL (0x726f7065),
+  ACE_NTOHL (0x72746965),
   ACE_NTOHL (0x73000000),  // name = TCPProtocolProperties
   };
 
@@ -2195,7 +2197,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::GIOPProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::duplicate (
+TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_duplicate (
     RTCORBA::GIOPProtocolProperties_ptr p
   )
 {
@@ -2204,7 +2206,7 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release (
+TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_release (
     RTCORBA::GIOPProtocolProperties_ptr p
   )
 {
@@ -2213,14 +2215,14 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::GIOPProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::nil (void)
+TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_nil (void)
 {
   return RTCORBA::GIOPProtocolProperties::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::marshal (
+TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_marshal (
     RTCORBA::GIOPProtocolProperties_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2229,7 +2231,7 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_GIOPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2240,11 +2242,11 @@ RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   GIOPProtocolProperties *_tao_tmp_pointer =
-    static_cast<GIOPProtocolProperties *> (_tao_void_pointer);
+    ACE_static_cast (GIOPProtocolProperties *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2258,10 +2260,10 @@ RTCORBA::GIOPProtocolProperties::_narrow (
     {
       return GIOPProtocolProperties::_nil ();
     }
-  
+
   GIOPProtocolProperties_ptr proxy =
     dynamic_cast<GIOPProtocolProperties_ptr> (_tao_objref);
-  
+
   return GIOPProtocolProperties::_duplicate (proxy);
 }
 
@@ -2275,10 +2277,10 @@ RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
     {
       return GIOPProtocolProperties::_nil ();
     }
-  
+
   GIOPProtocolProperties_ptr proxy =
     dynamic_cast<GIOPProtocolProperties_ptr> (_tao_objref);
-  
+
   return GIOPProtocolProperties::_duplicate (proxy);
 }
 
@@ -2289,7 +2291,7 @@ RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2344,24 +2346,24 @@ static const CORBA::Long _oc_RTCORBA_GIOPProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x47494f50),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
+  ACE_NTOHL (0x65733a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0
     23,
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x47494f50),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
   ACE_NTOHL (0x65730000),  // name = GIOPProtocolProperties
   };
 
@@ -2386,7 +2388,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::UnixDomainProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::duplicate (
+TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_duplicate (
     RTCORBA::UnixDomainProtocolProperties_ptr p
   )
 {
@@ -2395,7 +2397,7 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release (
+TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_release (
     RTCORBA::UnixDomainProtocolProperties_ptr p
   )
 {
@@ -2404,14 +2406,14 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::UnixDomainProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::nil (void)
+TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_nil (void)
 {
   return RTCORBA::UnixDomainProtocolProperties::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::marshal (
+TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_marshal (
     RTCORBA::UnixDomainProtocolProperties_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2420,7 +2422,7 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_UnixDomainProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2431,11 +2433,11 @@ RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnixDomainProtocolProperties *_tao_tmp_pointer =
-    static_cast<UnixDomainProtocolProperties *> (_tao_void_pointer);
+    ACE_static_cast (UnixDomainProtocolProperties *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2449,10 +2451,10 @@ RTCORBA::UnixDomainProtocolProperties::_narrow (
     {
       return UnixDomainProtocolProperties::_nil ();
     }
-  
+
   UnixDomainProtocolProperties_ptr proxy =
     dynamic_cast<UnixDomainProtocolProperties_ptr> (_tao_objref);
-  
+
   return UnixDomainProtocolProperties::_duplicate (proxy);
 }
 
@@ -2466,10 +2468,10 @@ RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
     {
       return UnixDomainProtocolProperties::_nil ();
     }
-  
+
   UnixDomainProtocolProperties_ptr proxy =
     dynamic_cast<UnixDomainProtocolProperties_ptr> (_tao_objref);
-  
+
   return UnixDomainProtocolProperties::_duplicate (proxy);
 }
 
@@ -2480,7 +2482,7 @@ RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2535,28 +2537,28 @@ static const CORBA::Long _oc_RTCORBA_UnixDomainProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x556e6978), 
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e5072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5072), 
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x74696573), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x556e6978),
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e5072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c5072),
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x74696573),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0
     29,
-  ACE_NTOHL (0x556e6978), 
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e5072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5072), 
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x74696573), 
+  ACE_NTOHL (0x556e6978),
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e5072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c5072),
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x74696573),
   ACE_NTOHL (0x0),  // name = UnixDomainProtocolProperties
   };
 
@@ -2581,7 +2583,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::SharedMemoryProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::duplicate (
+TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_duplicate (
     RTCORBA::SharedMemoryProtocolProperties_ptr p
   )
 {
@@ -2590,7 +2592,7 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release (
+TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_release (
     RTCORBA::SharedMemoryProtocolProperties_ptr p
   )
 {
@@ -2599,14 +2601,14 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::SharedMemoryProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::nil (void)
+TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_nil (void)
 {
   return RTCORBA::SharedMemoryProtocolProperties::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::marshal (
+TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_marshal (
     RTCORBA::SharedMemoryProtocolProperties_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2615,7 +2617,7 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_SharedMemoryProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2626,11 +2628,11 @@ RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   SharedMemoryProtocolProperties *_tao_tmp_pointer =
-    static_cast<SharedMemoryProtocolProperties *> (_tao_void_pointer);
+    ACE_static_cast (SharedMemoryProtocolProperties *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2644,10 +2646,10 @@ RTCORBA::SharedMemoryProtocolProperties::_narrow (
     {
       return SharedMemoryProtocolProperties::_nil ();
     }
-  
+
   SharedMemoryProtocolProperties_ptr proxy =
     dynamic_cast<SharedMemoryProtocolProperties_ptr> (_tao_objref);
-  
+
   return SharedMemoryProtocolProperties::_duplicate (proxy);
 }
 
@@ -2661,10 +2663,10 @@ RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
     {
       return SharedMemoryProtocolProperties::_nil ();
     }
-  
+
   SharedMemoryProtocolProperties_ptr proxy =
     dynamic_cast<SharedMemoryProtocolProperties_ptr> (_tao_objref);
-  
+
   return SharedMemoryProtocolProperties::_duplicate (proxy);
 }
 
@@ -2675,7 +2677,7 @@ RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolPropert
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2730,28 +2732,28 @@ static const CORBA::Long _oc_RTCORBA_SharedMemoryProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53686172), 
-  ACE_NTOHL (0x65644d65), 
-  ACE_NTOHL (0x6d6f7279), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x53686172),
+  ACE_NTOHL (0x65644d65),
+  ACE_NTOHL (0x6d6f7279),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
+  ACE_NTOHL (0x65733a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0
     31,
-  ACE_NTOHL (0x53686172), 
-  ACE_NTOHL (0x65644d65), 
-  ACE_NTOHL (0x6d6f7279), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x53686172),
+  ACE_NTOHL (0x65644d65),
+  ACE_NTOHL (0x6d6f7279),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
   ACE_NTOHL (0x65730000),  // name = SharedMemoryProtocolProperties
   };
 
@@ -2776,20 +2778,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
     13,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
   ACE_NTOHL (0x0),  // name = PriorityBand
   2, // member count
     4,
@@ -2798,41 +2800,41 @@ static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x5254434f),
+    ACE_NTOHL (0x5242412f),
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
         9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
 
   5,
-  ACE_NTOHL (0x68696768), 
+  ACE_NTOHL (0x68696768),
   ACE_NTOHL (0x0),  // name = high
     CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x5254434f),
+    ACE_NTOHL (0x5242412f),
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
         9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
@@ -2853,20 +2855,20 @@ namespace RTCORBA
     &_tc_TAO_tc_RTCORBA_PriorityBand;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 RTCORBA::PriorityBand::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   PriorityBand *_tao_tmp_pointer =
-    static_cast<PriorityBand *> (_tao_void_pointer);
+    ACE_static_cast (PriorityBand *, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CS_)
@@ -2913,7 +2915,7 @@ void RTCORBA::PriorityBands::_tao_any_destructor (
   )
 {
   PriorityBands * _tao_tmp_pointer =
-    static_cast<PriorityBands *> (_tao_void_pointer);
+    ACE_static_cast (PriorityBands *, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2926,20 +2928,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x733a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x733a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0
     14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
   ACE_NTOHL (0x73000000),  // name = PriorityBands
     CORBA::tk_sequence, // typecode kind
   252, // encapsulation length
@@ -2948,20 +2950,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
     236, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x5072696f), 
-      ACE_NTOHL (0x72697479), 
-      ACE_NTOHL (0x42616e64), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x5254434f),
+      ACE_NTOHL (0x5242412f),
+      ACE_NTOHL (0x5072696f),
+      ACE_NTOHL (0x72697479),
+      ACE_NTOHL (0x42616e64),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
             13,
-      ACE_NTOHL (0x5072696f), 
-      ACE_NTOHL (0x72697479), 
-      ACE_NTOHL (0x42616e64), 
+      ACE_NTOHL (0x5072696f),
+      ACE_NTOHL (0x72697479),
+      ACE_NTOHL (0x42616e64),
       ACE_NTOHL (0x0),  // name = PriorityBand
       2, // member count
             4,
@@ -2970,41 +2972,41 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x5254434f),
+        ACE_NTOHL (0x5242412f),
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
                 9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
 
       5,
-      ACE_NTOHL (0x68696768), 
+      ACE_NTOHL (0x68696768),
       ACE_NTOHL (0x0),  // name = high
             CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x5254434f),
+        ACE_NTOHL (0x5242412f),
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
                 9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
@@ -3035,7 +3037,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::PriorityBandedConnectionPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::duplicate (
+TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_duplicate (
     RTCORBA::PriorityBandedConnectionPolicy_ptr p
   )
 {
@@ -3044,7 +3046,7 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release (
+TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_release (
     RTCORBA::PriorityBandedConnectionPolicy_ptr p
   )
 {
@@ -3053,14 +3055,14 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::PriorityBandedConnectionPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::nil (void)
+TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_nil (void)
 {
   return RTCORBA::PriorityBandedConnectionPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::marshal (
+TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_marshal (
     RTCORBA::PriorityBandedConnectionPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3069,7 +3071,7 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_PriorityBandedConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3080,11 +3082,11 @@ RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityBandedConnectionPolicy *_tao_tmp_pointer =
-    static_cast<PriorityBandedConnectionPolicy *> (_tao_void_pointer);
+    ACE_static_cast (PriorityBandedConnectionPolicy *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3098,10 +3100,10 @@ RTCORBA::PriorityBandedConnectionPolicy::_narrow (
     {
       return PriorityBandedConnectionPolicy::_nil ();
     }
-  
+
   PriorityBandedConnectionPolicy_ptr proxy =
     dynamic_cast<PriorityBandedConnectionPolicy_ptr> (_tao_objref);
-  
+
   return PriorityBandedConnectionPolicy::_duplicate (proxy);
 }
 
@@ -3115,10 +3117,10 @@ RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
     {
       return PriorityBandedConnectionPolicy::_nil ();
     }
-  
+
   PriorityBandedConnectionPolicy_ptr proxy =
     dynamic_cast<PriorityBandedConnectionPolicy_ptr> (_tao_objref);
-  
+
   return PriorityBandedConnectionPolicy::_duplicate (proxy);
 }
 
@@ -3129,7 +3131,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPol
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3184,28 +3186,28 @@ static const CORBA::Long _oc_RTCORBA_PriorityBandedConnectionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6e6e6563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6e6e6563),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0
     31,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6e6e6563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6e6e6563),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = PriorityBandedConnectionPolicy
   };
 
@@ -3230,7 +3232,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::Current_ptr
-TAO::Objref_Traits<RTCORBA::Current>::duplicate (
+TAO::Objref_Traits<RTCORBA::Current>::tao_duplicate (
     RTCORBA::Current_ptr p
   )
 {
@@ -3239,7 +3241,7 @@ TAO::Objref_Traits<RTCORBA::Current>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::Current>::release (
+TAO::Objref_Traits<RTCORBA::Current>::tao_release (
     RTCORBA::Current_ptr p
   )
 {
@@ -3248,14 +3250,14 @@ TAO::Objref_Traits<RTCORBA::Current>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::Current_ptr
-TAO::Objref_Traits<RTCORBA::Current>::nil (void)
+TAO::Objref_Traits<RTCORBA::Current>::tao_nil (void)
 {
   return RTCORBA::Current::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::Current>::marshal (
+TAO::Objref_Traits<RTCORBA::Current>::tao_marshal (
     RTCORBA::Current_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3264,7 +3266,7 @@ TAO::Objref_Traits<RTCORBA::Current>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3275,11 +3277,11 @@ RTCORBA::Current::Current (void)
 RTCORBA::Current::~Current (void)
 {}
 
-void 
+void
 RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
-    static_cast<Current *> (_tao_void_pointer);
+    ACE_static_cast (Current *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3293,10 +3295,10 @@ RTCORBA::Current::_narrow (
     {
       return Current::_nil ();
     }
-  
+
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-  
+
   return Current::_duplicate (proxy);
 }
 
@@ -3310,10 +3312,10 @@ RTCORBA::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-  
+
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-  
+
   return Current::_duplicate (proxy);
 }
 
@@ -3324,7 +3326,7 @@ RTCORBA::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3379,16 +3381,16 @@ static const CORBA::Long _oc_RTCORBA_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x656e743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/Current:1.0
     8,
-  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x43757272),
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -3413,7 +3415,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::Mutex_ptr
-TAO::Objref_Traits<RTCORBA::Mutex>::duplicate (
+TAO::Objref_Traits<RTCORBA::Mutex>::tao_duplicate (
     RTCORBA::Mutex_ptr p
   )
 {
@@ -3422,7 +3424,7 @@ TAO::Objref_Traits<RTCORBA::Mutex>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::Mutex>::release (
+TAO::Objref_Traits<RTCORBA::Mutex>::tao_release (
     RTCORBA::Mutex_ptr p
   )
 {
@@ -3431,14 +3433,14 @@ TAO::Objref_Traits<RTCORBA::Mutex>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::Mutex_ptr
-TAO::Objref_Traits<RTCORBA::Mutex>::nil (void)
+TAO::Objref_Traits<RTCORBA::Mutex>::tao_nil (void)
 {
   return RTCORBA::Mutex::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::Mutex>::marshal (
+TAO::Objref_Traits<RTCORBA::Mutex>::tao_marshal (
     RTCORBA::Mutex_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3447,7 +3449,7 @@ TAO::Objref_Traits<RTCORBA::Mutex>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_Mutex_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3458,11 +3460,11 @@ RTCORBA::Mutex::Mutex (void)
 RTCORBA::Mutex::~Mutex (void)
 {}
 
-void 
+void
 RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer)
 {
   Mutex *_tao_tmp_pointer =
-    static_cast<Mutex *> (_tao_void_pointer);
+    ACE_static_cast (Mutex *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3476,10 +3478,10 @@ RTCORBA::Mutex::_narrow (
     {
       return Mutex::_nil ();
     }
-  
+
   Mutex_ptr proxy =
     dynamic_cast<Mutex_ptr> (_tao_objref);
-  
+
   return Mutex::_duplicate (proxy);
 }
 
@@ -3493,10 +3495,10 @@ RTCORBA::Mutex::_unchecked_narrow (
     {
       return Mutex::_nil ();
     }
-  
+
   Mutex_ptr proxy =
     dynamic_cast<Mutex_ptr> (_tao_objref);
-  
+
   return Mutex::_duplicate (proxy);
 }
 
@@ -3507,7 +3509,7 @@ RTCORBA::Mutex::_duplicate (Mutex_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3558,16 +3560,16 @@ static const CORBA::Long _oc_RTCORBA_Mutex[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4d757465), 
-  ACE_NTOHL (0x783a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x4d757465),
+  ACE_NTOHL (0x783a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/Mutex:1.0
     6,
-  ACE_NTOHL (0x4d757465), 
+  ACE_NTOHL (0x4d757465),
   ACE_NTOHL (0x78000000),  // name = Mutex
   };
 
@@ -3592,7 +3594,7 @@ namespace RTCORBA
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::RTORB_ptr
-TAO::Objref_Traits<RTCORBA::RTORB>::duplicate (
+TAO::Objref_Traits<RTCORBA::RTORB>::tao_duplicate (
     RTCORBA::RTORB_ptr p
   )
 {
@@ -3601,7 +3603,7 @@ TAO::Objref_Traits<RTCORBA::RTORB>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTCORBA::RTORB>::release (
+TAO::Objref_Traits<RTCORBA::RTORB>::tao_release (
     RTCORBA::RTORB_ptr p
   )
 {
@@ -3610,14 +3612,14 @@ TAO::Objref_Traits<RTCORBA::RTORB>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTCORBA::RTORB_ptr
-TAO::Objref_Traits<RTCORBA::RTORB>::nil (void)
+TAO::Objref_Traits<RTCORBA::RTORB>::tao_nil (void)
 {
   return RTCORBA::RTORB::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::RTORB>::marshal (
+TAO::Objref_Traits<RTCORBA::RTORB>::tao_marshal (
     RTCORBA::RTORB_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3626,12 +3628,12 @@ TAO::Objref_Traits<RTCORBA::RTORB>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_RTORB_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
@@ -3664,7 +3666,7 @@ RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound
 void RTCORBA::RTORB::MutexNotFound::_tao_any_destructor (void *_tao_void_pointer)
 {
   MutexNotFound *_tao_tmp_pointer =
-    static_cast<MutexNotFound*> (_tao_void_pointer);
+    ACE_static_cast (MutexNotFound*, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -3673,7 +3675,7 @@ RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *_tao_excp)
 {
   if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", _tao_excp->_rep_id ()))
     {
-      return dynamic_cast<MutexNotFound *> (_tao_excp);
+      return ACE_dynamic_cast (MutexNotFound *, _tao_excp);
     }
   else
     {
@@ -3724,6 +3726,11 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_type (void) const
 {
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("This TAO-specific method is now")
+              ACE_TEXT (" deprecated and will be removed")
+              ACE_TEXT (" in future versions.\n")));
+
   return ::RTCORBA::RTORB::_tc_MutexNotFound;
 }
 
@@ -3734,21 +3741,21 @@ static const CORBA::Long _oc_RTCORBA_RTORB_MutexNotFound[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x422f4d75), 
-  ACE_NTOHL (0x7465784e), 
-  ACE_NTOHL (0x6f74466f), 
-  ACE_NTOHL (0x756e643a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x52544f52),
+  ACE_NTOHL (0x422f4d75),
+  ACE_NTOHL (0x7465784e),
+  ACE_NTOHL (0x6f74466f),
+  ACE_NTOHL (0x756e643a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0
     14,
-  ACE_NTOHL (0x4d757465), 
-  ACE_NTOHL (0x784e6f74), 
-  ACE_NTOHL (0x466f756e), 
+  ACE_NTOHL (0x4d757465),
+  ACE_NTOHL (0x784e6f74),
+  ACE_NTOHL (0x466f756e),
   ACE_NTOHL (0x64000000),  // name = MutexNotFound
   0, // member count
   };
@@ -3764,7 +3771,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound (
 ::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_MutexNotFound =
   &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
@@ -3797,7 +3804,7 @@ RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThr
 void RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor (void *_tao_void_pointer)
 {
   InvalidThreadpool *_tao_tmp_pointer =
-    static_cast<InvalidThreadpool*> (_tao_void_pointer);
+    ACE_static_cast (InvalidThreadpool*, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -3806,7 +3813,7 @@ RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *_tao_excp)
 {
   if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", _tao_excp->_rep_id ()))
     {
-      return dynamic_cast<InvalidThreadpool *> (_tao_excp);
+      return ACE_dynamic_cast (InvalidThreadpool *, _tao_excp);
     }
   else
     {
@@ -3857,6 +3864,11 @@ void RTCORBA::RTORB::InvalidThreadpool::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_type (void) const
 {
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("This TAO-specific method is now")
+              ACE_TEXT (" deprecated and will be removed")
+              ACE_TEXT (" in future versions.\n")));
+
   return ::RTCORBA::RTORB::_tc_InvalidThreadpool;
 }
 
@@ -3867,23 +3879,23 @@ static const CORBA::Long _oc_RTCORBA_RTORB_InvalidThreadpool[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x422f496e), 
-  ACE_NTOHL (0x76616c69), 
-  ACE_NTOHL (0x64546872), 
-  ACE_NTOHL (0x65616470), 
-  ACE_NTOHL (0x6f6f6c3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x52544f52),
+  ACE_NTOHL (0x422f496e),
+  ACE_NTOHL (0x76616c69),
+  ACE_NTOHL (0x64546872),
+  ACE_NTOHL (0x65616470),
+  ACE_NTOHL (0x6f6f6c3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0
     18,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696454), 
-  ACE_NTOHL (0x68726561), 
-  ACE_NTOHL (0x64706f6f), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696454),
+  ACE_NTOHL (0x68726561),
+  ACE_NTOHL (0x64706f6f),
   ACE_NTOHL (0x6c000000),  // name = InvalidThreadpool
   0, // member count
   };
@@ -3905,11 +3917,11 @@ RTCORBA::RTORB::RTORB (void)
 RTCORBA::RTORB::~RTORB (void)
 {}
 
-void 
+void
 RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer)
 {
   RTORB *_tao_tmp_pointer =
-    static_cast<RTORB *> (_tao_void_pointer);
+    ACE_static_cast (RTORB *, _tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3923,10 +3935,10 @@ RTCORBA::RTORB::_narrow (
     {
       return RTORB::_nil ();
     }
-  
+
   RTORB_ptr proxy =
     dynamic_cast<RTORB_ptr> (_tao_objref);
-  
+
   return RTORB::_duplicate (proxy);
 }
 
@@ -3940,10 +3952,10 @@ RTCORBA::RTORB::_unchecked_narrow (
     {
       return RTORB::_nil ();
     }
-  
+
   RTORB_ptr proxy =
     dynamic_cast<RTORB_ptr> (_tao_objref);
-  
+
   return RTORB::_duplicate (proxy);
 }
 
@@ -3954,7 +3966,7 @@ RTCORBA::RTORB::_duplicate (RTORB_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4005,16 +4017,16 @@ static const CORBA::Long _oc_RTCORBA_RTORB[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x423a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x52544f52),
+  ACE_NTOHL (0x423a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/RTORB:1.0
     6,
-  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x52544f52),
   ACE_NTOHL (0x42000000),  // name = RTORB
   };
 
@@ -4032,7 +4044,7 @@ namespace RTCORBA
     &_tc_TAO_tc_RTCORBA_RTORB;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4069,8 +4081,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::ThreadpoolLane *&_tao_elem
   )
 {
-  return _tao_any >>= const_cast<
-      const RTCORBA::ThreadpoolLane *&> (
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::ThreadpoolLane *&,
       _tao_elem
     );
 }
@@ -4090,7 +4102,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4127,8 +4139,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::ThreadpoolLanes *&_tao_elem
   )
 {
-  return _tao_any >>= const_cast<
-      const RTCORBA::ThreadpoolLanes *&> (
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::ThreadpoolLanes *&,
       _tao_elem
     );
 }
@@ -4172,7 +4184,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
         _tao_any,
         RTCORBA::_tc_PriorityModel,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -4383,7 +4395,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 
@@ -4434,8 +4446,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::Protocol *&_tao_elem
   )
 {
-  return _tao_any >>= const_cast<
-      const RTCORBA::Protocol *&> (
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::Protocol *&,
       _tao_elem
     );
 }
@@ -4455,7 +4467,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -4506,8 +4518,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::ProtocolList *&_tao_elem
   )
 {
-  return _tao_any >>= const_cast<
-      const RTCORBA::ProtocolList *&> (
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::ProtocolList *&,
       _tao_elem
     );
 }
@@ -5010,7 +5022,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5047,8 +5059,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::PriorityBand *&_tao_elem
   )
 {
-  return _tao_any >>= const_cast<
-      const RTCORBA::PriorityBand *&> (
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::PriorityBand *&,
       _tao_elem
     );
 }
@@ -5068,7 +5080,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5105,8 +5117,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::PriorityBands *&_tao_elem
   )
 {
-  return _tao_any >>= const_cast<
-      const RTCORBA::PriorityBands *&> (
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::PriorityBands *&,
       _tao_elem
     );
 }
@@ -5402,7 +5414,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -5453,8 +5465,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::RTORB::MutexNotFound *&_tao_elem
   )
 {
-  return _tao_any >>= const_cast<
-      const RTCORBA::RTORB::MutexNotFound *&> (
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::RTORB::MutexNotFound *&,
       _tao_elem
     );
 }
@@ -5474,7 +5486,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -5525,8 +5537,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::RTORB::InvalidThreadpool *&_tao_elem
   )
 {
-  return _tao_any >>= const_cast<
-      const RTCORBA::RTORB::InvalidThreadpool *&> (
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::RTORB::InvalidThreadpool *&,
       _tao_elem
     );
 }
@@ -5582,21 +5594,21 @@ CORBA::Boolean operator<< (
     const RTCORBA::ThreadpoolLanes &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -5606,7 +5618,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -5616,28 +5628,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
-    
+
     }
-  
+
   return 0;
 }
 
@@ -5656,12 +5668,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enum
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
-      _tao_enumval = static_cast<RTCORBA::PriorityModel> (_tao_temp);
+      _tao_enumval = ACE_static_cast (RTCORBA::PriorityModel, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -5699,21 +5711,21 @@ CORBA::Boolean operator<< (
     const RTCORBA::PriorityBands &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -5723,7 +5735,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -5733,35 +5745,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
-    
+
     }
-  
+
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1629
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -5828,7 +5840,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::PriorityModelPolicy
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::PriorityModelPolicy
@@ -5848,7 +5860,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::ThreadpoolPolicy
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::ThreadpoolPolicy
@@ -5868,7 +5880,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::ProtocolProperties
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::ProtocolProperties
@@ -5943,7 +5955,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::ServerProtocolPolicy
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::ServerProtocolPolicy
@@ -5963,7 +5975,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::ClientProtocolPolicy
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::ClientProtocolPolicy
@@ -5983,7 +5995,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::PrivateConnectionPolicy
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::PrivateConnectionPolicy
@@ -6003,7 +6015,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::TCPProtocolProperties
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::TCPProtocolProperties
@@ -6023,7 +6035,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::GIOPProtocolProperties
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::GIOPProtocolProperties
@@ -6043,7 +6055,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::UnixDomainProtocolProperties
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::UnixDomainProtocolProperties
@@ -6063,7 +6075,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::SharedMemoryProtocolProperties
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::SharedMemoryProtocolProperties
@@ -6132,7 +6144,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::PriorityBandedConnectionPolicy
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::PriorityBandedConnectionPolicy
@@ -6152,7 +6164,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::Current
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::Current
@@ -6172,7 +6184,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::Mutex
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::Mutex
@@ -6202,7 +6214,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::RTORB
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         RTCORBA::RTORB
@@ -6278,7 +6290,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::PriorityModelPolicy
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::PriorityModelPolicy
@@ -6298,7 +6310,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::ThreadpoolPolicy
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::ThreadpoolPolicy
@@ -6318,7 +6330,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::ProtocolProperties
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::ProtocolProperties
@@ -6393,7 +6405,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::ServerProtocolPolicy
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::ServerProtocolPolicy
@@ -6413,7 +6425,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::ClientProtocolPolicy
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::ClientProtocolPolicy
@@ -6433,7 +6445,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::PrivateConnectionPolicy
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::PrivateConnectionPolicy
@@ -6453,7 +6465,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::TCPProtocolProperties
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::TCPProtocolProperties
@@ -6473,7 +6485,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::GIOPProtocolProperties
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::GIOPProtocolProperties
@@ -6493,7 +6505,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::UnixDomainProtocolProperties
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::UnixDomainProtocolProperties
@@ -6513,7 +6525,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::SharedMemoryProtocolProperties
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::SharedMemoryProtocolProperties
@@ -6582,7 +6594,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::PriorityBandedConnectionPolicy
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::PriorityBandedConnectionPolicy
@@ -6602,7 +6614,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::Current
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::Current
@@ -6622,7 +6634,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::Mutex
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::Mutex
@@ -6652,7 +6664,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::RTORB
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::RTORB
@@ -6663,4 +6675,5 @@ CORBA::Boolean operator>> (
         RTCORBA::RTORB \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 35d04be0554..0b618c573a2 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -26,15 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_RTCORBAC_H_
 #define _TAO_IDL_ORIG_RTCORBAC_H_
 
 #include /**/ "ace/pre.h"
 
-
-#include "ace/config-all.h"
+#include "tao/ORB.h"
 
 #ifndef TAO_RTCORBA_SAFE_INCLUDE
 #error "You should not include RTCORBAC.h directly, use RTCORBA.h"
@@ -46,9 +45,8 @@
 
 #include "rtcorba_export.h"
 #include "rtcorba_typedefs.h"
-#include "tao/ORB.h"
+#include "tao/Encodable.h"
 #include "tao/TimeBaseC.h"
-#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
@@ -56,8 +54,6 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
-#include "tao/Encodable.h"
-#include "tao/PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -82,13 +78,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-  
+
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -98,109 +94,109 @@ namespace TAO
 
 namespace RTCORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-  
+
   typedef CORBA::Short NativePriority;
   typedef CORBA::Short_out NativePriority_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-  
+
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const RTCORBA::Priority minPriority = 0;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const RTCORBA::Priority maxPriority = 32767;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-  
+
   typedef CORBA::Long NetworkPriority;
   typedef CORBA::Long_out NetworkPriority_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NetworkPriority;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-  
+
   typedef CORBA::ULong ThreadpoolId;
   typedef CORBA::ULong_out ThreadpoolId_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolId;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ThreadpoolLane;
-  
+
   typedef
     TAO_Fixed_Var_T<
         ThreadpoolLane
       >
     ThreadpoolLane_var;
-  
+
   typedef
     ThreadpoolLane &
     ThreadpoolLane_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_RTCORBA_Export ThreadpoolLane
   {
     typedef ThreadpoolLane_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     RTCORBA::Priority lane_priority;
     CORBA::ULong static_threads;
     CORBA::ULong dynamic_threads;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLane;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CH_)
 #define _RTCORBA_THREADPOOLLANES_CH_
-  
+
   class ThreadpoolLanes;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         ThreadpoolLanes,
         ThreadpoolLane
       >
     ThreadpoolLanes_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         ThreadpoolLanes,
@@ -208,7 +204,7 @@ namespace RTCORBA
         ThreadpoolLane
       >
     ThreadpoolLanes_out;
-  
+
   class TAO_RTCORBA_Export ThreadpoolLanes
     : public
         TAO_Unbounded_Sequence<
@@ -221,60 +217,60 @@ namespace RTCORBA
     ThreadpoolLanes (
         CORBA::ULong max,
         CORBA::ULong length,
-        ThreadpoolLane* buffer, 
+        ThreadpoolLane* buffer,
         CORBA::Boolean release = 0
       );
     ThreadpoolLanes (const ThreadpoolLanes &);
     ~ThreadpoolLanes (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ThreadpoolLanes_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum PriorityModel
   {
     CLIENT_PROPAGATED,
     SERVER_DECLARED
   };
-  
+
   typedef PriorityModel &PriorityModel_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModel;
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_
-  
+
   class PriorityModelPolicy;
   typedef PriorityModelPolicy *PriorityModelPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PriorityModelPolicy
       >
     PriorityModelPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PriorityModelPolicy
@@ -282,131 +278,131 @@ namespace RTCORBA
     PriorityModelPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export PriorityModelPolicy
-    : public virtual ::CORBA::Policy
+    : public virtual CORBA::Policy
   {
   public:
     typedef PriorityModelPolicy_ptr _ptr_type;
     typedef PriorityModelPolicy_var _var_type;
-    
+
     // The static operations.
     static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj);
-    
+
     static PriorityModelPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PriorityModelPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PriorityModelPolicy_ptr _nil (void)
     {
       return (PriorityModelPolicy_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::PriorityModel priority_model (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual RTCORBA::Priority server_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PriorityModelPolicy (void);
-    
+
     virtual ~PriorityModelPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PriorityModelPolicy (const PriorityModelPolicy &);
-    
+
     void operator= (const PriorityModelPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U;
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_
-  
+
   class ThreadpoolPolicy;
   typedef ThreadpoolPolicy *ThreadpoolPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ThreadpoolPolicy
       >
     ThreadpoolPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ThreadpoolPolicy
@@ -414,116 +410,116 @@ namespace RTCORBA
     ThreadpoolPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_)
 #define _RTCORBA_THREADPOOLPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export ThreadpoolPolicy
-    : public virtual ::CORBA::Policy
+    : public virtual CORBA::Policy
   {
   public:
     typedef ThreadpoolPolicy_ptr _ptr_type;
     typedef ThreadpoolPolicy_var _var_type;
-    
+
     // The static operations.
     static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj);
-    
+
     static ThreadpoolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ThreadpoolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ThreadpoolPolicy_ptr _nil (void)
     {
       return (ThreadpoolPolicy_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual RTCORBA::ThreadpoolId threadpool (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ThreadpoolPolicy (void);
-    
+
     virtual ~ThreadpoolPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ThreadpoolPolicy (const ThreadpoolPolicy &);
-    
+
     void operator= (const ThreadpoolPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy;
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_
-  
+
   class ProtocolProperties;
   typedef ProtocolProperties *ProtocolProperties_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ProtocolProperties
       >
     ProtocolProperties_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ProtocolProperties
@@ -531,13 +527,13 @@ namespace RTCORBA
     ProtocolProperties_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES_CH_
-  
+
   class TAO_RTCORBA_Export ProtocolProperties
     : public virtual CORBA::Object
     , public virtual TAO_Encodable
@@ -545,112 +541,112 @@ namespace RTCORBA
   public:
     typedef ProtocolProperties_ptr _ptr_type;
     typedef ProtocolProperties_var _var_type;
-    
+
     // The static operations.
     static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
-    
+
     static ProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ProtocolProperties_ptr _nil (void)
     {
       return (ProtocolProperties_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
     // CDR Encoder/Decoder methods. (handcrafted)
     virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
     virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
   protected:
     // Abstract or local interface only.
     ProtocolProperties (void);
-    
+
     virtual ~ProtocolProperties (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ProtocolProperties (const ProtocolProperties &);
-    
+
     void operator= (const ProtocolProperties &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolProperties;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Protocol;
-  
+
   typedef
     TAO_Var_Var_T<
         Protocol
       >
     Protocol_var;
-  
+
   typedef
     TAO_Out_T<
         Protocol,
         Protocol_var
       >
     Protocol_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_RTCORBA_Export Protocol
   {
     typedef Protocol_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IOP::ProfileId protocol_type;
     RTCORBA::ProtocolProperties_var orb_protocol_properties;
     RTCORBA::ProtocolProperties_var transport_protocol_properties;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Protocol;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CH_)
 #define _RTCORBA_PROTOCOLLIST_CH_
-  
+
   class ProtocolList;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         ProtocolList,
         Protocol
       >
     ProtocolList_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         ProtocolList,
@@ -658,7 +654,7 @@ namespace RTCORBA
         Protocol
       >
     ProtocolList_out;
-  
+
   class TAO_RTCORBA_Export ProtocolList
     : public
         TAO_Unbounded_Sequence<
@@ -671,44 +667,44 @@ namespace RTCORBA
     ProtocolList (
         CORBA::ULong max,
         CORBA::ULong length,
-        Protocol* buffer, 
+        Protocol* buffer,
         CORBA::Boolean release = 0
       );
     ProtocolList (const ProtocolList &);
     ~ProtocolList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ProtocolList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolList;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U;
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_
-  
+
   class ServerProtocolPolicy;
   typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServerProtocolPolicy
       >
     ServerProtocolPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServerProtocolPolicy
@@ -716,121 +712,121 @@ namespace RTCORBA
     ServerProtocolPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export ServerProtocolPolicy
-    : public virtual ::CORBA::Policy
+    : public virtual CORBA::Policy
   {
   public:
     typedef ServerProtocolPolicy_ptr _ptr_type;
     typedef ServerProtocolPolicy_var _var_type;
-    
+
     // The static operations.
     static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
-    
+
     static ServerProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerProtocolPolicy_ptr _nil (void)
     {
       return (ServerProtocolPolicy_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ServerProtocolPolicy (void);
-    
+
     virtual ~ServerProtocolPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServerProtocolPolicy (const ServerProtocolPolicy &);
-    
+
     void operator= (const ServerProtocolPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U;
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_
-  
+
   class ClientProtocolPolicy;
   typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ClientProtocolPolicy
       >
     ClientProtocolPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ClientProtocolPolicy
@@ -838,121 +834,121 @@ namespace RTCORBA
     ClientProtocolPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export ClientProtocolPolicy
-    : public virtual ::CORBA::Policy
+    : public virtual CORBA::Policy
   {
   public:
     typedef ClientProtocolPolicy_ptr _ptr_type;
     typedef ClientProtocolPolicy_var _var_type;
-    
+
     // The static operations.
     static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
-    
+
     static ClientProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientProtocolPolicy_ptr _nil (void)
     {
       return (ClientProtocolPolicy_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ClientProtocolPolicy (void);
-    
+
     virtual ~ClientProtocolPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ClientProtocolPolicy (const ClientProtocolPolicy &);
-    
+
     void operator= (const ClientProtocolPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U;
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_
-  
+
   class PrivateConnectionPolicy;
   typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PrivateConnectionPolicy
       >
     PrivateConnectionPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PrivateConnectionPolicy
@@ -960,81 +956,81 @@ namespace RTCORBA
     PrivateConnectionPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
-  
+
   class TAO_RTCORBA_Export PrivateConnectionPolicy
-    : public virtual ::CORBA::Policy
+    : public virtual CORBA::Policy
   {
   public:
     typedef PrivateConnectionPolicy_ptr _ptr_type;
     typedef PrivateConnectionPolicy_var _var_type;
-    
+
     // The static operations.
     static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
-    
+
     static PrivateConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PrivateConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PrivateConnectionPolicy_ptr _nil (void)
     {
       return (PrivateConnectionPolicy_ptr)0;
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PrivateConnectionPolicy (void);
-    
+
     virtual ~PrivateConnectionPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PrivateConnectionPolicy (const PrivateConnectionPolicy &);
-    
+
     void operator= (const PrivateConnectionPolicy &);
   };
 
@@ -1046,7 +1042,7 @@ namespace RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1075,7 +1071,7 @@ namespace RTCORBA
 #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_
   
   class TAO_RTCORBA_Export TCPProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
+    : public virtual RTCORBA::ProtocolProperties
   {
   public:
     typedef TCPProtocolProperties_ptr _ptr_type;
@@ -1115,7 +1111,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_buffer_size (
-        ::CORBA::Long send_buffer_size
+        CORBA::Long send_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1136,7 +1132,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void recv_buffer_size (
-        ::CORBA::Long recv_buffer_size
+        CORBA::Long recv_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1157,7 +1153,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void keep_alive (
-        ::CORBA::Boolean keep_alive
+        CORBA::Boolean keep_alive
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1178,7 +1174,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void dont_route (
-        ::CORBA::Boolean dont_route
+        CORBA::Boolean dont_route
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1199,7 +1195,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void no_delay (
-        ::CORBA::Boolean no_delay
+        CORBA::Boolean no_delay
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1220,7 +1216,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void enable_network_priority (
-        ::CORBA::Boolean enable_network_priority
+        CORBA::Boolean enable_network_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1259,7 +1255,7 @@ namespace RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1288,7 +1284,7 @@ namespace RTCORBA
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_
   
   class TAO_RTCORBA_Export GIOPProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
+    : public virtual RTCORBA::ProtocolProperties
   {
   public:
     typedef GIOPProtocolProperties_ptr _ptr_type;
@@ -1346,7 +1342,7 @@ namespace RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1375,7 +1371,7 @@ namespace RTCORBA
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_
   
   class TAO_RTCORBA_Export UnixDomainProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
+    : public virtual RTCORBA::ProtocolProperties
   {
   public:
     typedef UnixDomainProtocolProperties_ptr _ptr_type;
@@ -1415,7 +1411,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_buffer_size (
-        ::CORBA::Long send_buffer_size
+        CORBA::Long send_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1436,7 +1432,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void recv_buffer_size (
-        ::CORBA::Long recv_buffer_size
+        CORBA::Long recv_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1475,7 +1471,7 @@ namespace RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1504,7 +1500,7 @@ namespace RTCORBA
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_
   
   class TAO_RTCORBA_Export SharedMemoryProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
+    : public virtual RTCORBA::ProtocolProperties
   {
   public:
     typedef SharedMemoryProtocolProperties_ptr _ptr_type;
@@ -1544,7 +1540,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void preallocate_buffer_size (
-        ::CORBA::Long preallocate_buffer_size
+        CORBA::Long preallocate_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1715,7 +1711,7 @@ namespace RTCORBA
   const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_
@@ -1744,7 +1740,7 @@ namespace RTCORBA
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
   
   class TAO_RTCORBA_Export PriorityBandedConnectionPolicy
-    : public virtual ::CORBA::Policy
+    : public virtual CORBA::Policy
   {
   public:
     typedef PriorityBandedConnectionPolicy_ptr _ptr_type;
@@ -1832,7 +1828,7 @@ namespace RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_CURRENT__VAR_OUT_CH_)
 #define _RTCORBA_CURRENT__VAR_OUT_CH_
@@ -1861,7 +1857,7 @@ namespace RTCORBA
 #define _RTCORBA_CURRENT_CH_
   
   class TAO_RTCORBA_Export Current
-    : public virtual ::CORBA::Current
+    : public virtual CORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
@@ -1901,7 +1897,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void the_priority (
-        ::RTCORBA::Priority the_priority
+        RTCORBA::Priority the_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1940,7 +1936,7 @@ namespace RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_MUTEX__VAR_OUT_CH_)
 #define _RTCORBA_MUTEX__VAR_OUT_CH_
@@ -2019,7 +2015,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean try_lock (
-        ::TimeBase::TimeT max_wait
+        TimeBase::TimeT max_wait
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2058,7 +2054,7 @@ namespace RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Mutex;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:601
+  // be\be_interface.cpp:611
 
 #if !defined (_RTCORBA_RTORB__VAR_OUT_CH_)
 #define _RTCORBA_RTORB__VAR_OUT_CH_
@@ -2127,7 +2123,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy_mutex (
-        ::RTCORBA::Mutex_ptr the_mutex
+        RTCORBA::Mutex_ptr the_mutex
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2187,7 +2183,7 @@ namespace RTCORBA
     
     virtual ::RTCORBA::Mutex_ptr create_named_mutex (
         const char * name,
-        ::CORBA::Boolean_out created_flag
+        CORBA::Boolean_out created_flag
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2202,20 +2198,20 @@ namespace RTCORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTCORBA::RTORB::MutexNotFound
+        CORBA::SystemException
+        , RTCORBA::RTORB::MutexNotFound
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties (
-        ::CORBA::Long send_buffer_size,
-        ::CORBA::Long recv_buffer_size,
-        ::CORBA::Boolean keep_alive,
-        ::CORBA::Boolean dont_route,
-        ::CORBA::Boolean no_delay,
-        ::CORBA::Boolean enable_network_priority
+        CORBA::Long send_buffer_size,
+        CORBA::Long recv_buffer_size,
+        CORBA::Boolean keep_alive,
+        CORBA::Boolean dont_route,
+        CORBA::Boolean no_delay,
+        CORBA::Boolean enable_network_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2274,13 +2270,13 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual RTCORBA::ThreadpoolId create_threadpool (
-        ::CORBA::ULong stacksize,
-        ::CORBA::ULong static_threads,
-        ::CORBA::ULong dynamic_threads,
-        ::RTCORBA::Priority default_priority,
-        ::CORBA::Boolean allow_request_buffering,
-        ::CORBA::ULong max_buffered_requests,
-        ::CORBA::ULong max_request_buffer_size
+        CORBA::ULong stacksize,
+        CORBA::ULong static_threads,
+        CORBA::ULong dynamic_threads,
+        RTCORBA::Priority default_priority,
+        CORBA::Boolean allow_request_buffering,
+        CORBA::ULong max_buffered_requests,
+        CORBA::ULong max_request_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2291,12 +2287,12 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes (
-        ::CORBA::ULong stacksize,
-        const ::RTCORBA::ThreadpoolLanes & lanes,
-        ::CORBA::Boolean allow_borrowing,
-        ::CORBA::Boolean allow_request_buffering,
-        ::CORBA::ULong max_buffered_requests,
-        ::CORBA::ULong max_request_buffer_size
+        CORBA::ULong stacksize,
+        const RTCORBA::ThreadpoolLanes & lanes,
+        CORBA::Boolean allow_borrowing,
+        CORBA::Boolean allow_request_buffering,
+        CORBA::ULong max_buffered_requests,
+        CORBA::ULong max_request_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2307,20 +2303,20 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy_threadpool (
-        ::RTCORBA::ThreadpoolId threadpool
+        RTCORBA::ThreadpoolId threadpool
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTCORBA::RTORB::InvalidThreadpool
+        CORBA::SystemException
+        , RTCORBA::RTORB::InvalidThreadpool
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
-        ::RTCORBA::PriorityModel priority_model,
-        ::RTCORBA::Priority server_priority
+        RTCORBA::PriorityModel priority_model,
+        RTCORBA::Priority server_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2331,7 +2327,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
-        ::RTCORBA::ThreadpoolId threadpool
+        RTCORBA::ThreadpoolId threadpool
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2342,7 +2338,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
-        const ::RTCORBA::PriorityBands & priority_bands
+        const RTCORBA::PriorityBands & priority_bands
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2353,7 +2349,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
-        const ::RTCORBA::ProtocolList & protocols
+        const RTCORBA::ProtocolList & protocols
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2364,7 +2360,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
-        const ::RTCORBA::ProtocolList & protocols
+        const RTCORBA::ProtocolList & protocols
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2428,17 +2424,17 @@ namespace TAO
 #define _RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityModelPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityModelPolicy>
   {
-    static ::RTCORBA::PriorityModelPolicy_ptr duplicate (
-        ::RTCORBA::PriorityModelPolicy_ptr
+    static RTCORBA::PriorityModelPolicy_ptr tao_duplicate (
+        RTCORBA::PriorityModelPolicy_ptr
       );
-    static void release (
-        ::RTCORBA::PriorityModelPolicy_ptr
+    static void tao_release (
+        RTCORBA::PriorityModelPolicy_ptr
       );
-    static ::RTCORBA::PriorityModelPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::PriorityModelPolicy_ptr p,
+    static RTCORBA::PriorityModelPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::PriorityModelPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2449,17 +2445,17 @@ namespace TAO
 #define _RTCORBA_THREADPOOLPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ThreadpoolPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ThreadpoolPolicy>
   {
-    static ::RTCORBA::ThreadpoolPolicy_ptr duplicate (
-        ::RTCORBA::ThreadpoolPolicy_ptr
+    static RTCORBA::ThreadpoolPolicy_ptr tao_duplicate (
+        RTCORBA::ThreadpoolPolicy_ptr
       );
-    static void release (
-        ::RTCORBA::ThreadpoolPolicy_ptr
+    static void tao_release (
+        RTCORBA::ThreadpoolPolicy_ptr
       );
-    static ::RTCORBA::ThreadpoolPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::ThreadpoolPolicy_ptr p,
+    static RTCORBA::ThreadpoolPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::ThreadpoolPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2470,17 +2466,17 @@ namespace TAO
 #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ProtocolProperties>
   {
-    static ::RTCORBA::ProtocolProperties_ptr duplicate (
-        ::RTCORBA::ProtocolProperties_ptr
+    static RTCORBA::ProtocolProperties_ptr tao_duplicate (
+        RTCORBA::ProtocolProperties_ptr
       );
-    static void release (
-        ::RTCORBA::ProtocolProperties_ptr
+    static void tao_release (
+        RTCORBA::ProtocolProperties_ptr
       );
-    static ::RTCORBA::ProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::ProtocolProperties_ptr p,
+    static RTCORBA::ProtocolProperties_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::ProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2491,17 +2487,17 @@ namespace TAO
 #define _RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ServerProtocolPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ServerProtocolPolicy>
   {
-    static ::RTCORBA::ServerProtocolPolicy_ptr duplicate (
-        ::RTCORBA::ServerProtocolPolicy_ptr
+    static RTCORBA::ServerProtocolPolicy_ptr tao_duplicate (
+        RTCORBA::ServerProtocolPolicy_ptr
       );
-    static void release (
-        ::RTCORBA::ServerProtocolPolicy_ptr
+    static void tao_release (
+        RTCORBA::ServerProtocolPolicy_ptr
       );
-    static ::RTCORBA::ServerProtocolPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::ServerProtocolPolicy_ptr p,
+    static RTCORBA::ServerProtocolPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::ServerProtocolPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2512,17 +2508,17 @@ namespace TAO
 #define _RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ClientProtocolPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ClientProtocolPolicy>
   {
-    static ::RTCORBA::ClientProtocolPolicy_ptr duplicate (
-        ::RTCORBA::ClientProtocolPolicy_ptr
+    static RTCORBA::ClientProtocolPolicy_ptr tao_duplicate (
+        RTCORBA::ClientProtocolPolicy_ptr
       );
-    static void release (
-        ::RTCORBA::ClientProtocolPolicy_ptr
+    static void tao_release (
+        RTCORBA::ClientProtocolPolicy_ptr
       );
-    static ::RTCORBA::ClientProtocolPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::ClientProtocolPolicy_ptr p,
+    static RTCORBA::ClientProtocolPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::ClientProtocolPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2533,17 +2529,17 @@ namespace TAO
 #define _RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PrivateConnectionPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PrivateConnectionPolicy>
   {
-    static ::RTCORBA::PrivateConnectionPolicy_ptr duplicate (
-        ::RTCORBA::PrivateConnectionPolicy_ptr
+    static RTCORBA::PrivateConnectionPolicy_ptr tao_duplicate (
+        RTCORBA::PrivateConnectionPolicy_ptr
       );
-    static void release (
-        ::RTCORBA::PrivateConnectionPolicy_ptr
+    static void tao_release (
+        RTCORBA::PrivateConnectionPolicy_ptr
       );
-    static ::RTCORBA::PrivateConnectionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::PrivateConnectionPolicy_ptr p,
+    static RTCORBA::PrivateConnectionPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::PrivateConnectionPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2554,17 +2550,17 @@ namespace TAO
 #define _RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::TCPProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::TCPProtocolProperties>
   {
-    static ::RTCORBA::TCPProtocolProperties_ptr duplicate (
-        ::RTCORBA::TCPProtocolProperties_ptr
+    static RTCORBA::TCPProtocolProperties_ptr tao_duplicate (
+        RTCORBA::TCPProtocolProperties_ptr
       );
-    static void release (
-        ::RTCORBA::TCPProtocolProperties_ptr
+    static void tao_release (
+        RTCORBA::TCPProtocolProperties_ptr
       );
-    static ::RTCORBA::TCPProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::TCPProtocolProperties_ptr p,
+    static RTCORBA::TCPProtocolProperties_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::TCPProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2575,17 +2571,17 @@ namespace TAO
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::GIOPProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::GIOPProtocolProperties>
   {
-    static ::RTCORBA::GIOPProtocolProperties_ptr duplicate (
-        ::RTCORBA::GIOPProtocolProperties_ptr
+    static RTCORBA::GIOPProtocolProperties_ptr tao_duplicate (
+        RTCORBA::GIOPProtocolProperties_ptr
       );
-    static void release (
-        ::RTCORBA::GIOPProtocolProperties_ptr
+    static void tao_release (
+        RTCORBA::GIOPProtocolProperties_ptr
       );
-    static ::RTCORBA::GIOPProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::GIOPProtocolProperties_ptr p,
+    static RTCORBA::GIOPProtocolProperties_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::GIOPProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2596,17 +2592,17 @@ namespace TAO
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::UnixDomainProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::UnixDomainProtocolProperties>
   {
-    static ::RTCORBA::UnixDomainProtocolProperties_ptr duplicate (
-        ::RTCORBA::UnixDomainProtocolProperties_ptr
+    static RTCORBA::UnixDomainProtocolProperties_ptr tao_duplicate (
+        RTCORBA::UnixDomainProtocolProperties_ptr
       );
-    static void release (
-        ::RTCORBA::UnixDomainProtocolProperties_ptr
+    static void tao_release (
+        RTCORBA::UnixDomainProtocolProperties_ptr
       );
-    static ::RTCORBA::UnixDomainProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::UnixDomainProtocolProperties_ptr p,
+    static RTCORBA::UnixDomainProtocolProperties_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::UnixDomainProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2617,17 +2613,17 @@ namespace TAO
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::SharedMemoryProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>
   {
-    static ::RTCORBA::SharedMemoryProtocolProperties_ptr duplicate (
-        ::RTCORBA::SharedMemoryProtocolProperties_ptr
+    static RTCORBA::SharedMemoryProtocolProperties_ptr tao_duplicate (
+        RTCORBA::SharedMemoryProtocolProperties_ptr
       );
-    static void release (
-        ::RTCORBA::SharedMemoryProtocolProperties_ptr
+    static void tao_release (
+        RTCORBA::SharedMemoryProtocolProperties_ptr
       );
-    static ::RTCORBA::SharedMemoryProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::SharedMemoryProtocolProperties_ptr p,
+    static RTCORBA::SharedMemoryProtocolProperties_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::SharedMemoryProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2638,17 +2634,17 @@ namespace TAO
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityBandedConnectionPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>
   {
-    static ::RTCORBA::PriorityBandedConnectionPolicy_ptr duplicate (
-        ::RTCORBA::PriorityBandedConnectionPolicy_ptr
+    static RTCORBA::PriorityBandedConnectionPolicy_ptr tao_duplicate (
+        RTCORBA::PriorityBandedConnectionPolicy_ptr
       );
-    static void release (
-        ::RTCORBA::PriorityBandedConnectionPolicy_ptr
+    static void tao_release (
+        RTCORBA::PriorityBandedConnectionPolicy_ptr
       );
-    static ::RTCORBA::PriorityBandedConnectionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::PriorityBandedConnectionPolicy_ptr p,
+    static RTCORBA::PriorityBandedConnectionPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::PriorityBandedConnectionPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2659,17 +2655,17 @@ namespace TAO
 #define _RTCORBA_CURRENT__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Current>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Current>
   {
-    static ::RTCORBA::Current_ptr duplicate (
-        ::RTCORBA::Current_ptr
+    static RTCORBA::Current_ptr tao_duplicate (
+        RTCORBA::Current_ptr
       );
-    static void release (
-        ::RTCORBA::Current_ptr
+    static void tao_release (
+        RTCORBA::Current_ptr
       );
-    static ::RTCORBA::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::Current_ptr p,
+    static RTCORBA::Current_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::Current_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2680,17 +2676,17 @@ namespace TAO
 #define _RTCORBA_MUTEX__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Mutex>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Mutex>
   {
-    static ::RTCORBA::Mutex_ptr duplicate (
-        ::RTCORBA::Mutex_ptr
+    static RTCORBA::Mutex_ptr tao_duplicate (
+        RTCORBA::Mutex_ptr
       );
-    static void release (
-        ::RTCORBA::Mutex_ptr
+    static void tao_release (
+        RTCORBA::Mutex_ptr
       );
-    static ::RTCORBA::Mutex_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::Mutex_ptr p,
+    static RTCORBA::Mutex_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::Mutex_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2701,17 +2697,17 @@ namespace TAO
 #define _RTCORBA_RTORB__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::RTORB>
+  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::RTORB>
   {
-    static ::RTCORBA::RTORB_ptr duplicate (
-        ::RTCORBA::RTORB_ptr
+    static RTCORBA::RTORB_ptr tao_duplicate (
+        RTCORBA::RTORB_ptr
       );
-    static void release (
-        ::RTCORBA::RTORB_ptr
+    static void tao_release (
+        RTCORBA::RTORB_ptr
       );
-    static ::RTCORBA::RTORB_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::RTORB_ptr p,
+    static RTCORBA::RTORB_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        RTCORBA::RTORB_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2940,10 +2936,10 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:964
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
-#include "RTCORBAC.inl"
+#include "RTCORBAC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -2958,4 +2954,3 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
-
diff --git a/TAO/tao/RTCORBA/RTCORBAC.i b/TAO/tao/RTCORBA/RTCORBAC.i
new file mode 100644
index 00000000000..38aa32569ba
--- /dev/null
+++ b/TAO/tao/RTCORBA/RTCORBAC.i
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 83e195b4b99..2f7547f5c8b 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -7,7 +7,6 @@
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
-#include "tao/SystemException.h"
 #include "ace/OS_NS_strings.h"
 
 ACE_RCSID (RTCORBA,
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index dd75f7ba1bd..3ee8de165b4 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -6,7 +6,6 @@
 #include "RT_Stub.h"
 
 #include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
 
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/tao/RTCORBA/diffs/RTCORBA.diff b/TAO/tao/RTCORBA/diffs/RTCORBA.diff
index 489856dc1ca..e4810dd618a 100644
--- a/TAO/tao/RTCORBA/diffs/RTCORBA.diff
+++ b/TAO/tao/RTCORBA/diffs/RTCORBA.diff
@@ -1,76 +1,94 @@
---- orig/RTCORBAC.h	2004-09-16 12:52:02.885009600 +0200
-+++ RTCORBAC.h	2004-09-16 12:36:01.362408000 +0200
-@@ -36,12 +36,18 @@
- 
- #include "ace/config-all.h"
- 
-+#ifndef TAO_RTCORBA_SAFE_INCLUDE
-+#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
-+#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
-+
+--- orig/RTCORBAC.h	Wed Feb  6 13:37:48 2002
++++ RTCORBAC.h	Wed Feb  6 13:44:01 2002
+@@ -23,15 +23,26 @@
+ #define _TAO_IDL_ORIG_RTCORBAC_H_
+
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "tao/orbconf.h"
+
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
+
  #include "rtcorba_export.h"
-+#include "rtcorba_typedefs.h"
- #include "tao/ORB.h"
+-#include "IOPC.h"
+-#include "TimeBaseC.h"
++#include "tao/IOPC.h"
 +#include "tao/TimeBaseC.h"
- #include "tao/SystemException.h"
- #include "tao/Environment.h"
- #include "tao/Object.h"
-@@ -50,6 +56,8 @@
- #include "tao/Seq_Var_T.h"
- #include "tao/Seq_Out_T.h"
- #include "tao/VarOut_T.h"
-+#include "tao/Encodable.h"
 +#include "tao/PolicyC.h"
- 
++
++// Forward references.
++class TAO_Priority_Mapping_Manager;
++class TAO_Priority_Mapping_Manager_var;
++class TAO_Priority_Mapping_Manager_out;
++class TAO_Priority_Mapping;
++
++#ifndef TAO_RTCORBA_SAFE_INCLUDE
++#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
++#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
+
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -532,6 +540,7 @@
-   
+@@ -58,6 +69,15 @@
+
+ TAO_NAMESPACE  RTCORBA
+ {
++  // TAO-specific
++  typedef TAO_Priority_Mapping_Manager PriorityMappingManager;
++  typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr;
++  typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var;
++  typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out;
++
++  typedef TAO_Priority_Mapping PriorityMapping;
++  // End TAO-specific
++
+   typedef CORBA::Short NativePriority;
+   typedef CORBA::Short_out NativePriority_out;
+   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority;
+@@ -674,6 +694,7 @@
+
    class TAO_RTCORBA_Export ProtocolProperties
-     : public virtual CORBA::Object
+     : public virtual CORBA_Object
 +    , public virtual TAO_Encodable
    {
    public:
-     typedef ProtocolProperties_ptr _ptr_type;
-@@ -568,6 +577,9 @@
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -705,6 +726,11 @@
+
      virtual const char* _interface_repository_id (void) const;
-     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-   
-+    // CDR Encoder/Decoder methods. (handcrafted)
+
++    // CDR Encoder/Decoder methods.
++
 +    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
 +    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
++
    protected:
-     // Abstract or local interface only.
      ProtocolProperties (void);
---- orig/RTCORBAC.cpp	2004-09-16 12:52:02.885009600 +0200
-+++ RTCORBAC.cpp	2004-09-16 12:36:36.643139200 +0200
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:303
- 
- 
+
+--- orig/RTCORBAC.cpp	Wed Feb  6 13:37:48 2002
++++ RTCORBAC.cpp	Wed Feb  6 13:41:48 2002
+@@ -19,7 +19,7 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+
 -#include "RTCORBAC.h"
 +#include "RTCORBA.h"
- #include "tao/CDR.h"
- #include "tao/Typecode.h"
- #include "tao/Any_Impl_T.h"
-@@ -57,7 +57,23 @@
- }
- 
- 
+
+ #include "tao/Stub.h"
+ #include "tao/Invocation.h"
+@@ -39,6 +39,21 @@
+ #include "RTCORBAC.i"
+ #endif /* !defined INLINE */
+
 +//////////////////////////////////////////////////////
-+// CDR Encoding Support hand crafted
++// CDR Encoding Support
 +
 +CORBA::Boolean
 +RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &)
 +{
 +  return 1;
 +}
- // TAO_IDL - Generated from
-+// be/be_visitor_arg_traits.cpp:60
 +
 +CORBA::Boolean
 +RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
@@ -78,6 +96,6 @@
 +  return 1;
 +}
 +
- // be\be_visitor_typecode/typecode_defn.cpp:290
- 
  static const CORBA::Long _oc_RTCORBA_NativePriority[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
index f3386bb07e8..6909d85ddef 100644
--- a/TAO/tao/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer.mpc
@@ -22,8 +22,4 @@ project : taolib, core, rtcorba, portableserver {
   Resource_Files {
     RTPortableServer
   }
-
-  PIDL_Files {
-    RTPortableServer
-  }
 }
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 69a012e8ad5..9bdb59d615f 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -58,7 +58,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTPortableServer::POA_ptr
-TAO::Objref_Traits<RTPortableServer::POA>::duplicate (
+TAO::Objref_Traits<RTPortableServer::POA>::tao_duplicate (
     RTPortableServer::POA_ptr p
   )
 {
@@ -67,7 +67,7 @@ TAO::Objref_Traits<RTPortableServer::POA>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTPortableServer::POA>::release (
+TAO::Objref_Traits<RTPortableServer::POA>::tao_release (
     RTPortableServer::POA_ptr p
   )
 {
@@ -76,14 +76,14 @@ TAO::Objref_Traits<RTPortableServer::POA>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTPortableServer::POA_ptr
-TAO::Objref_Traits<RTPortableServer::POA>::nil (void)
+TAO::Objref_Traits<RTPortableServer::POA>::tao_nil (void)
 {
   return RTPortableServer::POA::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTPortableServer::POA>::marshal (
+TAO::Objref_Traits<RTPortableServer::POA>::tao_marshal (
     RTPortableServer::POA_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -92,7 +92,7 @@ TAO::Objref_Traits<RTPortableServer::POA>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTPortableServer__TAO_POA_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -103,7 +103,7 @@ RTPortableServer::POA::POA (void)
 RTPortableServer::POA::~POA (void)
 {}
 
-void
+void 
 RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *_tao_tmp_pointer =
@@ -121,10 +121,10 @@ RTPortableServer::POA::_narrow (
     {
       return POA::_nil ();
     }
-
+  
   POA_ptr proxy =
     dynamic_cast<POA_ptr> (_tao_objref);
-
+  
   return POA::_duplicate (proxy);
 }
 
@@ -138,10 +138,10 @@ RTPortableServer::POA::_unchecked_narrow (
     {
       return POA::_nil ();
     }
-
+  
   POA_ptr proxy =
     dynamic_cast<POA_ptr> (_tao_objref);
-
+  
   return POA::_duplicate (proxy);
 }
 
@@ -152,7 +152,7 @@ RTPortableServer::POA::_duplicate (POA_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -214,7 +214,7 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         RTPortableServer::POA
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTPortableServer::POA
@@ -231,10 +231,11 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         RTPortableServer::POA
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTPortableServer::POA
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index bd290881d44..ab6ce108fe9 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -70,13 +70,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -86,22 +86,22 @@ namespace TAO
 
 namespace RTPortableServer
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_RTPORTABLESERVER_POA__VAR_OUT_CH_)
 #define _RTPORTABLESERVER_POA__VAR_OUT_CH_
-
+  
   class POA;
   typedef POA *POA_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         POA
       >
     POA_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         POA
@@ -109,43 +109,43 @@ namespace RTPortableServer
     POA_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTPORTABLESERVER_POA_CH_)
 #define _RTPORTABLESERVER_POA_CH_
-
+  
   class TAO_RTPortableServer_Export POA
     : public virtual PortableServer::POA
   {
   public:
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
-
+    
     // The static operations.
     static POA_ptr _duplicate (POA_ptr obj);
-
+    
     static POA_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static POA_ptr _nil (void)
     {
       return (POA_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr create_reference_with_priority (
         const char * intf,
         RTCORBA::Priority priority
@@ -155,10 +155,10 @@ namespace RTPortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr create_reference_with_id_and_priority (
         const PortableServer::ObjectId & oid,
         const char * intf,
@@ -169,10 +169,10 @@ namespace RTPortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ObjectId * activate_object_with_priority (
         PortableServer::Servant p_servant,
         RTCORBA::Priority priority
@@ -183,10 +183,10 @@ namespace RTPortableServer
         , PortableServer::POA::ServantAlreadyActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void activate_object_with_id_and_priority (
         const PortableServer::ObjectId & oid,
         PortableServer::Servant p_servant,
@@ -199,36 +199,36 @@ namespace RTPortableServer
         , PortableServer::POA::ObjectAlreadyActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     POA (void);
-
+    
     virtual ~POA (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     POA (const POA &);
-
+    
     void operator= (const POA &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
 
 // TAO_IDL - Generated from
@@ -245,18 +245,18 @@ namespace TAO
 
 #if !defined (_RTPORTABLESERVER_POA__TRAITS_CH_)
 #define _RTPORTABLESERVER_POA__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTPortableServer_Export Objref_Traits<RTPortableServer::POA>
   {
-    static RTPortableServer::POA_ptr duplicate (
+    static RTPortableServer::POA_ptr tao_duplicate (
         RTPortableServer::POA_ptr
       );
-    static void release (
+    static void tao_release (
         RTPortableServer::POA_ptr
       );
-    static RTPortableServer::POA_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static RTPortableServer::POA_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         RTPortableServer::POA_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -290,3 +290,4 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc
index f8f7ef78a37..3eeca32721c 100644
--- a/TAO/tao/RTScheduler.mpc
+++ b/TAO/tao/RTScheduler.mpc
@@ -22,8 +22,4 @@ project : taolib, rtcorba, portableserver, core, corba_messaging {
   Resource_Files {
     RTScheduling
   }
-
-  PIDL_Files {
-    RTScheduling
-  }
 }
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index c6c7627011c..eaf3576ee46 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -79,7 +79,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::ThreadAction_ptr
-TAO::Objref_Traits<RTScheduling::ThreadAction>::duplicate (
+TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_duplicate (
     RTScheduling::ThreadAction_ptr p
   )
 {
@@ -88,7 +88,7 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTScheduling::ThreadAction>::release (
+TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_release (
     RTScheduling::ThreadAction_ptr p
   )
 {
@@ -97,14 +97,14 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::ThreadAction_ptr
-TAO::Objref_Traits<RTScheduling::ThreadAction>::nil (void)
+TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_nil (void)
 {
   return RTScheduling::ThreadAction::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::ThreadAction>::marshal (
+TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_marshal (
     RTScheduling::ThreadAction_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -253,7 +253,7 @@ namespace RTScheduling
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::DistributableThread_ptr
-TAO::Objref_Traits<RTScheduling::DistributableThread>::duplicate (
+TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_duplicate (
     RTScheduling::DistributableThread_ptr p
   )
 {
@@ -262,7 +262,7 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTScheduling::DistributableThread>::release (
+TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_release (
     RTScheduling::DistributableThread_ptr p
   )
 {
@@ -271,14 +271,14 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::DistributableThread_ptr
-TAO::Objref_Traits<RTScheduling::DistributableThread>::nil (void)
+TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_nil (void)
 {
   return RTScheduling::DistributableThread::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::DistributableThread>::marshal (
+TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_marshal (
     RTScheduling::DistributableThread_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -475,7 +475,7 @@ namespace RTScheduling
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::Current_ptr
-TAO::Objref_Traits<RTScheduling::Current>::duplicate (
+TAO::Objref_Traits<RTScheduling::Current>::tao_duplicate (
     RTScheduling::Current_ptr p
   )
 {
@@ -484,7 +484,7 @@ TAO::Objref_Traits<RTScheduling::Current>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTScheduling::Current>::release (
+TAO::Objref_Traits<RTScheduling::Current>::tao_release (
     RTScheduling::Current_ptr p
   )
 {
@@ -493,14 +493,14 @@ TAO::Objref_Traits<RTScheduling::Current>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::Current_ptr
-TAO::Objref_Traits<RTScheduling::Current>::nil (void)
+TAO::Objref_Traits<RTScheduling::Current>::tao_nil (void)
 {
   return RTScheduling::Current::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::Current>::marshal (
+TAO::Objref_Traits<RTScheduling::Current>::tao_marshal (
     RTScheduling::Current_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -957,7 +957,7 @@ namespace RTScheduling
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::ResourceManager_ptr
-TAO::Objref_Traits<RTScheduling::ResourceManager>::duplicate (
+TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_duplicate (
     RTScheduling::ResourceManager_ptr p
   )
 {
@@ -966,7 +966,7 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTScheduling::ResourceManager>::release (
+TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_release (
     RTScheduling::ResourceManager_ptr p
   )
 {
@@ -975,14 +975,14 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::ResourceManager_ptr
-TAO::Objref_Traits<RTScheduling::ResourceManager>::nil (void)
+TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_nil (void)
 {
   return RTScheduling::ResourceManager::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::ResourceManager>::marshal (
+TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_marshal (
     RTScheduling::ResourceManager_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1136,7 +1136,7 @@ namespace RTScheduling
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::Scheduler_ptr
-TAO::Objref_Traits<RTScheduling::Scheduler>::duplicate (
+TAO::Objref_Traits<RTScheduling::Scheduler>::tao_duplicate (
     RTScheduling::Scheduler_ptr p
   )
 {
@@ -1145,7 +1145,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<RTScheduling::Scheduler>::release (
+TAO::Objref_Traits<RTScheduling::Scheduler>::tao_release (
     RTScheduling::Scheduler_ptr p
   )
 {
@@ -1154,14 +1154,14 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::Scheduler_ptr
-TAO::Objref_Traits<RTScheduling::Scheduler>::nil (void)
+TAO::Objref_Traits<RTScheduling::Scheduler>::tao_nil (void)
 {
   return RTScheduling::Scheduler::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::Scheduler>::marshal (
+TAO::Objref_Traits<RTScheduling::Scheduler>::tao_marshal (
     RTScheduling::Scheduler_ptr p,
     TAO_OutputCDR & cdr
   )
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
index f695f3cb712..04d83d3528b 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ b/TAO/tao/RTScheduling/RTSchedulerC.h
@@ -1172,14 +1172,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::ThreadAction>
   {
-    static RTScheduling::ThreadAction_ptr duplicate (
+    static RTScheduling::ThreadAction_ptr tao_duplicate (
         RTScheduling::ThreadAction_ptr
       );
-    static void release (
+    static void tao_release (
         RTScheduling::ThreadAction_ptr
       );
-    static RTScheduling::ThreadAction_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static RTScheduling::ThreadAction_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         RTScheduling::ThreadAction_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1193,14 +1193,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::DistributableThread>
   {
-    static RTScheduling::DistributableThread_ptr duplicate (
+    static RTScheduling::DistributableThread_ptr tao_duplicate (
         RTScheduling::DistributableThread_ptr
       );
-    static void release (
+    static void tao_release (
         RTScheduling::DistributableThread_ptr
       );
-    static RTScheduling::DistributableThread_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static RTScheduling::DistributableThread_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         RTScheduling::DistributableThread_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1214,14 +1214,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::Current>
   {
-    static RTScheduling::Current_ptr duplicate (
+    static RTScheduling::Current_ptr tao_duplicate (
         RTScheduling::Current_ptr
       );
-    static void release (
+    static void tao_release (
         RTScheduling::Current_ptr
       );
-    static RTScheduling::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static RTScheduling::Current_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         RTScheduling::Current_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1235,14 +1235,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::ResourceManager>
   {
-    static RTScheduling::ResourceManager_ptr duplicate (
+    static RTScheduling::ResourceManager_ptr tao_duplicate (
         RTScheduling::ResourceManager_ptr
       );
-    static void release (
+    static void tao_release (
         RTScheduling::ResourceManager_ptr
       );
-    static RTScheduling::ResourceManager_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static RTScheduling::ResourceManager_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         RTScheduling::ResourceManager_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1256,14 +1256,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::Scheduler>
   {
-    static RTScheduling::Scheduler_ptr duplicate (
+    static RTScheduling::Scheduler_ptr tao_duplicate (
         RTScheduling::Scheduler_ptr
       );
-    static void release (
+    static void tao_release (
         RTScheduling::Scheduler_ptr
       );
-    static RTScheduling::Scheduler_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static RTScheduling::Scheduler_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         RTScheduling::Scheduler_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
index 74bddc34ee6..2d0fa7d7da9 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -2,7 +2,6 @@
 #include "Connection_Handler.h"
 #include "ORB_Core.h"
 #include "debug.h"
-#include "Transport.h"
 
 #include "ace/Synch_Options.h"
 
@@ -88,15 +87,3 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Connection_Handler *ch,
 
   return result;
 }
-
-
-int
-TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t,
-                                     ACE_Time_Value *val)
-{
-  if (t == 0)
-    return -1;
-
-  return this->wait (t->connection_handler (),
-                     val);
-}
diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h
index 5550e00380d..fc377a5d596 100644
--- a/TAO/tao/Reactive_Connect_Strategy.h
+++ b/TAO/tao/Reactive_Connect_Strategy.h
@@ -49,11 +49,7 @@ public:
                               ACE_Synch_Options &opt);
 
   virtual int wait (TAO_Connection_Handler *ch,
-                     ACE_Time_Value *val);
-
-
-  virtual int wait (TAO_Transport *t,
-                     ACE_Time_Value *val);
+                    ACE_Time_Value *val);
 
 };
 
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index 0cb98e0f718..8f357a28467 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -4,12 +4,11 @@
 #include "Invocation_Adapter.h"
 #include "IFR_Client_Adapter.h"
 #include "ORB_Core.h"
-#include "SystemException.h"
 
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tao,
-           Remote_Object_Proxy_Broker,
+           TAO_Object_Remote_Proxy_Broker,
            "$Id$")
 
 namespace TAO
diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/RequestInfo_Util.cpp
index 7db5fe67980..c9f7eb4bc3f 100644
--- a/TAO/tao/RequestInfo_Util.cpp
+++ b/TAO/tao/RequestInfo_Util.cpp
@@ -7,14 +7,11 @@
 #include "ORB_Constants.h"
 #include "StringSeqC.h"
 #include "DynamicC.h"
-#include "SystemException.h"
 
-
-ACE_RCSID (tao,
-           RequestInfo_Util,
+ACE_RCSID (tao, 
+           RequestInfo_Util, 
            "$Id$")
 
-
 Dynamic::ParameterList *
 TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
 {
@@ -23,7 +20,7 @@ TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
                     Dynamic::ParameterList,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 
@@ -40,7 +37,7 @@ TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL)
                     Dynamic::ExceptionList,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 
@@ -57,7 +54,7 @@ TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL)
                     Dynamic::ContextList,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 
@@ -74,7 +71,7 @@ TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL)
                     Dynamic::RequestContext,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 
@@ -92,7 +89,7 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
                     CORBA::Any,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        0,
+                        TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
index e63dafa4be0..0c16e373345 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index dc753c2fb34..9410f8000dc 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -6,7 +6,7 @@
 #include "tao/Sequence.i"
 #endif /* __ACE_INLINE__ */
 
-#include "SystemException.h"
+#include "Exception.h"
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
 # include "ace/Message_Block.h"
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 9f538db1292..1290e27a70c 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -409,8 +409,8 @@ TAO_Object_Manager<T,T_var>::operator= (
 
   if (this->release_)
     {
-      TAO::Objref_Traits<T>::release (*this->ptr_);
-      *this->ptr_ = TAO::Objref_Traits<T>::duplicate (*rhs.ptr_);
+      TAO::Objref_Traits<T>::tao_release (*this->ptr_);
+      *this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (*rhs.ptr_);
     }
   else
     {
@@ -430,7 +430,7 @@ TAO_Object_Manager<T,T_var>::operator= (T * p)
       // that of a var variable.  Therefore we will not duplicate the
       // user provided pointer before assigning it to the internal
       // variable.
-      TAO::Objref_Traits<T>::release (*this->ptr_);
+      TAO::Objref_Traits<T>::tao_release (*this->ptr_);
       *this->ptr_ = p;
     }
   else
@@ -451,8 +451,8 @@ TAO_Object_Manager<T,T_var>::operator= (const T_var & p)
       // that of a var variable.  Therefore we duplicate p's
       // pointer before assigning it to the internal
       // variable.
-      TAO::Objref_Traits<T>::release (*this->ptr_);
-      *this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.in ());
+      TAO::Objref_Traits<T>::tao_release (*this->ptr_);
+      *this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.in ());
     }
   else
     {
@@ -466,8 +466,8 @@ template <typename T, typename T_var>
 T *&
 TAO_Object_Manager<T,T_var>::out (void)
 {
-  TAO::Objref_Traits<T>::release (*this->ptr_);
-  *this->ptr_ = TAO::Objref_Traits<T>::nil ();
+  TAO::Objref_Traits<T>::tao_release (*this->ptr_);
+  *this->ptr_ = TAO::Objref_Traits<T>::tao_nil ();
   return *this->ptr_;
 }
 
@@ -476,7 +476,7 @@ T *
 TAO_Object_Manager<T,T_var>::_retn (void)
 {
   T *temp = *this->ptr_;
-  *this->ptr_ = TAO::Objref_Traits<T>::nil ();
+  *this->ptr_ = TAO::Objref_Traits<T>::tao_nil ();
   return temp;
 }
 
@@ -585,7 +585,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
+          tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -621,8 +621,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator= (
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          TAO::Objref_Traits<T>::release (tmp[i]);
-          tmp[i] = TAO::Objref_Traits<T>::nil ();
+          TAO::Objref_Traits<T>::tao_release (tmp[i]);
+          tmp[i] = TAO::Objref_Traits<T>::tao_nil ();
         }
 
       if (this->maximum_ < rhs.maximum_)
@@ -656,7 +656,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator= (
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
+      tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]);
     }
 
   return *this;
@@ -675,7 +675,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
 
   for (CORBA::ULong i = 0; i < nelems; ++i)
     {
-      buf[i] = TAO::Objref_Traits<T>::nil ();
+      buf[i] = TAO::Objref_Traits<T>::tao_nil ();
     }
 
   return buf;
@@ -727,7 +727,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (
         // the old instances.
         if (!this->release_)
           {
-            tmp[i] = TAO::Objref_Traits<T>::duplicate (old[i]);
+            tmp[i] = TAO::Objref_Traits<T>::tao_duplicate (old[i]);
           }
         else
           {
@@ -759,8 +759,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      TAO::Objref_Traits<T>::release (tmp[i]);
-      tmp[i] = TAO::Objref_Traits<T>::nil ();
+      TAO::Objref_Traits<T>::tao_release (tmp[i]);
+      tmp[i] = TAO::Objref_Traits<T>::tao_nil ();
     }
 
   TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
@@ -782,8 +782,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      TAO::Objref_Traits<T>::release (tmp[i]);
-      tmp[i] = TAO::Objref_Traits<T>::nil ();
+      TAO::Objref_Traits<T>::tao_release (tmp[i]);
+      tmp[i] = TAO::Objref_Traits<T>::tao_nil ();
     }
 }
 
@@ -817,7 +817,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence (
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
+          tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -846,8 +846,8 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= (
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          TAO::Objref_Traits<T>::release (tmp[i]);
-          tmp[i] = TAO::Objref_Traits<T>::nil ();
+          TAO::Objref_Traits<T>::tao_release (tmp[i]);
+          tmp[i] = TAO::Objref_Traits<T>::tao_nil ();
         }
       // No need to reallocate the buffer since it is always of size
       // MAX
@@ -876,7 +876,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= (
 
   for (CORBA::ULong i=0; i < rhs.length_; ++i)
     {
-      tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
+      tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]);
     }
 
   return *this;
@@ -895,7 +895,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (
 
   for (CORBA::ULong i = 0; i < MAX; ++i)
     {
-      buf[i] = TAO::Objref_Traits<T>::nil ();
+      buf[i] = TAO::Objref_Traits<T>::tao_nil ();
     }
 
   return buf;
@@ -910,10 +910,10 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (T ** buffer)
   // complaint and call CORBA::release() on each one.
   for (CORBA::ULong i = 0; i < MAX; ++i)
     {
-      if (buffer[i] != TAO::Objref_Traits<T>::nil ())
+      if (buffer[i] != TAO::Objref_Traits<T>::tao_nil ())
         {
-          TAO::Objref_Traits<T>::release (buffer[i]);
-          buffer[i] = TAO::Objref_Traits<T>::nil ();
+          TAO::Objref_Traits<T>::tao_release (buffer[i]);
+          buffer[i] = TAO::Objref_Traits<T>::tao_nil ();
         }
     }
 
@@ -962,8 +962,8 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::_shrink_buffer (
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      TAO::Objref_Traits<T>::release (tmp[i]);
-      tmp[i] = TAO::Objref_Traits<T>::nil ();
+      TAO::Objref_Traits<T>::tao_release (tmp[i]);
+      tmp[i] = TAO::Objref_Traits<T>::tao_nil ();
     }
 }
 
@@ -1395,7 +1395,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::TAO_Unbounded_Array_Sequence (
                                              rhs.buffer_);
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]);
+          TAO::Array_Traits<T,T_slice,TAG>::tao_copy (tmp1[i], tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -1466,7 +1466,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator= (
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      TAO::Array_Traits<T,T_slice,TAG>::copy (
+      TAO::Array_Traits<T,T_slice,TAG>::tao_copy (
           ACE_reinterpret_cast (T *,
                                 this->buffer_)[i],
           ACE_reinterpret_cast (const T *,
@@ -1544,7 +1544,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::_allocate_buffer (
       T* old = (T *) this->buffer_;
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          TAO::Array_Traits<T,T_slice,TAG>::copy (tmp[i], old[i]);
+          TAO::Array_Traits<T,T_slice,TAG>::tao_copy (tmp[i], old[i]);
         }
 
       if (this->release_)
@@ -1631,7 +1631,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::TAO_Bounded_Array_Sequence (
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]);
+          TAO::Array_Traits<T,T_slice,TAG>::tao_copy (tmp1[i], tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -1683,7 +1683,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator= (
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      TAO::Array_Traits<T,T_slice,TAG>::copy (
+      TAO::Array_Traits<T,T_slice,TAG>::tao_copy (
           ((T *) this->buffer_)[i],
           ((const T *) rhs.buffer_)[i]
         );
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index c1ecd508680..1575fbf085a 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -159,7 +159,7 @@ template <typename T, typename T_var>
 ACE_INLINE
 TAO_Object_Manager<T,T_var>::operator const T_var () const
 {
-  return TAO::Objref_Traits<T>::duplicate (*this->ptr_);
+  return TAO::Objref_Traits<T>::tao_duplicate (*this->ptr_);
 }
 
 template <typename T, typename T_var>
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index c5d69c476e3..80f905477e9 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -1,6 +1,6 @@
 #include "Service_Callbacks.h"
 #include "ORB_Constants.h"
-#include "SystemException.h"
+#include "Exception.h"
 #include "Environment.h"
 #include "Invocation_Utils.h"
 
diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h
index 582d6d3b94a..7e75c1aac4c 100644
--- a/TAO/tao/Services_Activate.h
+++ b/TAO/tao/Services_Activate.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 class TAO_ORB_Core;
 class TAO_Service_Callbacks;
diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc
index 60db5a9c004..031c5e01e63 100644
--- a/TAO/tao/SmartProxies.mpc
+++ b/TAO/tao/SmartProxies.mpc
@@ -22,7 +22,4 @@ project : taolib, core {
   Resource_Files {
     SmartProxies
   }
-
-  PIDL_Files {
-  }
 }
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
index 3fe67efa366..0fb3ae66072 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::marshal (TAO_OutputCDR & cdr)
   return cdr << from_S (this->x_);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S>
 void
 TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
@@ -33,8 +31,6 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -55,8 +51,6 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
   return cdr >> to_S (this->x_);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S>
 void
 TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
@@ -67,8 +61,6 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -80,8 +72,6 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
   return cdr >> to_S (this->x_);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S>
 void
 TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
@@ -92,8 +82,6 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -105,8 +93,6 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
   return cdr >> to_S (this->x_);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S>
 void
 TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result (
@@ -116,7 +102,5 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result (
   (*any) <<= from_S (this->x_);
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_C */
 
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index 6d405e4bbaa..19c368ec6e9 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -38,9 +38,9 @@ namespace TAO
     In_Special_Basic_Argument_T (S const &);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S const & arg (void);
 
   private:
@@ -61,9 +61,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -83,9 +83,9 @@ namespace TAO
     Out_Special_Basic_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -105,9 +105,9 @@ namespace TAO
     Ret_Special_Basic_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
     S excp (void);
diff --git a/TAO/tao/Special_Basic_SArgument_T.cpp b/TAO/tao/Special_Basic_SArgument_T.cpp
index c997f057d98..7b49823f9a5 100644
--- a/TAO/tao/Special_Basic_SArgument_T.cpp
+++ b/TAO/tao/Special_Basic_SArgument_T.cpp
@@ -25,8 +25,6 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
   return cdr >> to_S (this->x_);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S>
 void
 TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
@@ -37,8 +35,6 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -59,8 +55,6 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
   return cdr >> to_S (this->x_);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S>
 void
 TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
@@ -71,8 +65,6 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -84,8 +76,6 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
   return cdr << from_S (this->x_);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S>
 void
 TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
@@ -96,8 +86,6 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, typename to_S, typename from_S>
@@ -109,8 +97,6 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
   return cdr << from_S (this->x_);
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename to_S, typename from_S>
 void
 TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result (
@@ -120,7 +106,5 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result (
   (*any) <<= this->x_;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_SPECIAL_BASIC_SARGUMENT_T_C */
 
diff --git a/TAO/tao/Special_Basic_SArgument_T.h b/TAO/tao/Special_Basic_SArgument_T.h
index fcd4254358c..1399221066d 100644
--- a/TAO/tao/Special_Basic_SArgument_T.h
+++ b/TAO/tao/Special_Basic_SArgument_T.h
@@ -37,9 +37,9 @@ namespace TAO
     In_Special_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S arg (void) const;
 
   private:
@@ -60,9 +60,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -82,9 +82,9 @@ namespace TAO
     Out_Special_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -104,9 +104,9 @@ namespace TAO
     Ret_Special_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index a3e381bacd1..5ef081ef846 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -22,8 +22,4 @@ project : taolib, core {
   Resource_Files {
     Strategies
   }
-
-  PIDL_Files {
-    Strategies
-  }
 }
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 8854b94696e..bba8297505f 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -124,11 +124,8 @@ TAO_DIOP_Connection_Handler::open (void*)
                  this->local_addr_.get_port_number ()));
   }
 
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
+  // Set the id in the transport now that we're active.
+  this->transport ()->id ((size_t) this->get_handle ());
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS);
 
@@ -169,7 +166,16 @@ TAO_DIOP_Connection_Handler::close_connection (void)
 int
 TAO_DIOP_Connection_Handler::handle_input (ACE_HANDLE h)
 {
-  return this->handle_input_eh (h, this);
+  int result =
+    this->handle_input_eh (h, this);
+
+  if (result == -1)
+    {
+      this->close_connection ();
+      return 0;
+    }
+
+  return result;
 }
 
 int
@@ -212,7 +218,9 @@ TAO_DIOP_Connection_Handler::handle_close (ACE_HANDLE,
 int
 TAO_DIOP_Connection_Handler::close (u_long)
 {
-  return this->close_handler ();
+  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
+  this->transport ()->remove_reference ();
+  return 0;
 }
 
 int
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index a082ce439ed..918e70d6d7f 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -258,16 +258,6 @@ TAO_DIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
   return diop_endpoint;
 }
 
-int
-TAO_DIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  ACE_UNUSED_ARG(svc_handler);
-
-  // Noop
-  return 0;
-}
-
 
 // ****************************************************************
 
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index 389875fa03a..4fe4ba07c0d 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -89,9 +89,6 @@ protected:
   /// initialize <tcp_properties_>.
   int init_tcp_properties (void);
 
-  /// Cancel the passed cvs handler from the connector
-  int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
-
 protected:
 
   /// TCP configuration properties to be used for all
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 60d586cef75..39d4a1125a6 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -154,16 +154,14 @@ TAO_SCIOP_Connection_Handler::open (void*)
         return -1;
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - SCIOP_Connection_Handler::open, SCIOP ")
+                  ACE_TEXT ("TAO (%P|%t) - Connection_Handler::open, SCIOP ")
                   ACE_TEXT ("connection to peer <%s> on %d\n"),
                   client, this->peer ().get_handle ()));
     }
 
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
+  // Set the id in the transport now that we're active.
+  // Use C-style cast b/c otherwise we get warnings on lots of compilers
+  this->transport ()->id ((size_t) this->get_handle ());
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS);
 
@@ -185,7 +183,16 @@ TAO_SCIOP_Connection_Handler::close_connection (void)
 int
 TAO_SCIOP_Connection_Handler::handle_input (ACE_HANDLE h)
 {
-  return this->handle_input_eh (h, this);
+  int result =
+    this->handle_input_eh (h, this);
+
+  if (result == -1)
+    {
+      this->close_connection ();
+      return 0;
+    }
+
+  return result;
 }
 
 int
@@ -224,7 +231,9 @@ TAO_SCIOP_Connection_Handler::handle_close (ACE_HANDLE,
 int
 TAO_SCIOP_Connection_Handler::close (u_long)
 {
-  return this->close_handler ();
+  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
+  this->transport ()->remove_reference ();
+  return 0;
 }
 
 int
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 2911873f0cd..e387d532ca2 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -14,7 +14,6 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Transport.h"
 #include "tao/Wait_Strategy.h"
-#include "tao/Profile_Transport_Resolver.h"
 
 #include "ace/OS_NS_strings.h"
 #include "ace/Strategies_T.h"
@@ -153,9 +152,9 @@ TAO_SCIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 }
 
 TAO_Transport *
-TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
+TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
                                       TAO_Transport_Descriptor_Interface &desc,
-                                      ACE_Time_Value *timeout)
+                                      ACE_Time_Value *max_wait_time)
 {
   TAO_Endpoint *tao_endpoint = desc.endpoint ();
 
@@ -164,7 +163,7 @@ TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
   while (tao_endpoint != 0) {
     TAO_SCIOP_Endpoint *sciop_endpoint = this->remote_endpoint (tao_endpoint);
     if (sciop_endpoint != 0) {
-      transport = make_connection_i (r, desc, timeout, sciop_endpoint);
+      transport = make_connection_i (desc, max_wait_time, sciop_endpoint);
       if (transport) {
         break;
       }
@@ -177,37 +176,26 @@ TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
 
 
 TAO_Transport *
-TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
-                                        TAO_Transport_Descriptor_Interface &desc,
-                                        ACE_Time_Value *timeout,
+TAO_SCIOP_Connector::make_connection_i (TAO_Transport_Descriptor_Interface &desc,
+                                        ACE_Time_Value *max_wait_time,
                                         TAO_SCIOP_Endpoint *sciop_endpoint)
 {
   const ACE_INET_Addr &remote_address =
     sciop_endpoint->object_addr ();
 
-  if (TAO_debug_level > 2)
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
-                  "to <%s:%d> which should %s\n",
-                  ACE_TEXT_CHAR_TO_TCHAR(sciop_endpoint->host()),
-                  sciop_endpoint->port(),
-                  r->blocked () ? ACE_TEXT("block") : ACE_TEXT("nonblock")));
+  if (TAO_debug_level > 2) {
+    ACE_DEBUG ((LM_DEBUG,
+                "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
+                "to <%s:%d>\n",
+                sciop_endpoint->host(), sciop_endpoint->port()));
+  }
 
   // Get the right synch options
   ACE_Synch_Options synch_options;
 
-  this->active_connect_strategy_->synch_options (timeout,
+  this->active_connect_strategy_->synch_options (max_wait_time,
                                                  synch_options);
 
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked ())
-    {
-      synch_options.timeout (ACE_Time_Value::zero);
-      timeout = &tmp_zero;
-    }
-
   TAO_SCIOP_Connection_Handler *svc_handler = 0;
 
   // Connect.
@@ -237,45 +225,93 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
   // another thread pick up the completion and potentially deletes the
   // handler before we get a chance to increment the reference count.
 
-  // Make sure that we always do a remove_reference
-  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
+  // No immediate result.  Wait for completion.
+  if (result == -1 && errno == EWOULDBLOCK)
+    {
+      if (TAO_debug_level > 2)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - SCIOP_Connector::make_connection, "
+                    "going to wait for connection completion on local"
+                    "handle [%d]\n",
+                    svc_handler->get_handle ()));
+
+      // Wait for connection completion.
+      result =
+        this->active_connect_strategy_->wait (svc_handler,
+                                              max_wait_time);
+
+      if (TAO_debug_level > 2)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - SCIOP_Connector::make_connection"
+                      "wait done for handle[%d], result = %d\n",
+                      svc_handler->get_handle (), result));
+        }
 
-  TAO_Transport *transport =
-    svc_handler->transport ();
+      // There are three possibilities when wait() returns: (a)
+      // connection succeeded; (b) connection failed; (c) wait()
+      // failed because of some other error.  It is easy to deal with
+      // (a) and (b).  (c) is tricky since the connection is still
+      // pending and may get completed by some other thread.  The
+      // following code deals with (c).
 
-  if (result == -1)
-    {
-      // No immediate result, wait for completion
-      if (errno == EWOULDBLOCK)
+      // Check if the handler has been closed.
+      int closed =
+        svc_handler->is_closed ();
+
+      // In case of failures and close() has not be called.
+      if (result == -1 &&
+          !closed)
         {
-          // Try to wait until connection completion. Incase we block, then we
-          // get a connected transport or not. In case of non block we get
-          // a connected or not connected transport
-          if (!this->wait_for_connection_completion (r,
-                                                     transport,
-                                                     timeout))
+          // First, cancel from connector.
+          this->base_connector_.cancel (svc_handler);
+
+          // Double check to make sure the handler has not been closed
+          // yet.  This double check is required to ensure that the
+          // connection handler was not closed yet by some other
+          // thread since it was still registered with the connector.
+          // Once connector.cancel() has been processed, we are
+          // assured that the connector will no longer open/close this
+          // handler.
+          closed =
+            svc_handler->is_closed ();
+
+          // If closed, there is nothing to do here.  If not closed,
+          // it was either opened or is still pending.
+          if (!closed)
             {
-              if (TAO_debug_level > 2)
-                ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - SCIOP_Connector::"
-                                      "make_connection_i, "
-                                      "wait for completion failed\n"));
+              // Check if the handler has been opened.
+              int open =
+                svc_handler->is_open ();
+
+              // Some other thread was able to open the handler even
+              // though wait failed for this thread.
+              if (open)
+                // Overwrite <result>.
+                result = 0;
+              else
+                {
+                  // Assert that it is still connecting.
+                  ACE_ASSERT (svc_handler->is_connecting ());
+
+                  // Force close the handler now.
+                  svc_handler->close ();
+                }
             }
-         }
-       else
-         {
-           // Transport is not usable
-           transport = 0;
-         }
+        }
     }
 
-  // In case of errors transport is zero
-  if (transport == 0)
+  // Irrespective of success or failure, remove the extra #REFCOUNT#.
+  svc_handler->remove_reference ();
+
+  // In case of errors.
+  if (result == -1)
     {
       // Give users a clue to the problem.
       if (TAO_debug_level)
         {
           ACE_DEBUG ((LM_ERROR,
-                      "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
+                      "TAO (%P|%t) - SCIOP_Connector::make_connection, "
                       "connection to <%s:%d> failed (%p)\n",
                       sciop_endpoint->host (), sciop_endpoint->port (),
                       "errno"));
@@ -288,12 +324,14 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
   // #REFCOUNT# is one.
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
-                "new %s connection to <%s:%d> on Transport[%d]\n",
-                transport->is_connected() ? "connected" : "not connected",
+                "TAO (%P|%t) - SCIOP_Connector::make_connection, "
+                "new connection to <%s:%d> on Transport[%d]\n",
                 sciop_endpoint->host (), sciop_endpoint->port (),
                 svc_handler->peer ().get_handle ()));
 
+  TAO_Transport *transport =
+    svc_handler->transport ();
+
   // Add the handler to Cache
   int retval =
     this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&desc,
@@ -308,31 +346,28 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
+                      "TAO (%P|%t) - SCIOP_Connector::make_connection, "
                       "could not add the new connection to cache\n"));
         }
 
       return 0;
     }
 
-  if (transport->is_connected () &&
-      transport->wait_strategy ()->register_handler () != 0)
+  // Registration failures.
+  if (retval != 0)
     {
-      // Registration failures.
-
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) transport->purge_entry ();
+      // Purge from the connection cache.
+      transport->purge_entry ();
 
       // Close the handler.
-      (void) transport->close_connection ();
+      svc_handler->close ();
 
       if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - SCIOP_Connector [%d]::make_connection_i, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    transport->id ()));
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "TAO (%P|%t) - SCIOP_Connector::make_connection, "
+                      "could not register the new connection in the reactor\n"));
+        }
 
       return 0;
     }
@@ -483,25 +518,4 @@ TAO_SCIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
   return sciop_endpoint;
 }
 
-int
-TAO_SCIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  TAO_SCIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_SCIOP_Connection_Handler*>(svc_handler);
-
-  if (handler)
-    {
-      // Cancel from the connector
-      this->base_connector_.cancel (handler);
-
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
index f307f27bc00..40f304f6085 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -100,9 +100,6 @@ protected:
   /// initialize <tcp_properties_>.
   int init_tcp_properties (void);
 
-  /// Cancel the passed cvs handler from the connector
-  int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
-
 protected:
 
   /// TCP configuration properties to be used for all
@@ -119,8 +116,7 @@ private:
   TAO_SCIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 
   /// Try to make a connection to the next endpoint in the list.
-  TAO_Transport *make_connection_i (TAO::Profile_Transport_Resolver *r,
-                                    TAO_Transport_Descriptor_Interface &desc,
+  TAO_Transport *make_connection_i (TAO_Transport_Descriptor_Interface &desc,
                                     ACE_Time_Value *timeout,
                                     TAO_SCIOP_Endpoint *sciop_endpoint);
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index cc3a4ae8b9d..298adc9ade2 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -115,11 +115,8 @@ TAO_SHMIOP_Connection_Handler::open (void*)
                   client, this->peer ().get_handle ()));
     }
 
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
+  // Set the id in the transport now that we're active.
+  this->transport ()->id ((size_t) this->get_handle ());
 
   // Not needed, anyway
   this->state_changed (TAO_LF_Event::LFS_SUCCESS);
@@ -142,7 +139,16 @@ TAO_SHMIOP_Connection_Handler::close_connection (void)
 int
 TAO_SHMIOP_Connection_Handler::handle_input (ACE_HANDLE h)
 {
-  return this->handle_input_eh (h, this);
+  int result =
+    this->handle_input_eh (h, this);
+
+  if (result == -1)
+    {
+      this->close_connection ();
+      return 0;
+    }
+
+  return result;
 }
 
 int
@@ -181,7 +187,9 @@ TAO_SHMIOP_Connection_Handler::handle_close (ACE_HANDLE,
 int
 TAO_SHMIOP_Connection_Handler::close (u_long)
 {
-  return this->close_handler ();
+  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
+  this->transport ()->remove_reference ();
+  return 0;
 }
 
 int
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index eb1c042934b..1a674e31b71 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -155,7 +155,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) SHMIOP_Connector::make_connection - ")
+                  ACE_TEXT ("TAO (%P|%t) Connector::connect - ")
                   ACE_TEXT ("looking for SHMIOP connection.\n")));
 
   TAO_SHMIOP_Endpoint *shmiop_endpoint =
@@ -169,7 +169,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
 
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) SHMIOP_Connector::connect ")
+                ACE_TEXT ("(%P|%t) SHMIOP_Connector::connect ")
                 ACE_TEXT ("making a new connection \n")));
 
   // Get the right synch options
@@ -193,8 +193,8 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
   // We always use a blocking connection so the connection is never
   // pending.
 
-  // Make sure that we always do a remove_reference
-  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
+  // Irrespective of success or failure, remove the extra #REFCOUNT#.
+  svc_handler->remove_reference ();
 
   // In case of errors.
   if (result == -1)
@@ -203,8 +203,8 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) SHMIOP_Connector::make_connection, ")
-                      ACE_TEXT ("connection to <%s:%u> failed (%p)\n"),
+                      ACE_TEXT ("(%P|%t) %N:%l, connection to ")
+                      ACE_TEXT ("<%s:%u> failed (%p)\n"),
                       ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
                       shmiop_endpoint->port (),
                       ACE_TEXT ("errno")));
@@ -247,24 +247,26 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       return 0;
     }
 
-  if (transport->is_connected () &&
-      transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
+  // If the wait strategy wants us to be registered with the reactor
+  // then we do so. If registeration is required and it succeeds,
+  // #REFCOUNT# becomes two.
+  retval =  transport->wait_strategy ()->register_handler ();
 
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) transport->purge_entry ();
+  // Registration failures.
+  if (retval != 0)
+    {
+      // Purge from the connection cache.
+      transport->purge_entry ();
 
       // Close the handler.
-      (void) transport->close_connection ();
+      svc_handler->close ();
 
       if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - SHMIOP_Connector [%d]::make_connection, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    transport->id ()));
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
+                      "could not register the new connection in the reactor\n"));
+        }
 
       return 0;
     }
@@ -360,25 +362,4 @@ TAO_SHMIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
   return shmiop_endpoint;
 }
 
-int
-TAO_SHMIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  TAO_SHMIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_SHMIOP_Connection_Handler*>(svc_handler);
-
-  if (handler)
-    {
-      // Cancel from the connector
-      this->base_connector_.cancel (handler);
-
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
index d4b41468c55..fd29eca271d 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -102,9 +102,6 @@ protected:
                                   ACE_Time_Value *timeout = 0);
 
   virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Cancel the passed cvs handler from the connector
-  int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
   //@}
 
 private:
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index f3ad70d0fcd..7aa645abde1 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -97,11 +97,8 @@ TAO_UIOP_Connection_Handler::open (void*)
                 ACE_TEXT ("<%s> on %d\n"),
                 addr.get_path_name (), this->peer ().get_handle ()));
 
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
+  // Set the id in the transport now that we're active.
+  this->transport ()->id ((size_t) this->get_handle ());
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS);
 
@@ -123,7 +120,16 @@ TAO_UIOP_Connection_Handler::close_connection (void)
 int
 TAO_UIOP_Connection_Handler::handle_input (ACE_HANDLE h)
 {
-  return this->handle_input_eh (h, this);
+  const int result =
+    this->handle_input_eh (h, this);
+
+  if (result == -1)
+    {
+      this->close_connection ();
+      return 0;
+    }
+
+  return result;
 }
 
 int
@@ -162,7 +168,9 @@ TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE,
 int
 TAO_UIOP_Connection_Handler::close (u_long)
 {
-  return this->close_handler ();
+  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
+  this->transport ()->remove_reference ();
+  return 0;
 }
 
 int
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 9d1b9692ad9..d87dd885654 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -11,7 +11,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Connect_Strategy.h"
-#include "tao/Profile_Transport_Resolver.h"
 
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
@@ -138,13 +137,13 @@ TAO_UIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 }
 
 TAO_Transport *
-TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
+TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
                                      TAO_Transport_Descriptor_Interface &desc,
                                      ACE_Time_Value *max_wait_time)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) UIUP_Connector::make_connection, ")
+                ACE_TEXT ("TAO (%P|%t) Connector::connect - ")
                 ACE_TEXT ("looking for UIOP connection.\n")));
 
   TAO_UIOP_Endpoint *uiop_endpoint =
@@ -158,7 +157,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
 
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) UIUP_Connector::make_connection, ")
+                ACE_TEXT ("(%P|%t) UIOP_Connector::connect ")
                 ACE_TEXT ("making a new connection \n")));
 
   // Get the right synch options
@@ -167,15 +166,6 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
   this->active_connect_strategy_->synch_options (max_wait_time,
                                                  synch_options);
 
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked ())
-    {
-      synch_options.timeout (ACE_Time_Value::zero);
-      max_wait_time = &tmp_zero;
-    }
-
   TAO_UIOP_Connection_Handler *svc_handler = 0;
 
   // Connect.
@@ -201,61 +191,103 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
   // another thread pick up the completion and potentially deletes the
   // handler before we get a chance to increment the reference count.
 
-  // Make sure that we always do a remove_reference
-  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
-
-  TAO_Transport *transport =
-    svc_handler->transport ();
-
-  if (result == -1)
+  // No immediate result.  Wait for completion.
+  if (result == -1 && errno == EWOULDBLOCK)
     {
-      // No immediate result, wait for completion
-      if (errno == EWOULDBLOCK)
+      if (TAO_debug_level > 2)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - UIOP_Connector::make_connection, "
+                    "going to wait for connection completion on local"
+                    "handle [%d]\n",
+                    svc_handler->get_handle ()));
+
+      result =
+        this->active_connect_strategy_->wait (svc_handler,
+                                              max_wait_time);
+
+      if (TAO_debug_level > 2)
         {
-          // Try to wait until connection completion. Incase we block, then we
-          // get a connected transport or not. In case of non block we get
-          // a connected or not connected transport
-          if (!this->wait_for_connection_completion (r,
-                                                     transport,
-                                                     max_wait_time))
-            {
-              if (TAO_debug_level > 2)
-                ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - UIOP_Connector::"
-                                      "make_connection, "
-                                      "wait for completion failed\n"));
-            }
-        }
-      else
-        {
-          // Transport is not usable
-          transport = 0;
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - UIOP_Connector::make_connection"
+                      "wait done for handle[%d], result = %d\n",
+                      svc_handler->get_handle (),
+                      result));
         }
+
+       // There are three possibilities when wait() returns: (a)
+       // connection succeeded; (b) connection failed; (c) wait()
+       // failed because of some other error.  It is easy to deal with
+       // (a) and (b).  (c) is tricky since the connection is still
+       // pending and may get completed by some other thread.  The
+       // following code deals with (c).
+
+       // Check if the handler has been closed.
+       int closed = svc_handler->is_closed ();
+
+       // In case of failures and close() has not be called.
+       if (result == -1 && !closed)
+         {
+           // First, cancel from connector.
+           this->base_connector_.cancel (svc_handler);
+
+           // Double check to make sure the handler has not been
+           // closed yet.  This double check is required to ensure
+           // that the connection handler was not closed yet by some
+           // other thread since it was still registered with the
+           // connector.  Once connector.cancel() has been processed,
+           // we are assured that the connector will no longer
+           // open/close this handler.
+           closed = svc_handler->is_closed ();
+
+           // If closed, there is nothing to do here.  If not closed,
+           // it was either opened or is still pending.
+           if (!closed)
+             {
+               // Check if the handler has been opened.
+               const int open =
+                 svc_handler->is_open ();
+
+               // Some other thread was able to open the handler even
+               // though wait failed for this thread.
+               if (open)
+                 // Overwrite <result>.
+                 result = 0;
+               else
+                 {
+                   // Assert that it is still connecting.
+                   ACE_ASSERT (svc_handler->is_connecting ());
+
+                   // Force close the handler now.
+                   svc_handler->close ();
+                 }
+             }
+         }
     }
 
-  // In case of errors transport is zero
-  if (transport == 0)
+  // Irrespective of success or failure, remove the extra #REFCOUNT#.
+  svc_handler->remove_reference ();
+
+  // In case of errors.
+  if (result == -1)
     {
       // Give users a clue to the problem.
-      if (TAO_debug_level > 3)
+      if (TAO_debug_level)
+        {
           ACE_DEBUG ((LM_ERROR,
-                      "TAO (%P|%t) - UIOP_Connector::make_connection, "
-                      "connection to <%s> failed (%p)\n",
+                      ACE_TEXT ("(%P|%t) %N:%l, connection to ")
+                      ACE_TEXT ("%s failed (%p)\n"),
                       uiop_endpoint->rendezvous_point (),
-                      ACE_TEXT("errno")));
+                      ACE_TEXT ("errno")));
+        }
 
       return 0;
     }
 
+  // At this point, the connection has be successfully connected.
+  // #REFCOUNT# is one.
 
-  // At this point, the connection has be successfully created
-  // connected or not connected, but we have a connection.
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - UIOP_Connector::make_connection, "
-                "new %s connection to <%s> on Transport[%d]\n",
-                transport->is_connected() ? "connected" : "not connected",
-                uiop_endpoint->rendezvous_point (),
-                svc_handler->peer ().get_handle ()));
+  TAO_Transport *transport =
+    svc_handler->transport ();
 
   // Add the handler to Cache
   int retval =
@@ -270,31 +302,33 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) UIOP_Connector::make_connection, ")
+                      ACE_TEXT ("(%P|%t) UIOP_Connector::connect ")
                       ACE_TEXT ("could not add the new connection to Cache \n")));
         }
 
       return 0;
     }
 
-  if (transport->is_connected () &&
-      transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
+  // If the wait strategy wants us to be registered with the reactor
+  // then we do so. If registeration is required and it succeeds,
+  // #REFCOUNT# becomes two.
+  retval = transport->wait_strategy ()->register_handler ();
 
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) transport->purge_entry ();
+  // Registration failures.
+  if (retval != 0)
+    {
+      // Purge from the connection cache.
+      transport->purge_entry ();
 
       // Close the handler.
-      (void) transport->close_connection ();
+      svc_handler->close ();
 
       if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - UIOP_Connector [%d]::make_connection, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    transport->id ()));
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "TAO (%P|%t) - UIOP_Connector::make_connection, "
+                      "could not register the new connection in the reactor\n"));
+        }
 
       return 0;
     }
@@ -435,24 +469,4 @@ TAO_UIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
   return uiop_endpoint;
 }
 
-int
-TAO_UIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  TAO_UIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_UIOP_Connection_Handler*>(svc_handler);
-
-  if (handler)
-    {
-      // Cancel from the connector
-      this->base_connector_.cancel (handler);
-
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
 #endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index ba23060bd9d..d3297c8b3a8 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -73,9 +73,6 @@ public:
   virtual int check_prefix (const char *endpoint);
 
   virtual char object_key_delimiter (void) const;
-
-  /// Cancel the passed cvs handler from the connector
-  virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
   //@}
 
 public:
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index eedc383446b..39c2430adce 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -15,7 +15,6 @@
 #include "Sync_Strategies.h"
 #include "debug.h"
 #include "Policy_Manager.h"
-#include "SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Stub.i"
@@ -168,6 +167,7 @@ int
 TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
                            CORBA::ULong &index
                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We are creating the IOR info. Let us not be disturbed. So grab a
   // lock.
@@ -259,6 +259,7 @@ int
 TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
                                 IOP::IOR *&ior_info
                                 ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 45fb155b548..289e3c84751 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -47,11 +47,6 @@ namespace TAO
   class ObjectKey;
 }
 
-namespace IOP
-{
-  struct IOR;
-}
-
 /**
  * @class TAO_Stub
  *
@@ -270,7 +265,8 @@ public:
    */
   int create_ior_info (IOP::IOR *&ior_info,
                        CORBA::ULong &index
-                       ACE_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a reference to the reference count lock.
   /**
@@ -330,7 +326,8 @@ private:
   /// THREAD-SAFE Create the IOR info
   int get_profile_ior_info (TAO_MProfile &profile,
                             IOP::IOR *&ior_info
-                            ACE_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index b6e08c6d4eb..ad0a2947525 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -8,6 +8,7 @@
 #include "Stub.h"
 #include "Bind_Dispatcher_Guard.h"
 #include "operation_details.h"
+#include "Pluggable_Messaging.h"
 #include "Wait_Strategy.h"
 #include "debug.h"
 #include "ORB_Constants.h"
@@ -52,31 +53,12 @@ namespace TAO
     TAO_Synch_Reply_Dispatcher rd (this->resolver_.stub ()->orb_core (),
                                    this->details_.reply_service_info ());
 
-    TAO_Target_Specification tspec;
-    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    TAO_OutputCDR &cdr =
-      this->resolver_.transport ()->out_stream ();
-
-    Invocation_Status s = TAO_INVOKE_FAILURE;
-
-    this->write_header (tspec,
-                        cdr
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (s);
-
-    this->marshal_data (cdr
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (s);
-
-
     // Register a reply dispatcher for this invocation. Use the
     // preallocated reply dispatcher.
     TAO_Bind_Dispatcher_Guard dispatch_guard (
-         this->details_.request_id (),
-         &rd,
-         this->resolver_.transport ()->tms ());
+        this->details_.request_id (),
+        &rd,
+        this->resolver_.transport ()->tms ());
 
     if (dispatch_guard.status () != 0)
       {
@@ -84,13 +66,16 @@ namespace TAO
         // we close the connection?
         this->resolver_.transport ()->close_connection ();
 
-        ACE_THROW_RETURN (
-            CORBA::INTERNAL (
-                0,
-                CORBA::COMPLETED_NO),
-            s);
+        ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
+                                           CORBA::COMPLETED_NO),
+                          TAO_INVOKE_FAILURE);
       }
 
+    TAO_Target_Specification tspec;
+    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+
+    Invocation_Status s = TAO_INVOKE_FAILURE;
 
 #if TAO_HAS_INTERCEPTORS == 1
     // Start the interception point here..
@@ -102,13 +87,26 @@ namespace TAO
       return s;
 #endif /*TAO_HAS_INTERCEPTORS */
 
-    countdown.update ();
+    TAO_OutputCDR &cdr =
+      this->resolver_.transport ()->messaging_object ()->out_stream ();
 
     // We have started the interception flow. We need to call the
     // ending interception flow if things go wrong. The purpose of the
     // try block is to do just this.
     ACE_TRY
       {
+        this->write_header (tspec,
+                            cdr
+                            ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        this->marshal_data (cdr
+                            ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+
+        countdown.update ();
+
         s = this->send_message (cdr,
                                 TAO_Transport::TAO_TWOWAY_REQUEST,
                                 max_wait_time
@@ -293,7 +291,7 @@ namespace TAO
         if (TAO_debug_level > 3)
           {
             ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - Synch_Twoway_Invocation::wait_for_reply, "
+                        "TAO (%P|%t) - Synch_Twoway_Invocation::wait_for_reply , "
                         "recovering after an error \n"));
           }
 
@@ -408,7 +406,7 @@ namespace TAO
             {
               // Could not demarshal the addressing disposition, raise an local
               // CORBA::MARSHAL
-            ACE_THROW_RETURN (CORBA::MARSHAL (0,
+            ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                               CORBA::COMPLETED_MAYBE),
                               TAO_INVOKE_FAILURE);
             }
@@ -482,7 +480,7 @@ namespace TAO
       {
         // Could not demarshal the exception id, raise an local
         // CORBA::MARSHAL
-        ACE_THROW_RETURN (CORBA::MARSHAL (0,
+        ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                           CORBA::COMPLETED_MAYBE),
                           TAO_INVOKE_FAILURE);
       }
@@ -541,7 +539,7 @@ namespace TAO
       {
         // Could not demarshal the exception id, raise an local
         // CORBA::MARSHAL
-        ACE_THROW_RETURN (CORBA::MARSHAL (0,
+        ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                           CORBA::COMPLETED_MAYBE),
                           TAO_INVOKE_FAILURE);
       }
@@ -552,7 +550,7 @@ namespace TAO
     if ((cdr >> minor) == 0
         || (cdr >> completion) == 0)
       {
-        ACE_THROW_RETURN (CORBA::MARSHAL (0,
+        ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                           CORBA::COMPLETED_MAYBE),
                           TAO_INVOKE_FAILURE);
       }
@@ -631,7 +629,7 @@ namespace TAO
     if (TAO_debug_level > 4)
       ACE_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - Synch_Twoway_Invocation::"
-                  "handle_system_exception, about to raise\n"));
+                  "handle_system_exception  about to raise\n"));
 
     mon.set_status (TAO_INVOKE_SYSTEM_EXCEPTION);
 
@@ -661,22 +659,17 @@ namespace TAO
     const CORBA::Octet response_flags =
        this->details_.response_flags ();
 
-    Invocation_Status s = TAO_INVOKE_FAILURE;
-
     if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER) ||
         response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
-      {
-        s = Synch_Twoway_Invocation::remote_twoway (max_wait_time
-                                                    ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-        return s;
-      }
+      return Synch_Twoway_Invocation::remote_twoway (max_wait_time
+                                                     ACE_ENV_ARG_PARAMETER);
 
     TAO_Target_Specification tspec;
     this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
+    Invocation_Status s = TAO_INVOKE_FAILURE;
+
 #if TAO_HAS_INTERCEPTORS == 1
     s = this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
@@ -685,11 +678,8 @@ namespace TAO
       return s;
 #endif /*TAO_HAS_INTERCEPTORS */
 
-    TAO_Transport* transport =
-      this->resolver_.transport ();
-
     TAO_OutputCDR &cdr =
-      transport->out_stream ();
+      this->resolver_.transport ()->messaging_object ()->out_stream ();
 
     ACE_TRY
       {
@@ -704,24 +694,21 @@ namespace TAO
 
         countdown.update ();
 
-        if (transport->is_connected())
+        if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT))
           {
-            // We have a connected transport so we can send the message
             s = this->send_message (cdr,
-                                    TAO_Transport::TAO_ONEWAY_REQUEST,
+                                    TAO_Transport::TAO_TWOWAY_REQUEST,
                                     max_wait_time
                                     ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         else
           {
-            if (TAO_debug_level > 4)
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Synch_Oneway_Invocation::"
-                          "remote_oneway, queueing message\n"));
-
-            if (transport->format_queue_message (cdr) != 0)
-              s = TAO_INVOKE_FAILURE;
+            s = this->send_message (cdr,
+                                    TAO_Transport::TAO_ONEWAY_REQUEST,
+                                    max_wait_time
+                                    ACE_ENV_ARG_PARAMETER);
+            ACE_TRY_CHECK;
           }
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index 4f47a01e192..6e73aed1f36 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 
 class TAO_Operation_Details;
 class TAO_Synch_Reply_Dispatcher;
@@ -28,6 +28,11 @@ class TAO_InputCDR;
 class ACE_Time_Value;
 class TAO_Bind_Dispatcher_Guard;
 
+namespace CORBA
+{
+  class SystemException;
+}
+
 namespace TAO
 {
   class Profile_Transport_Resolver;
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 317c0fafc71..7dc1757e108 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -51,10 +51,10 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 TAO::BufferingConstraint::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -71,7 +71,7 @@ TAO::BufferingConstraint::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 TAO::BufferingConstraintPolicy_ptr
-TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::duplicate (
+TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_duplicate (
     TAO::BufferingConstraintPolicy_ptr p
   )
 {
@@ -80,7 +80,7 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::release (
+TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_release (
     TAO::BufferingConstraintPolicy_ptr p
   )
 {
@@ -89,14 +89,14 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 TAO::BufferingConstraintPolicy_ptr
-TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::nil (void)
+TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_nil (void)
 {
   return TAO::BufferingConstraintPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::marshal (
+TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_marshal (
     TAO::BufferingConstraintPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -105,7 +105,7 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*TAO__TAO_BufferingConstraintPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -116,7 +116,7 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
 TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 {}
 
-void
+void 
 TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   BufferingConstraintPolicy *_tao_tmp_pointer =
@@ -134,10 +134,10 @@ TAO::BufferingConstraintPolicy::_narrow (
     {
       return BufferingConstraintPolicy::_nil ();
     }
-
+  
   BufferingConstraintPolicy_ptr proxy =
     dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref);
-
+  
   return BufferingConstraintPolicy::_duplicate (proxy);
 }
 
@@ -151,10 +151,10 @@ TAO::BufferingConstraintPolicy::_unchecked_narrow (
     {
       return BufferingConstraintPolicy::_nil ();
     }
-
+  
   BufferingConstraintPolicy_ptr proxy =
     dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref);
-
+  
   return BufferingConstraintPolicy::_duplicate (proxy);
 }
 
@@ -165,7 +165,7 @@ TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -264,7 +264,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         TAO::BufferingConstraintPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         TAO::BufferingConstraintPolicy
@@ -291,10 +291,11 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         TAO::BufferingConstraintPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         TAO::BufferingConstraintPolicy
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 8b6258bfd93..392e48e7301 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -71,13 +71,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -87,92 +87,92 @@ namespace TAO
 
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::UShort BufferingConstraintMode;
   typedef CORBA::UShort_out BufferingConstraintMode_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct BufferingConstraint;
-
+  
   typedef
     TAO_Fixed_Var_T<
         BufferingConstraint
       >
     BufferingConstraint_var;
-
+  
   typedef
     BufferingConstraint &
     BufferingConstraint_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_Export BufferingConstraint
   {
     typedef BufferingConstraint_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO::BufferingConstraintMode mode;
     TimeBase::TimeT timeout;
     CORBA::ULong message_count;
     CORBA::ULong message_bytes;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_
-
+  
   class BufferingConstraintPolicy;
   typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         BufferingConstraintPolicy
       >
     BufferingConstraintPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         BufferingConstraintPolicy
@@ -180,109 +180,109 @@ namespace TAO
     BufferingConstraintPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_
-
+  
   class TAO_Export BufferingConstraintPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef BufferingConstraintPolicy_ptr _ptr_type;
     typedef BufferingConstraintPolicy_var _var_type;
-
+    
     // The static operations.
     static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
-
+    
     static BufferingConstraintPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BufferingConstraintPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BufferingConstraintPolicy_ptr _nil (void)
     {
       return (BufferingConstraintPolicy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::TAO::BufferingConstraint buffering_constraint (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     BufferingConstraintPolicy (void);
-
+    
     virtual ~BufferingConstraintPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     BufferingConstraintPolicy (const BufferingConstraintPolicy &);
-
+    
     void operator= (const BufferingConstraintPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
 
 // TAO_IDL - Generated from
@@ -299,18 +299,18 @@ namespace TAO
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<TAO::BufferingConstraintPolicy>
   {
-    static TAO::BufferingConstraintPolicy_ptr duplicate (
+    static TAO::BufferingConstraintPolicy_ptr tao_duplicate (
         TAO::BufferingConstraintPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         TAO::BufferingConstraintPolicy_ptr
       );
-    static TAO::BufferingConstraintPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static TAO::BufferingConstraintPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         TAO::BufferingConstraintPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -358,3 +358,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 879a332ccfc..a9820608a3b 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -8,7 +8,6 @@
 #include "GIOP_Utils.h"
 #include "Transport.h"
 #include "CDR.h"
-#include "SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "TAO_Server_Request.i"
@@ -175,9 +174,8 @@ TAO_ServerRequest::init_reply (void)
       if ((*this->outgoing_ << object_ptr) == 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::init_reply, ")
                       ACE_TEXT ("TAO_GIOP_ServerRequest::marshal - ")
-                      ACE_TEXT ("marshal encoding forwarded objref failed\n")));
+                      ACE_TEXT ("encoding forwarded objref failed\n")));
         }
     }
   this->transport_->assign_translators (0,this->outgoing_);
@@ -221,8 +219,8 @@ TAO_ServerRequest::send_no_exception_reply (void)
           // is required.
           ACE_ERROR ((
                       LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_no_exception_reply, ")
-                      ACE_TEXT ("cannot send NO_EXCEPTION reply\n")
+                      ACE_TEXT ("TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n"),
+                      ACE_TEXT ("TAO_GIOP_ServerRequest::send_no_exception_reply")
                       ));
         }
     }
@@ -241,8 +239,9 @@ TAO_ServerRequest::tao_send_reply (void)
           // No exception but some kind of error, yet a response
           // is required.
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply, ")
-                      ACE_TEXT ("cannot send reply\n")));
+                      ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"),
+                      ACE_TEXT ("TAO_ServerRequest::tao_send_reply")));
+
         }
     }
 }
@@ -301,7 +300,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
                                                       ex) == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ")
+                      ACE_TEXT ("TAO: (%P|%t|%N|%l): ")
                       ACE_TEXT ("could not make exception reply\n")));
 
         }
@@ -312,7 +311,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
                                           TAO_Transport::TAO_REPLY) == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ")
+                      ACE_TEXT ("TAO: (%P|%t|%N|%l):  ")
                       ACE_TEXT ("could not send exception reply\n")));
         }
     }
@@ -325,8 +324,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
       // down, since it really isn't the client's fault.
 
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ")
-                  ACE_TEXT ("exception thrown ")
+                  ACE_TEXT ("(%P|%t) exception thrown ")
                   ACE_TEXT ("but client is not waiting a response\n")));
     }
 }
@@ -378,7 +376,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
                                                reply_params) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ")
+                  ACE_TEXT ("TAO: (%P|%t|%N|%l): ")
                   ACE_TEXT ("could not make cached reply\n")));
 
     }
@@ -390,7 +388,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
 
   if (!this->outgoing_->good_bit ())
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ")
+                ACE_TEXT ("TAO: (%P|%t|%N|%l):  ")
                 ACE_TEXT ("could not marshal reply\n")));
 
   // Send the message
@@ -399,7 +397,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
                                       TAO_Transport::TAO_REPLY) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ")
+                  ACE_TEXT ("TAO: (%P|%t|%N|%l):  ")
                   ACE_TEXT ("could not send cached reply\n")));
     }
 }
diff --git a/TAO/tao/TC_Constants_Forward.h b/TAO/tao/TC_Constants_Forward.h
index bb23cb8331a..a3c14d685dd 100644
--- a/TAO/tao/TC_Constants_Forward.h
+++ b/TAO/tao/TC_Constants_Forward.h
@@ -17,8 +17,6 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
-
 namespace CORBA
 {
   /**
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index 1ca22a258e7..ed85271751c 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -12,7 +12,6 @@ ACE_RCSID (tao,
 #include "tao/Connection_Handler.h"
 #include "tao/Transport.h"
 #include "tao/Connector_Registry.h"
-#include "tao/SystemException.h"
 
 #include "ace/Reactor.h"
 
diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp
index 6cd522c8298..f51f17c51e8 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.cpp
+++ b/TAO/tao/Thread_Per_Connection_Handler.cpp
@@ -40,7 +40,7 @@ TAO_Thread_Per_Connection_Handler::activate (long flags,
   if (TAO_debug_level)
     {
       ACE_DEBUG  ((LM_DEBUG,
-                   ACE_TEXT ("TAO (%P|%t) - Thread_Per_Connection_Handler::")
+                   ACE_TEXT ("TAO (%P|%t) - IIOP_Connection_Handler::")
                    ACE_TEXT ("activate %d threads, flags = %d\n"),
                    n_threads,
                    flags));
@@ -61,8 +61,9 @@ TAO_Thread_Per_Connection_Handler::activate (long flags,
 int
 TAO_Thread_Per_Connection_Handler::svc (void)
 {
-  ACE::clr_flags (this->ch_->transport ()->event_handler_i ()->get_handle (),
-                  ACE_NONBLOCK);
+  ACE_Flag_Manip::clr_flags (
+      this->ch_->transport ()->event_handler_i ()->get_handle (),
+      ACE_NONBLOCK);
 
   // Call the implementation here
   return this->ch_->svc_i ();
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index df1e0ffcfe9..ba4c262a11f 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -111,7 +111,6 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   , orb_core_ (orb_core)
   , cache_map_entry_ (0)
   , bidirectional_flag_ (-1)
-  , opening_connection_role_ (TAO::TAO_UNSPECIFIED_ROLE)
   , head_ (0)
   , tail_ (0)
   , incoming_message_queue_ (orb_core)
@@ -123,7 +122,6 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   , purging_order_ (0)
   , recv_buffer_size_ (0)
   , sent_byte_count_ (0)
-  , is_connected_ (false)
   , char_translator_ (0)
   , wchar_translator_ (0)
   , tcs_set_ (0)
@@ -147,18 +145,8 @@ TAO_Transport::~TAO_Transport (void)
 
   delete this->handler_lock_;
 
-  if (!this->is_connected_)
-    {
-      // When we have a not connected transport we could have buffered
-      // messages on this transport which we have to cleanup now.
-      this->cleanup_queue_i();
-
-      // Cleanup our cache entry
-      this->purge_entry();
-    }
-
-  // By the time the destructor is reached here all the connection stuff
-  // *must* have been cleaned up.
+  // By the time the destructor is reached all the connection stuff
+  // *must* have been cleaned up
   ACE_ASSERT (this->head_ == 0);
   ACE_ASSERT (this->cache_map_entry_ == 0);
 }
@@ -206,13 +194,6 @@ TAO_Transport::register_handler (void)
 
   ACE_Reactor *r = this->orb_core_->reactor ();
 
-  // @@note: This should be okay since the register handler call will
-  // not make a nested call into the transport.
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->handler_lock_,
-                    false);
-
   if (r == this->event_handler_i ()->reactor ())
     {
       return 0;
@@ -288,22 +269,21 @@ TAO_Transport::generate_request_header (
 }
 
 /// @todo Ideally the following should be inline.
-/// @todo purge_entry has a return value, use it
 int
 TAO_Transport::recache_transport (TAO_Transport_Descriptor_Interface *desc)
 {
   // First purge our entry
-  this->purge_entry ();
+  this->transport_cache_manager ().purge_entry (this->cache_map_entry_);
 
   // Then add ourselves to the cache
   return this->transport_cache_manager ().cache_transport (desc,
                                                            this);
 }
 
-int
+void
 TAO_Transport::purge_entry (void)
 {
-  return this->transport_cache_manager ().purge_entry (this->cache_map_entry_);
+  this->transport_cache_manager ().purge_entry (this->cache_map_entry_);
 }
 
 int
@@ -359,15 +339,6 @@ TAO_Transport::handle_output (void)
 }
 
 int
-TAO_Transport::format_queue_message (TAO_OutputCDR &stream)
-{
-  if (this->messaging_object ()->format_message (stream) != 0)
-    return -1;
-
-  return this->queue_message_i (stream.begin());
-}
-
-int
 TAO_Transport::send_message_block_chain (const ACE_Message_Block *mb,
                                          size_t &bytes_transferred,
                                          ACE_Time_Value *max_wait_time)
@@ -874,32 +845,6 @@ TAO_Transport::drain_queue_i (void)
 }
 
 void
-TAO_Transport::cleanup_queue_i ()
-{
-  if (TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::cleanup_queue_i, "
-                  "cleaning up complete queue\n",
-                  this->id ()));
-    }
-
-  // Cleanup all messages
-  while (this->head_ != 0)
-    {
-      TAO_Queued_Message *i = this->head_;
-
-       // @@ This is a good point to insert a flag to indicate that a
-       //    CloseConnection message was successfully received.
-      i->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
-
-      i->remove_from_list (this->head_, this->tail_);
-
-      i->destroy ();
-   }
-}
-
-void
 TAO_Transport::cleanup_queue (size_t byte_count)
 {
   while (this->head_ != 0 && byte_count > 0)
@@ -1012,7 +957,18 @@ TAO_Transport::send_connection_closed_notifications (void)
 void
 TAO_Transport::send_connection_closed_notifications_i (void)
 {
-  this->cleanup_queue_i ();
+  while (this->head_ != 0)
+    {
+      TAO_Queued_Message *i = this->head_;
+
+      // @@ This is a good point to insert a flag to indicate that a
+      //    CloseConnection message was successfully received.
+      i->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
+
+      i->remove_from_list (this->head_, this->tail_);
+
+      i->destroy ();
+    }
 
   this->messaging_object ()->reset ();
 }
@@ -1023,9 +979,6 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
                                       const ACE_Message_Block *message_block,
                                       ACE_Time_Value *max_wait_time)
 {
-
-// @todo Bala mentioned that this has to go out here
-// {
   if (message_semantics == TAO_Transport::TAO_TWOWAY_REQUEST)
     {
       return this->send_synchronous_message_i (message_block,
@@ -1036,7 +989,6 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
       return this->send_reply_message_i (message_block,
                                          max_wait_time);
     }
- // }
 
   // Let's figure out if the message should be queued without trying
   // to send first:
@@ -1091,7 +1043,7 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
             {
               if (TAO_debug_level > 0)
                 {
-                  ACE_ERROR ((LM_ERROR,
+                  ACE_DEBUG ((LM_DEBUG,
                               "TAO (%P|%t) - Transport[%d]::send_message_shared_i, "
                               "fatal error in "
                               "send_message_block_chain_i - %m\n",
@@ -1143,15 +1095,13 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
                   this->id ()));
     }
 
-  if (this->queue_message_i(message_block) == -1)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - Transport[%d]::send_message_shared_i, "
-                "cannot queue message for "
-                " - %m\n",
-                this->id ()));
-    return -1;
-  }
+  TAO_Queued_Message *queued_message = 0;
+  ACE_NEW_RETURN (queued_message,
+                  TAO_Asynch_Queued_Message (message_block,
+                                             0,
+                                             1),
+                  -1);
+  queued_message->push_back (this->head_, this->tail_);
 
   // ... if the queue is full we need to activate the output on the
   // queue ...
@@ -1181,20 +1131,6 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
   return 0;
 }
 
-int
-TAO_Transport::queue_message_i(const ACE_Message_Block *message_block)
-{
-  TAO_Queued_Message *queued_message = 0;
-  ACE_NEW_RETURN (queued_message,
-                  TAO_Asynch_Queued_Message (message_block,
-                                             0,
-                                             1),
-                  -1);
-  queued_message->push_back (this->head_, this->tail_);
-
-  return 0;
-}
-
 /*
  *
  * All the methods relevant to the incoming data path of the ORB are
@@ -2121,64 +2057,6 @@ TAO_Transport::remove_reference (void)
   return this->event_handler_i ()->remove_reference ();
 }
 
-TAO_OutputCDR &
-TAO_Transport::out_stream (void)
-{
-  return this->messaging_object ()->out_stream ();
-}
-
-bool
-TAO_Transport::post_open (size_t id)
-{
-  this->id_ = id;
-
-  {
-    ACE_GUARD_RETURN (ACE_Lock,
-                      ace_mon,
-                      *this->handler_lock_,
-                      false);
-
-    this->is_connected_ = true;
-  }
-
-  // When we have data in our outgoing queue schedule ourselves
-  // for output
-  if (this->queue_is_empty_i ())
-    return true;
-
-  // If the wait strategy wants us to be registered with the reactor
-  // then we do so. If registeration is required and it succeeds,
-  // #REFCOUNT# becomes two.
-  if (this->wait_strategy ()->register_handler () == 0)
-    {
-      TAO_Flushing_Strategy *flushing_strategy =
-        this->orb_core ()->flushing_strategy ();
-      (void) flushing_strategy->schedule_output (this);
-    }
-  else
-    {
-      // Registration failures.
-
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) this->purge_entry ();
-
-      // Close the handler.
-      (void) this->close_connection ();
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - Transport[%d]::post_connect , "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    this->id ()));
-
-      return false;
-    }
-
-  return true;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Reverse_Lock<ACE_Lock>;
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index e02f53e25ea..b15c8bf9340 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -43,20 +43,6 @@ class TAO_Resume_Handle;
 class TAO_Stub;
 struct iovec;
 
-namespace TAO
-{
-  /**
-   * @NOTE: Should this be in TAO namespace. Seems like a candidate
-   * that should be in the transport
-   */
-  enum Connection_Role
-    {
-      TAO_UNSPECIFIED_ROLE = 0,
-      TAO_SERVER_ROLE = 1,
-      TAO_CLIENT_ROLE = 2
-    };
-}
-
 /**
  * @class TAO_Transport
  *
@@ -219,7 +205,7 @@ namespace TAO
  *
  * <B>See Also:</B>
  *
- * http://cvs.doc.wustl.edu/ace-latest.cgi/ACE_wrappers/TAO/docs/pluggable_protocols/index.html
+ * http://deuce.doc.wustl.edu/cvsweb/ace-latest.cgi/ACE_wrappers/TAO/docs/pluggable_protocols/index.html
  *
  */
 class TAO_Export TAO_Transport
@@ -291,23 +277,6 @@ public:
   size_t id (void) const;
   void id (size_t id);
 
-  /**
-   * Methods dealing with the role of the connection, e.g., CLIENT or SERVER.
-   * See CORBA 2.6 Specification, Section 15.5.1 for origin of definitions.
-   */
-  TAO::Connection_Role opened_as (void) const;
-  void opened_as (TAO::Connection_Role);
-
-  /**
-   * Predicate that returns true if it is valid for this transport to act in a server
-   * role.  This would, for example, be true if opened_as() == TAO_SERVER_ROLE
-   * or bidirectional_flag() == 1.
-   *
-   * \return 0 cannot act in server role
-   * \return 1 can acts in server role
-   */
-  bool acts_as_server (void) const;
-
   /// Get and Set the purging order. The purging strategy uses the set
   /// version to set the purging order.
   unsigned long purging_order (void) const;
@@ -328,6 +297,13 @@ public:
    */
   void provide_handler (TAO_Connection_Handler_Set &handlers);
 
+
+  /// Remove all messages from the outgoing queue.
+  /**
+   * @todo shouldn't this be automated?
+   */
+  // void dequeue_all (void);
+
   /// Register the handler with the reactor.
   /**
    * Register the handler with the reactor. This method is used by the
@@ -472,23 +448,9 @@ public:
    * adapter class (TAO_Transport_Event_Handler or something), this
    * will reduce footprint and simplify the process of implementing a
    * pluggable protocol.
-   *
-   * @todo This method has to be renamed to event_handler()
    */
   virtual ACE_Event_Handler * event_handler_i (void) = 0;
 
-  /// Is this transport really connected
-  bool is_connected (void) const;
-
-  /// Perform all the actions when this transport get opened
-  bool post_open (size_t id);
-
-  /// Get the connection handler for this transport
-  TAO_Connection_Handler * connection_handler (void);
-
-  /// Accessor for the output CDR stream
-  TAO_OutputCDR &out_stream (void);
-
 protected:
 
   virtual TAO_Connection_Handler * connection_handler_i (void) = 0;
@@ -672,12 +634,7 @@ protected:
                              const ACE_Message_Block *message_block,
                              ACE_Time_Value *max_wait_time);
 
-  /// Queue a message for @a message_block
-  int queue_message_i (const ACE_Message_Block *message_block);
-
 public:
-  /// Format and queue a message for @a stream
-  int format_queue_message (TAO_OutputCDR &stream);
 
   /// Send a message block chain,
   int send_message_block_chain (const ACE_Message_Block *message_block,
@@ -689,7 +646,7 @@ public:
                                   size_t &bytes_transferred,
                                   ACE_Time_Value *max_wait_time);
   /// Cache management
-  int purge_entry (void);
+  void purge_entry (void);
 
   /// Cache management
   int make_idle (void);
@@ -809,8 +766,8 @@ private:
    */
   void cleanup_queue (size_t byte_count);
 
-  /// Cleanup the complete queue
-  void cleanup_queue_i ();
+  /// Copy the contents of a message block into a Queued_Message
+  /// TAO_Queued_Message *copy_message_block (const ACE_Message_Block *mb);
 
   /// Check if the buffering constraints have been reached
   int check_buffering_constraints_i (TAO_Stub *stub, int &must_flush);
@@ -901,8 +858,6 @@ protected:
    */
   int bidirectional_flag_;
 
-  TAO::Connection_Role opening_connection_role_;
-
   /// Implement the outgoing data queue
   TAO_Queued_Message *head_;
   TAO_Queued_Message *tail_;
@@ -929,7 +884,7 @@ protected:
    * a null lock for single-threaded systems, and a real lock for
    * multi-threaded systems.
    */
-  mutable ACE_Lock *handler_lock_;
+  ACE_Lock *handler_lock_;
 
   /// A unique identifier for the transport.
   /**
@@ -950,11 +905,6 @@ protected:
   /// Number of bytes sent.
   size_t sent_byte_count_;
 
-  /// Is this transport really connected or not. In case of oneways with
-  /// SYNC_NONE Policy we don't wait until the connection is ready and we
-  /// buffer the requests in this transport until the connection is ready
-  bool is_connected_;
-
 private:
 
   /// @@Phil, I think it would be nice if we could think of a way to
@@ -988,7 +938,7 @@ private:
 /**
  * @class TAO_Transport_Refcount_Guard
  *
- * @brief Helper class that increments the refcount on construction
+ * @brief Helper class that increments the refount on construction
  *  and decrements the refcount on destruction.
  */
 class TAO_Export TAO_Transport_Refcount_Guard
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index be8b82bdac1..ab9770b43f4 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -38,25 +38,6 @@ TAO_Transport::bidirectional_flag (int flag)
   this->bidirectional_flag_ = flag;
 }
 
-ACE_INLINE TAO::Connection_Role
-TAO_Transport::opened_as () const
-{
-  return this->opening_connection_role_;
-}
-
-ACE_INLINE void
-TAO_Transport::opened_as (TAO::Connection_Role role)
-{
-  this->opening_connection_role_ = role;
-}
-
-ACE_INLINE bool
-TAO_Transport::acts_as_server (void) const
-{
-  return (this->opened_as () == TAO::TAO_SERVER_ROLE ||
-          this->bidirectional_flag_ == 1) ? true : false;
-}
-
 ACE_INLINE TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *
 TAO_Transport::cache_map_entry (void)
 {
@@ -164,23 +145,6 @@ TAO_Transport::first_request_sent (void)
   this->first_request_ = 0;
 }
 
-ACE_INLINE bool
-TAO_Transport::is_connected (void) const
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->handler_lock_,
-                    false);
-
-  return this->is_connected_;
-}
-
-ACE_INLINE TAO_Connection_Handler *
-TAO_Transport::connection_handler (void)
-{
-  return this->connection_handler_i();
-}
-
 /*****************************************************/
 
 ACE_INLINE
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 7ef578dfd72..00783bcd224 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -8,10 +8,6 @@
 #include "debug.h"
 #include "Connect_Strategy.h"
 #include "Client_Strategy_Factory.h"
-#include "Connection_Handler.h"
-#include "Profile_Transport_Resolver.h"
-#include "Wait_Strategy.h"
-#include "SystemException.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -54,7 +50,7 @@ TAO_Connector::make_mprofile (const char *string,
     {
       ACE_THROW_RETURN (CORBA::INV_OBJREF (
                           CORBA::SystemException::_tao_minor_code (
-                            0,
+                            TAO_DEFAULT_MINOR_CODE,
                             EINVAL),
                           CORBA::COMPLETED_NO),
                         -1);
@@ -220,182 +216,44 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
                         ACE_Time_Value *timeout
                         ACE_ENV_ARG_DECL_NOT_USED)
 {
-  if (desc == 0 ||
-      (this->set_validate_endpoint (desc->endpoint ()) == -1))
-    return 0;
+  if ((this->set_validate_endpoint (desc->endpoint ()) == -1) || desc == 0)
+    {
+      return 0;
+    }
 
   TAO_Transport *base_transport = 0;
 
-  TAO_Transport_Cache_Manager &tcm =
-    this->orb_core ()->lane_resources ().transport_cache ();
-
   // Check the Cache first for connections
   // If transport found, reference count is incremented on assignment
   // @@todo: We need to send the timeout value to the cache registry
   // too. That should be the next step!
-  if (tcm.find_transport (desc,
-                          base_transport) != 0)
-    {
-      // @@TODO: This is not the right place for this!
-      // Purge connections (if necessary)
-      tcm.purge ();
-
-      TAO_Transport* t = this->make_connection (r,
-                                                *desc,
-                                                timeout);
-
-      if (t == 0)
-        return t;
-
-      t->opened_as (TAO::TAO_CLIENT_ROLE);
-
-      if (TAO_debug_level > 4)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Transport_Connector::connect, "
-                    "opening Transport[%d] in TAO_CLIENT_ROLE\n",
-                    t->id ()));
-
-      return t;
-    }
-
-  if (TAO_debug_level > 4)
-    {
-      TAO::Connection_Role cr =
-        base_transport->opened_as ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport_Connector::connect, "
-                  "got an existing %s Transport[%d] in role %s\n",
-                  base_transport->is_connected () ? "connected" : "unconnected",
-                  base_transport->id (),
-                  cr == TAO::TAO_SERVER_ROLE ? "TAO_SERVER_ROLE" :
-                  cr == TAO::TAO_CLIENT_ROLE ? "TAO_CLIENT_ROLE" :
-                  "TAO_UNSPECIFIED_ROLE" ));
-    }
-
-  // If connected return..
-  if (base_transport->is_connected ())
-    return base_transport;
-
-  if (!this->wait_for_connection_completion (r,
-                                             base_transport,
-                                             timeout))
+  if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (
+        desc,
+        base_transport) == 0)
     {
       if (TAO_debug_level > 2)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - Transport_Connector::"
-                    "connect, "
-                    "wait for completion failed\n"));
-      return 0;
-    }
-
-  if (base_transport->is_connected () &&
-      base_transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
-
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) base_transport->purge_entry ();
-
-      // Close the handler.
-      (void) base_transport->close_connection ();
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - Transport_Connector [%d]::connect, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    base_transport->id ()));
-
-      return 0;
-    }
-
-  return base_transport;
-}
-
-bool
-TAO_Connector::wait_for_connection_completion (
-    TAO::Profile_Transport_Resolver *r,
-    TAO_Transport *&transport,
-    ACE_Time_Value *timeout)
-{
-  if (TAO_debug_level > 2)
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport_Connector::wait_for_connection_completion, "
-                  "going to wait for connection completion on transport"
-                  "[%d]\n",
-                  transport->id ()));
-
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked ())
-    {
-      timeout = &tmp_zero;
-    }
-
-  // Wait until the connection is ready, when non-blocking we just do a wait
-  // with zero time
-  int result =
-    this->active_connect_strategy_->wait (
-      transport,
-      timeout);
-
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - Transport_Connector::wait_for_connection_completion, "
-                "transport [%d], wait done result = %d\n",
-                transport->id (), result));
-
-  // There are three possibilities when wait() returns: (a)
-  // connection succeeded; (b) connection failed; (c) wait()
-  // failed because of some other error.  It is easy to deal with
-  // (a) and (b).  (c) is tricky since the connection is still
-  // pending and may get completed by some other thread.  The
-  // following method deals with (c).
-
-  if (result == -1)
-    {
-      if (!r->blocked () && errno == ETIME)
         {
-          // If we did a non blocking connect, just ignore
-          // any timeout errors
-          result = 0;
-        }
-      else
-        {
-          // When we need to get a connected transport
-          result =
-            this->check_connection_closure (
-              transport->connection_handler ());
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Transport_Connector::connect, "
+                      "got an existing Transport[%d]\n",
+                      base_transport->id ()));
         }
 
-      // In case of errors.
-      if (result == -1)
-        {
-          // Report that making the connection failed, don't print errno
-          // because we touched the reactor and errno could be changed
-          if (TAO_debug_level > 2)
-            ACE_ERROR ((LM_ERROR,
-                        "TAO (%P|%t) - Transport_Connector::"
-                        "wait_for_connection_completion, "
-                        "transport [%d], wait for completion failed\n",
-                        transport->id()));
-
-          // Set transport to zero, it is not usable
-          transport = 0;
-
-          return false;
-        }
+      // No need to _duplicate since things are taken care within the
+      // cache manager.
+      return base_transport;
     }
 
-  // Connection not ready yet but we can use this transport, if
-  // we need a connected one we will block later to make sure
-  // it is connected
-  return true;
+  // @@TODO: This is not the right place for this!
+  // Purge connections (if necessary)
+  this->orb_core_->lane_resources ().transport_cache ().purge ();
+
+  return this->make_connection (r,
+                                *desc,
+                                timeout);
 }
 
+
 int
 TAO_Connector::create_connect_strategy (void)
 {
@@ -413,57 +271,3 @@ TAO_Connector::create_connect_strategy (void)
 
   return 0;
 }
-
-int
-TAO_Connector::check_connection_closure (
-  TAO_Connection_Handler *connection_handler)
-{
-  int result = -1;
-
-  // Check if the handler has been closed.
-  int closed =
-    connection_handler->is_closed ();
-
-  // In case of failures and close() has not be called.
-  if (!closed)
-    {
-      // First, cancel from connector.
-      if (this->cancel_svc_handler (connection_handler) == -1)
-        return -1;
-
-      // Double check to make sure the handler has not been closed
-      // yet.  This double check is required to ensure that the
-      // connection handler was not closed yet by some other
-      // thread since it was still registered with the connector.
-      // Once connector.cancel() has been processed, we are
-      // assured that the connector will no longer open/close this
-      // handler.
-      closed = connection_handler->is_closed ();
-
-      // If closed, there is nothing to do here.  If not closed,
-      // it was either opened or is still pending.
-      if (!closed)
-        {
-          // Check if the handler has been opened.
-          const int open = connection_handler->is_open ();
-
-          // Some other thread was able to open the handler even
-          // though wait failed for this thread.
-          if (open)
-            {
-              // Set the result to 0, we have an open connection
-              result = 0;
-            }
-          else
-            {
-              // Assert that it is still connecting.
-              ACE_ASSERT (connection_handler->is_connecting ());
-
-              // Force close the handler now.
-              connection_handler->close_handler ();
-            }
-        }
-    }
-
-  return result;
-}
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index 73347185874..b142cf90b9e 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -35,7 +35,6 @@ class TAO_MProfile;
 class TAO_ORB_Core;
 class TAO_Connect_Strategy;
 class TAO_Transport;
-class TAO_Connection_Handler;
 
 namespace TAO
 {
@@ -59,10 +58,10 @@ class TAO_Export TAO_Connector
 {
 public:
 
-  /// Default constructor.
+  /// default constructor.
   TAO_Connector (CORBA::ULong tag);
 
-  /// The destructor.
+  /// the destructor.
   virtual ~TAO_Connector (void);
 
   /**
@@ -76,14 +75,12 @@ public:
 
   /// Parse a string containing a URL style IOR and return an
   /// MProfile.
-  int make_mprofile (
-      const char *ior,
-      TAO_MProfile &mprofile
-      ACE_ENV_ARG_DECL);
+  int make_mprofile (const char *ior,
+                     TAO_MProfile &mprofile
+                     ACE_ENV_ARG_DECL);
 
   ///  Initialize object and register with reactor.
-  virtual int open (
-      TAO_ORB_Core *orb_core) = 0;
+  virtual int open (TAO_ORB_Core *orb_core) = 0;
 
   /// Shutdown Connector bridge and concrete Connector.
   virtual int close (void) = 0;
@@ -93,21 +90,18 @@ public:
    * connect ()  method so it can be called from the invocation code
    * independent of the actual transport protocol in use.
    */
-  virtual TAO_Transport* connect (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface *desc,
-      ACE_Time_Value *timeout
-      ACE_ENV_ARG_DECL);
+  virtual TAO_Transport* connect (TAO::Profile_Transport_Resolver *r,
+                                  TAO_Transport_Descriptor_Interface *desc,
+                                  ACE_Time_Value *timeout
+                                  ACE_ENV_ARG_DECL);
 
   /// Create a profile for this protocol and initialize it based on the
   /// encapsulation in @a cdr
-  virtual TAO_Profile *create_profile (
-      TAO_InputCDR& cdr) = 0;
+  virtual TAO_Profile *create_profile (TAO_InputCDR& cdr) = 0;
 
   /// Check that the prefix of the provided endpoint is valid for use
   /// with a given pluggable protocol.
-  virtual int check_prefix (
-      const char *endpoint) = 0;
+  virtual int check_prefix (const char *endpoint) = 0;
 
   /// Return the object key delimiter to use or expect.
   virtual char object_key_delimiter (void) const = 0;
@@ -121,35 +115,9 @@ protected:
   /// remote *_Addr's which have not been done during IOR decode.
   virtual int set_validate_endpoint (TAO_Endpoint *endpoint) = 0;
 
-  /// Make a connection
-  virtual TAO_Transport* make_connection (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface &desc,
-      ACE_Time_Value *timeout) = 0;
-
-  /// Cancel the passed cvs handler from the connector
-  virtual int cancel_svc_handler (
-      TAO_Connection_Handler *svc_handler) = 0;
-
-  /// Check whether the connection is not closed
-  /**
-   * @retval 0 The connection happens to be not closed, but is now open
-   * because an other thread managed to open the handler
-   * @retval -1 The connection is closed
-   */
-  virtual int check_connection_closure (
-      TAO_Connection_Handler *connection_handler);
-
-  /**
-   * Wait for connection completion. We have a transport that is not
-   * connected yet, wait until it is connected.
-   * @retval true When we could use @a transport
-   * @return false When we can't use the @a transport
-   */
-  virtual bool wait_for_connection_completion(
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport *&transport,
-      ACE_Time_Value *timeout);
+  virtual TAO_Transport* make_connection (TAO::Profile_Transport_Resolver *r,
+                                          TAO_Transport_Descriptor_Interface &desc,
+                                          ACE_Time_Value *timeout) = 0;
 
   /// Set the ORB Core pointer
   void orb_core (TAO_ORB_Core *orb_core);
diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc
index 031535adc89..d5fed83a8db 100644
--- a/TAO/tao/TypeCodeFactory.mpc
+++ b/TAO/tao/TypeCodeFactory.mpc
@@ -22,8 +22,4 @@ project : taolib, core, ifr_client {
   Resource_Files {
     TypeCodeFactory
   }
-
-  PIDL_Files {
-    TypeCodeFactory
-  }
 }
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index c6700c8118b..403daf58673 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -53,13 +53,13 @@
 // Arg traits specializations.
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:582
 
 #if !defined (_CORBA_ANY__ARG_TRAITS_CS_)
 #define _CORBA_ANY__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::Any>
     : public
@@ -72,13 +72,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:537
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -92,7 +92,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_CS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::Container>
     : public
@@ -109,7 +109,7 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::IDLType>
     : public
@@ -123,13 +123,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -145,7 +145,7 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ValueDef>
     : public
@@ -159,13 +159,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ValueDefSeq>
     : public
@@ -178,13 +178,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
@@ -197,13 +197,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::StructMemberSeq>
     : public
@@ -216,13 +216,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::InitializerSeq>
     : public
@@ -235,13 +235,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -254,13 +254,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -273,13 +273,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -292,13 +292,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:537
 
 #if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_)
 #define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::PrimitiveKind>
     : public
@@ -309,13 +309,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -328,13 +328,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:537
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::AttributeMode>
     : public
@@ -345,13 +345,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:537
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::OperationMode>
     : public
@@ -362,13 +362,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -381,13 +381,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ContextIdSeq>
     : public
@@ -410,7 +410,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::TypeCodeFactory_ptr
-TAO::Objref_Traits<CORBA::TypeCodeFactory>::duplicate (
+TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_duplicate (
     CORBA::TypeCodeFactory_ptr p
   )
 {
@@ -419,7 +419,7 @@ TAO::Objref_Traits<CORBA::TypeCodeFactory>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<CORBA::TypeCodeFactory>::release (
+TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_release (
     CORBA::TypeCodeFactory_ptr p
   )
 {
@@ -428,14 +428,14 @@ TAO::Objref_Traits<CORBA::TypeCodeFactory>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::TypeCodeFactory_ptr
-TAO::Objref_Traits<CORBA::TypeCodeFactory>::nil (void)
+TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_nil (void)
 {
   return CORBA::TypeCodeFactory::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<CORBA::TypeCodeFactory>::marshal (
+TAO::Objref_Traits<CORBA::TypeCodeFactory>::tao_marshal (
     CORBA::TypeCodeFactory_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -444,7 +444,7 @@ TAO::Objref_Traits<CORBA::TypeCodeFactory>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_TypeCodeFactory_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -455,7 +455,7 @@ CORBA::TypeCodeFactory::TypeCodeFactory (void)
 CORBA::TypeCodeFactory::~TypeCodeFactory (void)
 {}
 
-void
+void 
 CORBA::TypeCodeFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   TypeCodeFactory *_tao_tmp_pointer =
@@ -473,10 +473,10 @@ CORBA::TypeCodeFactory::_narrow (
     {
       return TypeCodeFactory::_nil ();
     }
-
+  
   TypeCodeFactory_ptr proxy =
     dynamic_cast<TypeCodeFactory_ptr> (_tao_objref);
-
+  
   return TypeCodeFactory::_duplicate (proxy);
 }
 
@@ -490,10 +490,10 @@ CORBA::TypeCodeFactory::_unchecked_narrow (
     {
       return TypeCodeFactory::_nil ();
     }
-
+  
   TypeCodeFactory_ptr proxy =
     dynamic_cast<TypeCodeFactory_ptr> (_tao_objref);
-
+  
   return TypeCodeFactory::_duplicate (proxy);
 }
 
@@ -504,7 +504,7 @@ CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -555,20 +555,20 @@ static const CORBA::Long _oc_CORBA_TypeCodeFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5479),
-  ACE_NTOHL (0x7065436f),
-  ACE_NTOHL (0x64654661),
-  ACE_NTOHL (0x63746f72),
-  ACE_NTOHL (0x793a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5479), 
+  ACE_NTOHL (0x7065436f), 
+  ACE_NTOHL (0x64654661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x793a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeCodeFactory:1.0
     16,
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x46616374),
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x46616374), 
   ACE_NTOHL (0x6f727900),  // name = TypeCodeFactory
   };
 
@@ -913,7 +913,7 @@ operator>>= (
     TAO_Objref_Var_T<
         CORBA::TypeCodeFactory
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::TypeCodeFactory
@@ -1179,7 +1179,7 @@ operator>>= (
     TAO_Objref_Var_T< \
         CORBA::TypeCodeFactory
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::TypeCodeFactory
@@ -1190,4 +1190,5 @@ operator>>= (
         CORBA::TypeCodeFactory \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index 9c179ba0312..c180b0952d6 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -70,13 +70,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -86,22 +86,22 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_TYPECODEFACTORY__VAR_OUT_CH_)
 #define _CORBA_TYPECODEFACTORY__VAR_OUT_CH_
-
+  
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TypeCodeFactory
       >
     TypeCodeFactory_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TypeCodeFactory
@@ -109,43 +109,43 @@ namespace CORBA
     TypeCodeFactory_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPECODEFACTORY_CH_)
 #define _CORBA_TYPECODEFACTORY_CH_
-
+  
   class TAO_TypeCodeFactory_Export TypeCodeFactory
     : public virtual CORBA::Object
   {
   public:
     typedef TypeCodeFactory_ptr _ptr_type;
     typedef TypeCodeFactory_var _var_type;
-
+    
     // The static operations.
     static TypeCodeFactory_ptr _duplicate (TypeCodeFactory_ptr obj);
-
+    
     static TypeCodeFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypeCodeFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypeCodeFactory_ptr _nil (void)
     {
       return (TypeCodeFactory_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_struct_tc (
         const char * id,
         const char * name,
@@ -155,10 +155,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_union_tc (
         const char * id,
         const char * name,
@@ -169,10 +169,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_enum_tc (
         const char * id,
         const char * name,
@@ -182,10 +182,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_alias_tc (
         const char * id,
         const char * name,
@@ -195,10 +195,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_exception_tc (
         const char * id,
         const char * name,
@@ -208,10 +208,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_interface_tc (
         const char * id,
         const char * name
@@ -220,10 +220,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_string_tc (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -231,10 +231,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_wstring_tc (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -242,10 +242,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_fixed_tc (
         CORBA::UShort digits,
         CORBA::UShort scale
@@ -254,10 +254,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_sequence_tc (
         CORBA::ULong bound,
         CORBA::TypeCode_ptr element_type
@@ -266,10 +266,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_array_tc (
         CORBA::ULong length,
         CORBA::TypeCode_ptr element_type
@@ -278,10 +278,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_value_tc (
         const char * id,
         const char * name,
@@ -293,10 +293,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_value_box_tc (
         const char * id,
         const char * name,
@@ -306,10 +306,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_native_tc (
         const char * id,
         const char * name
@@ -318,10 +318,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_recursive_tc (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -329,10 +329,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char * id,
         const char * name
@@ -341,10 +341,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_local_interface_tc (
         const char * id,
         const char * name
@@ -353,10 +353,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_component_tc (
         const char * id,
         const char * name
@@ -365,10 +365,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_home_tc (
         const char * id,
         const char * name
@@ -377,10 +377,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_event_tc (
         const char * id,
         const char * name,
@@ -392,36 +392,36 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     TypeCodeFactory (void);
-
+    
     virtual ~TypeCodeFactory (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TypeCodeFactory (const TypeCodeFactory &);
-
+    
     void operator= (const TypeCodeFactory &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCodeFactory;
 
 // TAO_IDL - Generated from
@@ -438,18 +438,18 @@ namespace TAO
 
 #if !defined (_CORBA_TYPECODEFACTORY__TRAITS_CH_)
 #define _CORBA_TYPECODEFACTORY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_TypeCodeFactory_Export Objref_Traits<CORBA::TypeCodeFactory>
   {
-    static CORBA::TypeCodeFactory_ptr duplicate (
+    static CORBA::TypeCodeFactory_ptr tao_duplicate (
         CORBA::TypeCodeFactory_ptr
       );
-    static void release (
+    static void tao_release (
         CORBA::TypeCodeFactory_ptr
       );
-    static CORBA::TypeCodeFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static CORBA::TypeCodeFactory_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         CORBA::TypeCodeFactory_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -483,3 +483,4 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index c186db28aa4..93167098bf1 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -7,7 +7,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
 #include "tao/Any_Impl.h"
-#include "tao/SystemException.h"
 
 #include "ace/Containers_T.h"
 #include "ace/Hash_Map_Manager_T.h"
@@ -66,7 +65,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
+  
   if (name == 0 || !this->valid_name (name))
     {
       ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
@@ -175,7 +174,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
       if (!valid_member)
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (2,
                                                  CORBA::COMPLETED_NO),
                             CORBA::TypeCode::_nil ());
         }
@@ -1229,7 +1228,7 @@ TAO_TypeCodeFactory_i::valid_name (const char *name)
     {
       return 1;
     }
-
+    
   if (!isalpha (*name))
     {
       return 0;
@@ -1486,7 +1485,7 @@ TAO_TypeCodeFactory_i::assemble_tc (TAO_OutputCDR &cdr,
                     CORBA::TypeCode (kind,
                                      consolidated_block.length (),
                                      consolidated_block.rd_ptr (),
-                                     true,
+                                     0,
                                      0),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index f7732120b18..649caf3267b 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
+#include "tao/Exception.h"
 #include "tao/OBV_Constants.h"
 #include "tao/default_environment.h"
 
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 22f40bb19f0..b9e3e261989 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -20,7 +20,6 @@
 #include "debug.h"
 #include "Any_Unknown_IDL_Type.h"
 #include "ORB_Constants.h"
-#include "SystemException.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
     || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -3642,7 +3641,7 @@ CORBA::Any_ptr
 CORBA::TypeCode::parameter (const CORBA::Long /* slot */
                            ACE_ENV_ARG_DECL)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (0,
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO),
                     0);
 }
@@ -3652,60 +3651,31 @@ CORBA::TypeCode::parameter (const CORBA::Long /* slot */
 namespace TAO
 {
   CORBA::TypeCode_ptr
-  Objref_Traits<CORBA::TypeCode>::duplicate (CORBA::TypeCode_ptr p)
+  Objref_Traits<CORBA::TypeCode>::tao_duplicate (CORBA::TypeCode_ptr p)
   {
     return CORBA::TypeCode::_duplicate (p);
   }
 
   void
-  Objref_Traits<CORBA::TypeCode>::release (CORBA::TypeCode_ptr p)
+  Objref_Traits<CORBA::TypeCode>::tao_release (CORBA::TypeCode_ptr p)
   {
     CORBA::release (p);
   }
 
   CORBA::TypeCode_ptr
-  Objref_Traits<CORBA::TypeCode>::nil (void)
+  Objref_Traits<CORBA::TypeCode>::tao_nil (void)
   {
     return CORBA::TypeCode::_nil ();
   }
 
   CORBA::Boolean
-  Objref_Traits<CORBA::TypeCode>::marshal (CORBA::TypeCode_ptr p,
-                                           TAO_OutputCDR & cdr)
+  Objref_Traits<CORBA::TypeCode>::tao_marshal (CORBA::TypeCode_ptr p,
+                                               TAO_OutputCDR & cdr)
   {
     return cdr << p;
   }
 }
 
-/*static*/ CORBA::TypeCode_ptr
-CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
-{
-  if (tc)
-    {
-      if (tc->orb_owns_)
-        {
-          tc->_incr_refcnt ();
-          return tc;
-        }
-      else
-        {
-          CORBA::TypeCode_ptr tmp = 0;
-          ACE_NEW_RETURN (tmp,
-              CORBA::TypeCode (static_cast<CORBA::TCKind> (tc->kind_),
-                               tc->length_,
-                               tc->buffer_,
-                               true,
-                               0,
-                               tc->parent_),
-                          0);
-
-          return tmp;
-        }
-    }
-
-  return 0;
-}
-
 // ****************************************************************
 
 CORBA::Boolean
@@ -3714,7 +3684,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
   if (x == 0)
     {
       ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
+      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         0);
     }
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index a853dd4a39d..6020c59e98d 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -27,7 +27,7 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Unbounded_Queue.h"
 
-#include "tao/UserException.h"
+#include "tao/Exception.h"
 #include "tao/Environment.h"
 #include "tao/Pseudo_VarOut_T.h"
 #include "tao/Objref_VarOut_T.h"
@@ -190,7 +190,6 @@ namespace CORBA
 
     /// Duplicates i.e., increments ref count.
     static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc);
-    static void _release (CORBA::TypeCode_ptr tc);
 
     /// Returns a NULL typecode.
     static CORBA::TypeCode_ptr _nil (void);
@@ -291,16 +290,19 @@ namespace CORBA
      * parent
      */
     TypeCode (CORBA::TCKind kind,
-              size_t length,
-              const char *buffer,
-              CORBA::Boolean orb_owns_tc,
-              CORBA::ULong size,
-              CORBA::TypeCode_ptr parent = 0);
+                    size_t length,
+                    const char *buffer,
+                    CORBA::Boolean orb_owns_tc,
+                    CORBA::ULong size,
+                    CORBA::TypeCode_ptr parent = 0);
 
     /// destructor
     ~TypeCode (void);
 
-
+    /// These are used to indicate the status of marshaling.
+    // Reference counting operations.
+    CORBA::ULong _incr_refcnt (void);
+    CORBA::ULong _decr_refcnt (void);
 
     // = Following three are deprecated
 
@@ -402,12 +404,8 @@ namespace CORBA
     // Useful for template programming.
 
   private:
-
     // = All the private/helper methods
-    /// These are used to indicate the status of marshaling.
-    // Reference counting operations.
-    CORBA::ULong _incr_refcnt (void);
-    CORBA::ULong _decr_refcnt (void);
+
     /**
      * equal() and equivalent() must both recurse, but their
      * behavior is somewhat different (as defined in CORBA 2.3).
@@ -624,11 +622,11 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::TypeCode>
   {
-    static CORBA::TypeCode_ptr duplicate (CORBA::TypeCode_ptr);
-    static void release (CORBA::TypeCode_ptr);
-    static CORBA::TypeCode_ptr nil (void);
-    static CORBA::Boolean marshal (CORBA::TypeCode_ptr p,
-                                   TAO_OutputCDR & cdr);
+    static CORBA::TypeCode_ptr tao_duplicate (CORBA::TypeCode_ptr);
+    static void tao_release (CORBA::TypeCode_ptr);
+    static CORBA::TypeCode_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (CORBA::TypeCode_ptr p,
+                                       TAO_OutputCDR & cdr);
   };
 
   /**
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
index 7b49dd5c5ad..6c6f85e2fd2 100644
--- a/TAO/tao/Typecode.i
+++ b/TAO/tao/Typecode.i
@@ -9,7 +9,6 @@ CORBA::TypeCode::_incr_refcnt (void)
   return this->refcount_++;
 }
 
-
 ACE_INLINE CORBA::ULong
 CORBA::TypeCode::_decr_refcnt (void)
 {
@@ -23,16 +22,12 @@ CORBA::TypeCode::_decr_refcnt (void)
   return 0;
 }
 
-/*static*/ ACE_INLINE void
-CORBA::TypeCode::_release (CORBA::TypeCode_ptr tc)
+ACE_INLINE CORBA::TypeCode_ptr
+CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
 {
   if (tc)
-    {
-      if (tc->orb_owns_ == false)
-        return;
-
-      tc->_decr_refcnt ();
-    }
+    tc->_incr_refcnt ();
+  return tc;
 }
 
 ACE_INLINE CORBA::TypeCode_ptr
@@ -132,5 +127,7 @@ CORBA::is_nil (CORBA::TypeCode_ptr obj)
 ACE_INLINE void
 CORBA::release (CORBA::TypeCode_ptr obj)
 {
-  CORBA::TypeCode::_release (obj);
+  if (obj)
+    obj->_decr_refcnt ();
 }
+
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index d842c153221..34e87120ffa 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -29,9 +29,8 @@
 #include "tao/Typecode_Constants.h"
 #include "tao/Typecode.h"
 #include "tao/NVList.h"
-#include "tao/ORB.h"
+#include "ORB.h"
 #include "tao/Object.h"
-#include "tao/SystemException.h"
 
 #if defined (TAO_HAS_AMI_POLLER) && (TAO_HAS_AMI_POLLER == 1)
 #include "tao/PollableC.h"
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index a22d029b64c..034badc8d9d 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -24,8 +24,6 @@ TAO::In_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
   return cdr << this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -34,8 +32,6 @@ TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S>
@@ -53,8 +49,6 @@ TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -63,8 +57,6 @@ TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, typename S_out>
@@ -74,8 +66,6 @@ TAO::Out_UB_String_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_out>
 void
 TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param (
@@ -86,8 +76,6 @@ TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S, typename S_var>
@@ -97,8 +85,6 @@ TAO::Ret_UB_String_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_.out ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_var>
 void
 TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
@@ -106,6 +92,4 @@ TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_UB_STRING_ARGUMENT_T_C */
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 4553e79a9e2..a5d14c67e47 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -35,9 +35,9 @@ namespace TAO
     In_UB_String_Argument_T (const S * x);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S * arg (void) const;
 
   private:
@@ -58,9 +58,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -80,9 +80,9 @@ namespace TAO
     Out_UB_String_Argument_T (S_out & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -102,9 +102,9 @@ namespace TAO
     Ret_UB_String_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
     S * excp (void);
diff --git a/TAO/tao/UB_String_SArgument_T.cpp b/TAO/tao/UB_String_SArgument_T.cpp
index 04844f9fea0..da3a42de777 100644
--- a/TAO/tao/UB_String_SArgument_T.cpp
+++ b/TAO/tao/UB_String_SArgument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR &cdr)
   return cdr >> this->x_.out ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_var>
 void
 TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param (
@@ -33,8 +31,6 @@ TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S, typename S_var>
@@ -51,8 +47,6 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_.out ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_var>
 void
 TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param (
@@ -63,8 +57,6 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, typename S_var>
@@ -74,8 +66,6 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_.in ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_var>
 void
 TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param (
@@ -86,8 +76,6 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S, typename S_var>
@@ -97,8 +85,6 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
   return cdr << this->x_.in ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_var>
 void
 TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
@@ -106,6 +92,4 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_UB_STRING_SARGUMENT_T_C */
diff --git a/TAO/tao/UB_String_SArgument_T.h b/TAO/tao/UB_String_SArgument_T.h
index f6e2d0f6297..4094f57b2ab 100644
--- a/TAO/tao/UB_String_SArgument_T.h
+++ b/TAO/tao/UB_String_SArgument_T.h
@@ -35,9 +35,9 @@ namespace TAO
     In_UB_String_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S * arg (void) const;
 
   private:
@@ -58,9 +58,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -80,9 +80,9 @@ namespace TAO
     Out_UB_String_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -102,9 +102,9 @@ namespace TAO
     Ret_UB_String_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h
index 0a7cf275a8b..1ba78ecea0e 100644
--- a/TAO/tao/UShortSeqC.h
+++ b/TAO/tao/UShortSeqC.h
@@ -72,22 +72,22 @@
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_USHORTSEQ_CH_)
 #define _CORBA_USHORTSEQ_CH_
-
+  
   class UShortSeq;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         UShortSeq,
         CORBA::UShort
       >
     UShortSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         UShortSeq,
@@ -95,7 +95,7 @@ namespace CORBA
         CORBA::UShort
       >
     UShortSeq_out;
-
+  
   class TAO_Export UShortSeq
     : public
         TAO_Unbounded_Sequence<
@@ -108,22 +108,22 @@ namespace CORBA
     UShortSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::UShort* buffer,
+        CORBA::UShort* buffer, 
         CORBA::Boolean release = 0
       );
     UShortSeq (const UShortSeq &);
     ~UShortSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef UShortSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UShortSeq;
 
 // TAO_IDL - Generated from
@@ -139,18 +139,6 @@ namespace TAO
 {
 }
 
-// Workaround for a Visual Studio .NET bug where this class is not
-// properly imported by an application if typedef'd or subclassed,
-// resulting in 'multiply defined' link errors. The export macro
-// here forces an explicit import by the application. Please see
-// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
-// The problem stems from use of the type below in DsLogAdmin,
-// but we put the instantiation here because the application will
-// need to see it in *C.h to avoid the error.
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-  template class TAO_Export TAO_Unbounded_Sequence<CORBA::UShortSeq>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
 // TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_ch.cpp:52
 
diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc
index b57ba25bc19..88223e6007b 100644
--- a/TAO/tao/Utils.mpc
+++ b/TAO/tao/Utils.mpc
@@ -26,8 +26,4 @@ project : taolib, core, portableserver {
   Resource_Files {
     Utils
   }
-
-  PIDL_Files {
-  }
-
 }
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 6c340121e4e..057ba51c9c8 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -2,7 +2,6 @@
 #define TAO_UTILS_RIR_NARROW_CPP
 
 #include "RIR_Narrow.h"
-#include "tao/SystemException.h"
 #include <stdexcept>
 
 ACE_RCSID (Utils,
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
index 8716ed46cdf..426484ca1c3 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -1,16 +1,12 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "tao/Exception.h"
 #include "ace/Swap.h"
 
 template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::_duplicate (T * p)
+ACE_INLINE T * TAO::Utils::Servant_Var<T>::
+_duplicate(T * p)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       if (p != 0)
         {
@@ -23,52 +19,53 @@ TAO::Utils::Servant_Var<T>::_duplicate (T * p)
       ACE_RE_THROW;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return p;
 }
 
 template <class T>
 ACE_INLINE void
-TAO::Utils::Servant_Var<T>::swap (Servant_Var<T> & rhs) ACE_THROW_SPEC(())
+TAO::Utils::Servant_Var<T>::swap(Servant_Var<T> & rhs) ACE_THROW_SPEC(())
 {
-  ACE_Swap<T*>::swap (this->ptr_, rhs.ptr_);
+  ACE_Swap<T*>::swap(this->ptr_, rhs.ptr_);
 }
 
 template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (T * p)
-  : ptr_ (p)
+ACE_INLINE TAO::Utils::Servant_Var<T>::
+Servant_Var(T * p)
+  : ptr_(p)
 {
 }
 
 // If _add_ref throws, this object will not be completely constructed
 // so the destructor will not be called.
 template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Servant_Var<T> const & rhs)
-  : ptr_ (Servant_Var<T>::_duplicate(rhs.ptr_))
+ACE_INLINE TAO::Utils::Servant_Var<T>::
+Servant_Var(Servant_Var<T> const & rhs)
+  : ptr_(Servant_Var<T>::_duplicate(rhs.ptr_))
 {
 }
 
 template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::operator= (Servant_Var<T> const & rhs)
+ACE_INLINE TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
+operator=(Servant_Var<T> const & rhs)
 {
-  TAO::Utils::Servant_Var<T> tmp (rhs);
-  this->swap (tmp);
+  TAO::Utils::Servant_Var<T> tmp(rhs);
+  this->swap(tmp);
   return *this;
 }
 
 template <class T>
-ACE_INLINE typename TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::operator= (T * p)
+ACE_INLINE ACE_TYPENAME TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
+operator=(T * p)
 {
-  TAO::Utils::Servant_Var<T> tmp (p);
-  this->swap (tmp);
+  TAO::Utils::Servant_Var<T> tmp(p);
+  this->swap(tmp);
   return *this;
 }
 
 template <class T> ACE_INLINE
-TAO::Utils::Servant_Var<T>::~Servant_Var (void)
+TAO::Utils::Servant_Var<T>::~Servant_Var ()
   ACE_THROW_SPEC (())
 {
   // Unfortunately, there is no throw spec on _remove_ref, so we
@@ -92,95 +89,99 @@ TAO::Utils::Servant_Var<T>::~Servant_Var (void)
 
 #if !defined(ACE_LACKS_MEMBER_TEMPLATES)
 template <class T> template <class Y>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Y * p)
-  : ptr_ (p)
+ACE_INLINE TAO::Utils::Servant_Var<T>::
+Servant_Var(Y * p)
+  : ptr_(p)
 {
 }
 
 template <class T> template <class Y>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Servant_Var<Y> const & rhs)
-  : ptr_ (Servant_Var<T>::_duplicate (rhs.in ()))
+ACE_INLINE TAO::Utils::Servant_Var<T>::
+Servant_Var(Servant_Var<Y> const & rhs)
+  : ptr_(Servant_Var<T>::_duplicate(rhs.in()))
 {
 }
 
 template <class T> template <class Y>
-ACE_INLINE typename TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::
+ACE_INLINE ACE_TYPENAME TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
 operator=(Servant_Var<Y> const & rhs)
 {
-  TAO::Utils::Servant_Var<T> tmp (rhs);
-  this->swap (tmp);
+  TAO::Utils::Servant_Var<T> tmp(rhs);
+  this->swap(tmp);
   return *this;
 }
 
 template <class T> template <class Y>
-ACE_INLINE typename TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::operator= (Y * p)
+ACE_INLINE ACE_TYPENAME TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
+operator=(Y * p)
 {
-  TAO::Utils::Servant_Var<T> tmp (p);
-  this->swap (tmp);
+  TAO::Utils::Servant_Var<T> tmp(p);
+  this->swap(tmp);
   return *this;
 }
 #endif /* ACE_LACKS_MEMBER_TEMPLATES */
 
 template <class T>
-ACE_INLINE T const *
-TAO::Utils::Servant_Var<T>::operator->() const
+ACE_INLINE T const * TAO::Utils::Servant_Var<T>::
+operator->() const
 {
   return ptr_;
 }
 
 template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::operator->()
+ACE_INLINE T * TAO::Utils::Servant_Var<T>::
+operator->()
 {
   return ptr_;
 }
 
 template <class T>
-ACE_INLINE T const & TAO::Utils::Servant_Var<T>::operator*() const
+ACE_INLINE T const & TAO::Utils::Servant_Var<T>::
+operator*() const
 {
   return *ptr_;
 }
 
 template <class T>
-ACE_INLINE T & TAO::Utils::Servant_Var<T>::operator*()
+ACE_INLINE T & TAO::Utils::Servant_Var<T>::
+operator*()
 {
   return *ptr_;
 }
 
 template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T>::operator void const * () const
+ACE_INLINE TAO::Utils::Servant_Var<T>::
+operator void const * () const
 {
   return ptr_;
 }
 
 template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::in (void) const
+ACE_INLINE T * TAO::Utils::Servant_Var<T>::
+in() const
 {
   return ptr_;
 }
 
 template <class T>
-ACE_INLINE T *&
-TAO::Utils::Servant_Var<T>::inout (void)
+ACE_INLINE T *& TAO::Utils::Servant_Var<T>::
+inout()
 {
   return ptr_;
 }
 
 template <class T>
-ACE_INLINE T *&
-TAO::Utils::Servant_Var<T>::out (void)
+ACE_INLINE T *& TAO::Utils::Servant_Var<T>::
+out()
 {
   TAO::Utils::Servant_Var<T> tmp;
-  this->swap (tmp);
+  this->swap(tmp);
   return ptr_;
 }
 
 template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::_retn (void)
+ACE_INLINE T * TAO::Utils::Servant_Var<T>::
+_retn()
 {
   T * rval = ptr_;
   ptr_ = 0;
@@ -189,16 +190,18 @@ TAO::Utils::Servant_Var<T>::_retn (void)
 
 template <class X, class Y>
 ACE_INLINE bool
-operator== (typename TAO::Utils::Servant_Var<X> const & x,
-            typename TAO::Utils::Servant_Var<Y> const & y)
+operator==(ACE_TYPENAME TAO::Utils::Servant_Var<X> const & x,
+           ACE_TYPENAME TAO::Utils::Servant_Var<Y> const & y)
 {
-  return x.in () == y.in ();
+  return x.in() == y.in();
 }
 
+// -*- C++ -*-
+// $Id$
 template <class X, class Y>
 ACE_INLINE bool
-operator!= (typename TAO::Utils::Servant_Var<X> const & x,
-            typename TAO::Utils::Servant_Var<Y> const & y)
+operator!=(ACE_TYPENAME TAO::Utils::Servant_Var<X> const & x,
+           ACE_TYPENAME TAO::Utils::Servant_Var<Y> const & y)
 {
-  return x.in () != y.in ();
+  return x.in() != y.in();
 }
diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp
index bdbc1f0ad8c..3cd07cc85f7 100644
--- a/TAO/tao/Utils/Server_Main.cpp
+++ b/TAO/tao/Utils/Server_Main.cpp
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    Server_Main.cpp
@@ -11,7 +10,7 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
-
+//
 #ifndef TAO_UTILS_SERVER_MAIN_T_CPP
 #define TAO_UTILS_SERVER_MAIN_T_CPP
 
@@ -20,49 +19,39 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-ACE_RCSID (Utils,
-           Server_Main,
-           "$Id$")
-
-
-#include "tao/ORB.h"
+ACE_RCSID(Utils, Server_Main, "$Id$")
 
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Log_Msg.h"
-#include "ace/Time_Value.h"
-
+#include "tao/ORB.h"
 
 template <typename SERVANT>
-TAO::Utils::Server_Main<SERVANT>::Server_Main (const char * name)
+TAO::Utils::Server_Main<SERVANT>::Server_Main(const char * name)
   : name_(name)
 {
 }
 
 template <typename SERVANT>
-TAO::Utils::Server_Main<SERVANT>::~Server_Main ()
+TAO::Utils::Server_Main<SERVANT>::~Server_Main()
 {
 }
 
 template <typename SERVANT>
-int
-TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
+int TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
   // hide unicode if necessary.
-  ACE_Argv_Type_Converter command_line (argc, argv);
+  ACE_Argv_Type_Converter command_line(argc, argv);
 
-  char ** asciiArgv = command_line.get_ASCII_argv ();
+  char ** asciiArgv = command_line.get_ASCII_argv();
 
   ACE_TRY_NEW_ENV
   {
     // Initialize the orb
 
-    CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, asciiArgv, name_ ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (! CORBA::is_nil(orb.in ()))
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, asciiArgv, name_ ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (-1);
+    if(! CORBA::is_nil(orb.in ()))
     {
       // create an instance of the servant object and give it a
       // chance at the arguments.
@@ -72,19 +61,19 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
       {
         //////////////////////////////////
         // let the servant register itself
-        result = servant.init (orb.in () ACE_ENV_ARG_PARAMETER);
+        result = servant.init(orb.in () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (result == 0)
         {
           ACE_ERROR ((LM_INFO,
-            "%T %s (%P|%t) Ready %s\n", name_, servant.identity ()
+            "%T %s (%P|%t) Ready %s\n", name_, servant.identity()
             ));
 
           //////////////////////////////////
           // Run the event loop for the ORB.
           // Initial run to initialize the orb
-          ACE_Time_Value tv (1,0);
+          ACE_Time_Value tv(1,0);
           orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -92,22 +81,20 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
           int quit = 0;
           while (result == 0 && ! quit )
           {
-            ACE_Time_Value work_tv (1,0);
+            ACE_Time_Value work_tv(1,0);
             orb->perform_work(work_tv ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
             quit = servant.idle (result ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+	    ACE_TRY_CHECK;
           }
-          servant.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+          servant.fini(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          orb->shutdown (1 ACE_ENV_ARG_PARAMETER);
+          orb->shutdown(1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ERROR ((LM_INFO,
-                      "%T %s (%P|%t) Terminated normally. %s\n",
-                      name_,
-                      servant.identity ()
+            "%T %s (%P|%t) Terminated normally. %s\n", name_, servant.identity()
             ));
         }
         else
diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc
index 4cecf92a5f3..9da388eba2d 100644
--- a/TAO/tao/Valuetype.mpc
+++ b/TAO/tao/Valuetype.mpc
@@ -22,7 +22,4 @@ project : taolib, core {
   Resource_Files {
     Valuetype
   }
-
-  PIDL_Files {
-  }
 }
diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp
index 08f1571b21e..4d518d638e7 100644
--- a/TAO/tao/Valuetype/Sequence_T.cpp
+++ b/TAO/tao/Valuetype/Sequence_T.cpp
@@ -9,15 +9,15 @@
 #include "Sequence_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Valuetype,
-           Sequence_T,
+ACE_RCSID (Valuetype, 
+           Sequence_T, 
            "$Id$")
 
 // *************************************************************
 // class TAO_Valuetype_Manager
 // *************************************************************
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 TAO_Valuetype_Manager<T,T_var> &
 TAO_Valuetype_Manager<T,T_var>::operator= (
     const TAO_Valuetype_Manager<T,T_var> & rhs
@@ -30,9 +30,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= (
 
   if (this->release_)
     {
-      TAO::Value_Traits<T>::remove_ref (*this->ptr_);
+      TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_);
       *this->ptr_ = *rhs.ptr_;
-      TAO::Value_Traits<T>::add_ref (*this->ptr_);
+      TAO::Value_Traits<T>::tao_add_ref (*this->ptr_);
     }
   else
     {
@@ -42,7 +42,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (
   return *this;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 TAO_Valuetype_Manager<T,T_var> &
 TAO_Valuetype_Manager<T,T_var>::operator= (T * p)
 {
@@ -52,7 +52,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (T * p)
       // that of a var variable.  Therefore we will not duplicate the
       // user provided pointer before assigning it to the internal
       // variable.
-      TAO::Value_Traits<T>::remove_ref (*this->ptr_);
+      TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_);
       *this->ptr_ = p;
     }
   else
@@ -63,7 +63,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (T * p)
   return *this;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 TAO_Valuetype_Manager<T,T_var> &
 TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p)
 {
@@ -78,9 +78,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p)
           (*this->ptr_)->_remove_ref ();
         }
 
-      TAO::Value_Traits<T>::remove_ref (*this->ptr_);
+      TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_);
       *this->ptr_ = p.in ();
-      TAO::Value_Traits<T>::add_ref (*this->ptr_);
+      TAO::Value_Traits<T>::tao_add_ref (*this->ptr_);
     }
   else
     {
@@ -94,7 +94,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p)
 // Operations for class TAO_Unbounded_Valuetype_Sequence
 // *************************************************************
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
     CORBA::ULong maximum
   )
@@ -105,7 +105,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
 {
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
     const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs
   )
@@ -118,11 +118,12 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
             this->maximum_
           );
       T ** const tmp2 =
-        reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+        ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+                              rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          TAO::Value_Traits<T>::add_ref (tmp2[i]);
+          TAO::Value_Traits<T>::tao_add_ref (tmp2[i]);
           tmp1[i] = tmp2[i];
         }
 
@@ -134,7 +135,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
     }
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::~TAO_Unbounded_Valuetype_Sequence (
     void
   )
@@ -142,7 +143,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::~TAO_Unbounded_Valuetype_Sequence (
   this->_deallocate_buffer ();
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 TAO_Unbounded_Valuetype_Sequence<T,T_var> &
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= (
     const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs
@@ -155,11 +156,12 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= (
 
   if (this->release_)
     {
-      T ** tmp = reinterpret_cast<T **> (this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **,
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          TAO::Value_Traits<T>::remove_ref (tmp[i]);
+          TAO::Value_Traits<T>::tao_remove_ref (tmp[i]);
           tmp[i] = 0;
         }
 
@@ -187,25 +189,27 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= (
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
-  T ** const tmp2 = reinterpret_cast<T **ACE_CAST_CONST> (rhs.buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
+  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+                                          rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      TAO::Value_Traits<T>::add_ref (tmp2[i]);
+      TAO::Value_Traits<T>::tao_add_ref (tmp2[i]);
       tmp1[i] = tmp2[i];
     }
 
   return *this;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 T **
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
 {
   T ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T * [nelems],
+  ACE_NEW_RETURN (buf, 
+                  T * [nelems], 
                   0);
 
   for (CORBA::ULong i = 0; i < nelems; ++i)
@@ -216,7 +220,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
   return buf;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 void
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (T ** buffer)
 {
@@ -240,18 +244,19 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (T ** buffer)
   delete [] buffer;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 void
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer (
     CORBA::ULong length
   )
 {
-  T ** tmp =
+  T ** tmp = 
     TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
-      T ** old = reinterpret_cast<T **> (this->buffer_);
+      T ** old = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         // Only call duplicate when we did not own the previous
@@ -261,7 +266,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer (
         // the old instances.
         if (!this->release_)
           {
-            TAO::Value_Traits<T>::add_ref (tmp[i]);
+            TAO::Value_Traits<T>::tao_add_ref (tmp[i]);
             tmp[i] = old[i];
           }
         else
@@ -278,7 +283,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer (
   this->buffer_ = tmp;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 void
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void)
 {
@@ -287,11 +292,12 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void)
       return;
     }
 
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      TAO::Value_Traits<T>::remove_ref (tmp[i]);
+      TAO::Value_Traits<T>::tao_remove_ref (tmp[i]);
       tmp[i] = 0;
     }
 
@@ -299,18 +305,19 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void)
   this->buffer_ = 0;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 void
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::_shrink_buffer (
     CORBA::ULong nl,
     CORBA::ULong ol
   )
 {
-  T ** tmp = static_cast<T **> (this->buffer_);
+  T ** tmp = ACE_static_cast (T **, 
+                              this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      TAO::Value_Traits<T>::remove_ref (tmp[i]);
+      TAO::Value_Traits<T>::tao_remove_ref (tmp[i]);
       tmp[i] = 0;
     }
 }
@@ -342,11 +349,11 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
         TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (MAX);
 
       T ** const tmp2 =
-        reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+        ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          TAO::Value_Traits<T>::add_ref (tmp2[i]);
+          TAO::Value_Traits<T>::tao_add_ref (tmp2[i]);
           tmp1[i] = tmp2[i];
         }
 
@@ -371,11 +378,12 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator= (
 
   if (this->release_)
     {
-      T ** tmp = reinterpret_cast<T **> (this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          TAO::Value_Traits<T>::remove_ref (tmp[i]);
+          TAO::Value_Traits<T>::tao_remove_ref (tmp[i]);
           tmp[i] = 0;
         }
       // No need to reallocate the buffer since it is always of size
@@ -398,12 +406,14 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator= (
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
-  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
-  T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
+  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+                                          rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      TAO::Value_Traits<T>::add_ref (tmp2[i]);
+      TAO::Value_Traits<T>::tao_add_ref (tmp2[i]);
       tmp1[i] = tmp2[i];
     }
 
@@ -415,8 +425,8 @@ T **
 TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (CORBA::ULong)
 {
   T ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T * [MAX],
+  ACE_NEW_RETURN (buf, 
+                  T * [MAX], 
                   0);
 
   for (CORBA::ULong i = 0; i < MAX; ++i)
@@ -438,7 +448,7 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (T ** buffer)
     {
       if (buffer[i] != 0)
         {
-          TAO::Value_Traits<T>::remove_ref (buffer[i]);
+          TAO::Value_Traits<T>::tao_remove_ref (buffer[i]);
           buffer[i] = 0;
         }
     }
@@ -467,7 +477,8 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_deallocate_buffer (void)
       return;
     }
 
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
   TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -479,11 +490,12 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_shrink_buffer (
     CORBA::ULong ol
   )
 {
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      TAO::Value_Traits<T>::remove_ref (tmp[i]);
+      TAO::Value_Traits<T>::tao_remove_ref (tmp[i]);
       tmp[i] = 0;
     }
 }
diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl
index 3468c13718a..98776b01bb5 100644
--- a/TAO/tao/Valuetype/Sequence_T.inl
+++ b/TAO/tao/Valuetype/Sequence_T.inl
@@ -7,13 +7,13 @@
 // Inline operations for class TAO_Valuetype_Manager
 // *************************************************************
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 ACE_INLINE
 TAO_Valuetype_Manager<T,T_var>::~TAO_Valuetype_Manager (void)
 {
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 ACE_INLINE
 TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager (
     const TAO_Valuetype_Manager<T,T_var> & rhs
@@ -23,10 +23,10 @@ TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager (
 {
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 ACE_INLINE
 TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager(
-    T ** buffer,
+    T ** buffer, 
     CORBA::Boolean release
   )
   : ptr_ (buffer),
@@ -34,64 +34,64 @@ TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager(
 {
 }
 
-template <typename T, typename T_var>
-ACE_INLINE
+template <typename T, typename T_var> 
+ACE_INLINE 
 T *
 TAO_Valuetype_Manager<T,T_var>::operator-> (void) const
 {
   return *this->ptr_;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 ACE_INLINE
 TAO_Valuetype_Manager<T,T_var>::operator const T_var () const
 {
-  TAO::Value_Traits<T>::add_ref (*this->ptr_);
+  TAO::Value_Traits<T>::tao_add_ref (*this->ptr_);
   return *this->ptr_;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 ACE_INLINE
 TAO_Valuetype_Manager<T,T_var>::operator const T * () const
 {
   return *this->ptr_;
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 ACE_INLINE
 TAO_Valuetype_Manager<T,T_var>::operator T *& ()
 {
   return *this->ptr_;
 }
 
-template <typename T, typename T_var>
-ACE_INLINE
+template <typename T, typename T_var> 
+ACE_INLINE 
 T *
 TAO_Valuetype_Manager<T,T_var>::in (void) const
 {
   return *this->ptr_;
 }
 
-template <typename T, typename T_var>
-ACE_INLINE
+template <typename T, typename T_var> 
+ACE_INLINE 
 T *&
 TAO_Valuetype_Manager<T,T_var>::inout (void)
 {
   return *this->ptr_;
 }
 
-template <typename T, typename T_var>
-ACE_INLINE
+template <typename T, typename T_var> 
+ACE_INLINE 
 T *&
 TAO_Valuetype_Manager<T,T_var>::out (void)
 {
-  TAO::Value_Traits<T>::remove_ref (*this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_);
   *this->ptr_ = 0;
   return *this->ptr_;
 }
 
-template <typename T, typename T_var>
-ACE_INLINE
+template <typename T, typename T_var> 
+ACE_INLINE 
 T *
 TAO_Valuetype_Manager<T,T_var>::_retn (void)
 {
@@ -104,7 +104,7 @@ TAO_Valuetype_Manager<T,T_var>::_retn (void)
 // class TAO_Unbounded_Valuetype_Sequence
 // *************************************************************
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 ACE_INLINE
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
     void
@@ -112,7 +112,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
 {
 }
 
-template <typename T, typename T_var>
+template <typename T, typename T_var> 
 ACE_INLINE
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
     CORBA::ULong maximum,
@@ -124,8 +124,8 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
 {
 }
 
-template <typename T, typename T_var>
-ACE_INLINE
+template <typename T, typename T_var> 
+ACE_INLINE 
 TAO_Valuetype_Manager<T,T_var>
 TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] (
     CORBA::ULong slot
@@ -140,7 +140,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] (
 // class TAO_Bounded_Valuetype_Sequence
 // *************************************************************
 
-template<typename T, typename T_var, size_t MAX>
+template<typename T, typename T_var, size_t MAX> 
 ACE_INLINE
 TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::~TAO_Bounded_Valuetype_Sequence (
     void
@@ -149,7 +149,7 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::~TAO_Bounded_Valuetype_Sequence (
   this->_deallocate_buffer ();
 }
 
-template<typename T, typename T_var, size_t MAX>
+template<typename T, typename T_var, size_t MAX> 
 ACE_INLINE
 TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
     CORBA::ULong length,
@@ -160,8 +160,8 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
 {
 }
 
-template<typename T, typename T_var, size_t MAX>
-ACE_INLINE
+template<typename T, typename T_var, size_t MAX> 
+ACE_INLINE 
 TAO_Valuetype_Manager<T,T_var>
 TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] (
     CORBA::ULong slot
@@ -171,3 +171,4 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] (
   T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
   return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_);
 }
+
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index eb0524252fe..2a740b7b815 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -517,21 +517,21 @@ operator>> (TAO_InputCDR &strm,
 namespace TAO
 {
   void
-  Value_Traits<CORBA::ValueBase>::add_ref (
+  Value_Traits<CORBA::ValueBase>::tao_add_ref (
       CORBA::ValueBase *p)
   {
     CORBA::add_ref (p);
   }
 
   void
-  Value_Traits<CORBA::ValueBase>::remove_ref (
+  Value_Traits<CORBA::ValueBase>::tao_remove_ref (
       CORBA::ValueBase * p)
   {
     CORBA::remove_ref (p);
   }
 
   void
-  Value_Traits<CORBA::ValueBase>::release (
+  Value_Traits<CORBA::ValueBase>::tao_release (
       CORBA::ValueBase * p)
   {
     CORBA::remove_ref (p);
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index ff35debdefc..d75f136558d 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -224,12 +224,12 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Valuetype_Export Value_Traits<CORBA::ValueBase>
   {
-    static void add_ref (CORBA::ValueBase *);
-    static void remove_ref (CORBA::ValueBase *);
+    static void tao_add_ref (CORBA::ValueBase *);
+    static void tao_remove_ref (CORBA::ValueBase *);
 
     // For INOUT value type arguments, so they can use the same set
     // of arg classes as interfaces.
-    static void release (CORBA::ValueBase *);
+    static void tao_release (CORBA::ValueBase *);
   };
 }
 
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
index cf0f39e5e55..df331883ffe 100644
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -83,19 +83,19 @@ namespace TAO
   using namespace CORBA;
 
   void
-  Value_Traits<ValueFactoryBase>::add_ref (ValueFactoryBase *p)
+  Value_Traits<ValueFactoryBase>::tao_add_ref (ValueFactoryBase *p)
   {
     CORBA::add_ref (p);
   }
 
   void
-  Value_Traits<ValueFactoryBase>::remove_ref (ValueFactoryBase * p)
+  Value_Traits<ValueFactoryBase>::tao_remove_ref (ValueFactoryBase * p)
   {
     CORBA::remove_ref (p);
   }
 
   void
-  Value_Traits<ValueFactoryBase>::release (ValueFactoryBase * p)
+  Value_Traits<ValueFactoryBase>::tao_release (ValueFactoryBase * p)
   {
     CORBA::remove_ref (p);
   }
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index 68c209c634d..af8fbe0d5d7 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -84,12 +84,15 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Valuetype_Export Value_Traits<CORBA::ValueFactoryBase>
   {
-    static void add_ref (CORBA::ValueFactoryBase *);
-    static void remove_ref (CORBA::ValueFactoryBase *);
+    static void tao_add_ref (
+        CORBA::ValueFactoryBase *);
+    static void tao_remove_ref (
+        CORBA::ValueFactoryBase *);
 
     // For INOUT value type arguments, so they can use the same set
     // of arg classes as interfaces.
-    static void release (CORBA::ValueFactoryBase *);
+    static void tao_release (
+        CORBA::ValueFactoryBase *);
   };
 }
 // Use this macro for writing code that is independend from
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index a235bf8fee3..ddcfe18c1f3 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -14,21 +14,21 @@ ACE_RCSID (Valuetype,
 
 template<typename T>
 void
-TAO::Value_Traits<T>::add_ref (T * p)
+TAO::Value_Traits<T>::tao_add_ref (T * p)
 {
   CORBA::add_ref (p);
 }
 
 template<typename T>
 void
-TAO::Value_Traits<T>::remove_ref (T * p)
+TAO::Value_Traits<T>::tao_remove_ref (T * p)
 {
   CORBA::remove_ref (p);
 }
 
 template<typename T>
 void
-TAO::Value_Traits<T>::release (T * p)
+TAO::Value_Traits<T>::tao_release (T * p)
 {
   CORBA::remove_ref (p);
 }
@@ -47,7 +47,7 @@ TAO_Value_Var_T<T>::TAO_Value_Var_T (T * p)
 
 template <typename T>
 TAO_Value_Var_T<T>::TAO_Value_Var_T (const T * p)
-  : ptr_ (const_cast<T *> (p))
+  : ptr_ (ACE_const_cast (T *, p))
 {}
 
 template <typename T>
@@ -62,21 +62,21 @@ TAO_Value_Var_T<T>::TAO_Value_Var_T (
     const TAO_Value_Var_T<T> & p
   )
 {
-  TAO::Value_Traits<T>::add_ref (p.ptr ());
+  TAO::Value_Traits<T>::tao_add_ref (p.ptr ());
   this->ptr_ = p.ptr ();
 }
 
 template <typename T>
 TAO_Value_Var_T<T>::~TAO_Value_Var_T (void)
 {
-  TAO::Value_Traits<T>::remove_ref (this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
 }
 
 template <typename T>
 TAO_Value_Var_T<T> &
 TAO_Value_Var_T<T>::operator= (T * p)
 {
-  TAO::Value_Traits<T>::remove_ref (this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
@@ -87,9 +87,9 @@ TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T & p)
 {
   if (this != &p)
   {
-    TAO::Value_Traits<T>::remove_ref (this->ptr_);
+    TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
     T * tmp = p.ptr ();
-    TAO::Value_Traits<T>::add_ref (tmp);
+    TAO::Value_Traits<T>::tao_add_ref (tmp);
     this->ptr_ = tmp;
   }
 
@@ -133,7 +133,7 @@ template <typename T>
 T *&
 TAO_Value_Var_T<T>::out (void)
 {
-  TAO::Value_Traits<T>::remove_ref (this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
   this->ptr_ = 0;
   return this->ptr_;
 }
@@ -160,7 +160,7 @@ template <typename T>
 TAO_Value_Out_T<T>::TAO_Value_Out_T (TAO_Value_Var_T<T> & p)
   : ptr_ (p.out ())
 {
-  TAO::Value_Traits<T>::remove_ref (this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
   this->ptr_ = 0;
 }
 
@@ -182,7 +182,7 @@ TAO_Value_Out_T<T> &
 TAO_Value_Out_T<T>::operator= (const TAO_Value_Var_T<T> & p)
 {
   T * tmp = p.ptr ();
-  TAO::Value_Traits<T>::add_ref (tmp);
+  TAO::Value_Traits<T>::tao_add_ref (tmp);
   this->ptr_ = tmp;
   return *this;
 }
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
index 25e2af286dd..d6e94700362 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -30,12 +30,12 @@ namespace TAO
   template<typename T>
   struct Value_Traits
   {
-    static void add_ref (T *);
-    static void remove_ref (T *);
+    static void tao_add_ref (T *);
+    static void tao_remove_ref (T *);
 
     // For INOUT value type arguments, so they can use the same set
     // of arg classes as interfaces.
-    static void release (T *);
+    static void tao_release (T *);
   };
 }
 
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
index 591995eb163..c7f04620b0a 100644
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ b/TAO/tao/Var_Array_Argument_T.cpp
@@ -23,8 +23,6 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
   return cdr << this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_slice, typename S_forany>
 void
 TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
@@ -35,8 +33,6 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S, typename S_slice, typename S_forany>
@@ -57,8 +53,6 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::demarshal (
   return cdr >> this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_slice, typename S_forany>
 void
 TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
@@ -69,8 +63,6 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S,
@@ -86,14 +78,12 @@ TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::demarshal (
 {
   typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS;
   ACE_ALLOCATOR_RETURN (this->x_,
-                        ARRAY_TRAITS::alloc (),
+                        ARRAY_TRAITS::tao_alloc (),
                         0);
   S_forany tmp (this->x_);
   return cdr >> tmp;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S,
          typename S_slice,
          typename S_var,
@@ -108,8 +98,6 @@ interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S,
@@ -125,15 +113,13 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
   typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS;
   S_slice * tmp_ptr = 0;
   ACE_ALLOCATOR_RETURN (tmp_ptr,
-                        ARRAY_TRAITS::alloc (),
+                        ARRAY_TRAITS::tao_alloc (),
                         0);
   this->x_ = tmp_ptr;
   S_forany tmp (this->x_.ptr ());
   return cdr >> tmp;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S,
          typename S_slice,
          typename S_var,
@@ -146,6 +132,4 @@ interceptor_result (CORBA::Any * any)
   (*any) <<= S_forany (this->x_.ptr ());
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_VAR_ARRAY_ARGUMENT_T_C */
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index 342acbc5311..d489b0af7e4 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -35,9 +35,9 @@ namespace TAO
     In_Var_Array_Argument_T (const S_slice * x);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S_slice * arg (void) const;
 
   private:
@@ -58,9 +58,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_slice * arg (void);
 
   private:
@@ -85,9 +85,9 @@ namespace TAO
     Out_Var_Array_Argument_T (S_out x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_slice *& arg (void);
 
   private:
@@ -111,9 +111,9 @@ namespace TAO
     Ret_Var_Array_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_slice *& arg (void);
 
     S_slice * excp (void);
diff --git a/TAO/tao/Var_Array_SArgument_T.cpp b/TAO/tao/Var_Array_SArgument_T.cpp
index 216b9071d74..371d35cbe72 100644
--- a/TAO/tao/Var_Array_SArgument_T.cpp
+++ b/TAO/tao/Var_Array_SArgument_T.cpp
@@ -22,8 +22,6 @@ TAO::In_Var_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR &cdr)
   return cdr >> tmp;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_forany>
 void
 TAO::In_Var_Array_SArgument_T<S,S_forany>::interceptor_param (
@@ -34,8 +32,6 @@ TAO::In_Var_Array_SArgument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S, typename S_forany>
@@ -53,8 +49,6 @@ TAO::Inout_Var_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR & cdr)
   return cdr >> tmp;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_forany>
 void
 TAO::Inout_Var_Array_SArgument_T<S,S_forany>::interceptor_param (
@@ -65,8 +59,6 @@ TAO::Inout_Var_Array_SArgument_T<S,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S_slice, typename S_var, typename S_forany>
@@ -78,8 +70,6 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
   return cdr << S_forany (this->x_.ptr ());
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_slice, typename S_var, typename S_forany>
 void
 TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param (
@@ -90,8 +80,6 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S_slice, typename S_var, typename S_forany>
@@ -103,8 +91,6 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
   return cdr << S_forany (this->x_.ptr ());
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S_slice, typename S_var, typename S_forany>
 void
 TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
@@ -114,6 +100,4 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
   (*any) <<= S_forany (this->x_.ptr ());
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_VAR_ARRAY_SARGUMENT_T_C */
diff --git a/TAO/tao/Var_Array_SArgument_T.h b/TAO/tao/Var_Array_SArgument_T.h
index 70f5caad9fa..1c0e5a95752 100644
--- a/TAO/tao/Var_Array_SArgument_T.h
+++ b/TAO/tao/Var_Array_SArgument_T.h
@@ -35,9 +35,9 @@ namespace TAO
     In_Var_Array_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S & arg (void) const;
 
   private:
@@ -58,9 +58,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -80,9 +80,9 @@ namespace TAO
     Out_Var_Array_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_slice *& arg (void);
 
   private:
@@ -102,9 +102,9 @@ namespace TAO
     Ret_Var_Array_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S_slice *& arg (void);
 
   private:
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index 5d28dae9742..0445fa652f3 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_Var_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
   return cdr << *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -31,8 +29,6 @@ TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S>
@@ -49,8 +45,6 @@ TAO::Inout_Var_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -59,8 +53,6 @@ TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, typename S_out>
@@ -68,11 +60,13 @@ CORBA::Boolean
 TAO::Out_Var_Size_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
 {
   this->x_ = new S;
+
+  /*ACE_NEW_RETURN (this->x_,
+                  S,
+                  0); */
   return cdr >> *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_out>
 void
 TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param (
@@ -83,8 +77,6 @@ TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S, typename S_var>
@@ -99,8 +91,6 @@ TAO::Ret_Var_Size_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
   return cdr >> this->x_.inout ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_var>
 void
 TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
@@ -108,6 +98,4 @@ TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_VAR_SIZE_ARGUMENT_T_C */
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index 88b81297218..c7c0ccf3400 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -35,9 +35,9 @@ namespace TAO
     In_Var_Size_Argument_T (S const & x);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S & arg (void) const;
 
   private:
@@ -58,9 +58,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -80,9 +80,9 @@ namespace TAO
     Out_Var_Size_Argument_T (S_out x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -102,9 +102,9 @@ namespace TAO
     Ret_Var_Size_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
     S * excp (void);
diff --git a/TAO/tao/Var_Size_SArgument_T.cpp b/TAO/tao/Var_Size_SArgument_T.cpp
index 682b18ac6a3..bfca13434f6 100644
--- a/TAO/tao/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/Var_Size_SArgument_T.cpp
@@ -21,8 +21,6 @@ TAO::In_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
   return cdr >> *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -31,8 +29,6 @@ TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_IN;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ===========================================================
 
 template<typename S>
@@ -49,8 +45,6 @@ TAO::Inout_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
   return cdr >> *this->x_;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S>
 void
 TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
@@ -59,8 +53,6 @@ TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
   p.mode = CORBA::PARAM_INOUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ==============================================================
 
 template<typename S, typename S_var>
@@ -70,8 +62,6 @@ TAO::Out_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
   return cdr << this->x_.in ();
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 template<typename S, typename S_var>
 void
 TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param (
@@ -82,8 +72,6 @@ TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param (
   p.mode = CORBA::PARAM_OUT;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 // ============================================================
 
 template<typename S, typename S_var>
@@ -92,8 +80,6 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
 {
   return cdr << this->x_.in ();
 }
-#if TAO_HAS_INTERCEPTORS == 1
-
 
 template<typename S, typename S_var>
 void
@@ -102,6 +88,4 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
   (*any) <<= this->x_.in ();
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #endif /* TAO_VAR_SIZE_SARGUMENT_T_C */
diff --git a/TAO/tao/Var_Size_SArgument_T.h b/TAO/tao/Var_Size_SArgument_T.h
index 5f1cb0a7a3e..6ab8fcd6e4a 100644
--- a/TAO/tao/Var_Size_SArgument_T.h
+++ b/TAO/tao/Var_Size_SArgument_T.h
@@ -35,9 +35,9 @@ namespace TAO
     In_Var_Size_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     const S & arg (void) const;
 
   private:
@@ -58,9 +58,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S & arg (void);
 
   private:
@@ -80,9 +80,9 @@ namespace TAO
     Out_Var_Size_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
@@ -102,9 +102,9 @@ namespace TAO
     Ret_Var_Size_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
+
     virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
     S *& arg (void);
 
   private:
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index acec61525a9..2357c5fc611 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -27,7 +27,6 @@
 
 #include "WrongTransactionC.h"
 #include "tao/Typecode.h"
-#include "tao/SystemException.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
@@ -172,3 +171,4 @@ CORBA::Boolean operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index d6b3f067135..3196a475d79 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -32,7 +32,6 @@
 #include "WrongTransactionC.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.h"
-#include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -198,3 +197,4 @@ CORBA::Boolean operator>> (
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index 3111bc36f50..609ad113229 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -27,8 +27,6 @@
 #include "tao/Marshal.h"
 #include "tao/Any_Impl.h"
 #include "tao/CDR.h"
-#include "tao/SystemException.h"
-
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tao,
@@ -99,7 +97,7 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
         ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n")
       ));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -114,12 +112,12 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
   CORBA::TypeCode_var elem_tc;
 
   if (!(*src >> elem_tc.inout ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
+    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                       CORBA::COMPLETED_MAYBE),
                       TAO::TRAVERSE_STOP);
 
   if (!(*dest << elem_tc.in ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
+    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                       CORBA::COMPLETED_MAYBE),
                       TAO::TRAVERSE_STOP);
 
@@ -137,7 +135,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO_Marshal_Any::append detected error\n")));
 
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
+      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         TAO::TRAVERSE_STOP);
     }
@@ -258,7 +256,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                   ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
     }
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -344,7 +342,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
         ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n")
       ));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -387,7 +385,7 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Struct::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -678,7 +676,7 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -1122,7 +1120,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Alias::append detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -1176,7 +1174,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Except::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -1206,7 +1204,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_WString::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -1312,7 +1310,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Value::append detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 822d5499ad2..f38e43d31b7 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -37,8 +37,7 @@
 #include "tao/Typecode.h"
 
 #include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/UserException.h"
+#include "tao/Exception.h"
 
 #include "tao/NVList.h"
 
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index ef6ab5c28fb..1dd4d84c1a7 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -4,7 +4,6 @@
 #include "Wait_On_Read.h"
 #include "Wait_On_Reactor.h"
 #include "Wait_On_Leader_Follower.h"
-#include "Wait_On_LF_No_Upcall.h"
 #include "Exclusive_TMS.h"
 #include "Muxed_TMS.h"
 #include "Blocked_Connect_Strategy.h"
@@ -109,10 +108,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
         }
 
       else if (ACE_OS::strcasecmp (argv[curarg],
-                                   ACE_TEXT("-ORBClientConnectionHandler")) == 0
-               ||
-               ACE_OS::strcasecmp (argv[curarg],
-                                   ACE_TEXT("-ORBWaitStrategy")) == 0)
+                                   ACE_TEXT("-ORBClientConnectionHandler")) == 0)
         {
           curarg++;
           if (curarg < argc)
@@ -128,9 +124,6 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (name,
                                            ACE_TEXT("RW")) == 0)
                 this->wait_strategy_ = TAO_WAIT_ON_READ;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("MT_NOUPCALL")) == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_LF_NO_UPCALL;
               else
                 this->report_option_value_error (ACE_TEXT("-ORBClientConnectionHandler"), name);
             }
@@ -294,10 +287,6 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp
     ACE_NEW_RETURN (ws,
                     TAO_Wait_On_Reactor (transport),
                     0);
-  else if (this->wait_strategy_ == TAO_WAIT_ON_LF_NO_UPCALL)
-    ACE_NEW_RETURN (ws,
-                    TAO::Wait_On_LF_No_Upcall (transport),
-                    0);
   else
     {
       // = Leader follower model.
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 6dd566dd682..d1958ff4aeb 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -87,8 +87,7 @@ private:
   {
     TAO_WAIT_ON_LEADER_FOLLOWER,
     TAO_WAIT_ON_REACTOR,
-    TAO_WAIT_ON_READ,
-    TAO_WAIT_ON_LF_NO_UPCALL
+    TAO_WAIT_ON_READ
   };
 
   /// The wait-for-reply strategy.
diff --git a/TAO/tao/diffs/ObjectReferenceTemplate.diff b/TAO/tao/diffs/ObjectReferenceTemplate.diff
new file mode 100644
index 00000000000..318dd1a4816
--- /dev/null
+++ b/TAO/tao/diffs/ObjectReferenceTemplate.diff
@@ -0,0 +1,30 @@
+--- orig/ObjectReferenceTemplateC.h	Thu Feb  7 15:04:56 2002
++++ ObjectReferenceTemplateC.h	Fri Feb  8 11:23:31 2002
+@@ -23,7 +23,7 @@
+ #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
+ 
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "tao/corbafwd.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+@@ -32,6 +32,8 @@
+ #include "TAO_Export.h"
+ #include "OctetSeqC.h"
+ #include "StringSeqC.h"
++#include "ValueBase.h"
++#include "Exception.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+--- orig/ObjectReferenceTemplateC.cpp	Thu Feb  7 15:04:56 2002
++++ ObjectReferenceTemplateC.cpp	Fri Feb  8 11:23:01 2002
+@@ -24,6 +24,7 @@
+ #include "tao/Stub.h"
+ #include "tao/Invocation.h"
+ #include "tao/PortableInterceptor.h"
++#include "tao/ValueFactory.h"
+ 
+ #if TAO_HAS_INTERCEPTORS == 1
+ #include "tao/RequestInfo_Util.h"
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index d8d2e27a3e3..6aa3fab038f 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -5,21 +5,16 @@
 #include "ORB_Constants.h"
 #include "DynamicC.h"
 #include "Exception_Data.h"
-#include "SystemException.h"
-
 #include "ace/OS_NS_string.h"
 
-
 #if !defined (__ACE_INLINE__)
 # include "tao/operation_details.i"
 #endif /* ! __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            operation_details,
            "$Id$")
 
-
 CORBA::Exception *
 TAO_Operation_Details::corba_exception (const char *id
                                         ACE_ENV_ARG_DECL)
@@ -39,7 +34,7 @@ TAO_Operation_Details::corba_exception (const char *id
 
       if (exception == 0)
         {
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (0,
+          ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                               CORBA::COMPLETED_YES),
                             0);
         }
@@ -49,7 +44,7 @@ TAO_Operation_Details::corba_exception (const char *id
     }
 
   // If there are no matches return an unknown exception.
-  ACE_THROW_RETURN (CORBA::UNKNOWN (0,
+  ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_YES),
                     0);
 }
@@ -78,8 +73,6 @@ TAO_Operation_Details::demarshal_args (TAO_InputCDR &cdr)
   return true;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 bool
 TAO_Operation_Details::parameter_list (Dynamic::ParameterList &param_list)
 {
@@ -92,7 +85,6 @@ TAO_Operation_Details::parameter_list (Dynamic::ParameterList &param_list)
    return true;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
 
 bool
 TAO_Operation_Details::exception_list (Dynamic::ExceptionList &exception_list)
@@ -114,8 +106,6 @@ TAO_Operation_Details::exception_list (Dynamic::ExceptionList &exception_list)
 }
 
 
-#if TAO_HAS_INTERCEPTORS == 1
-
 bool
 TAO_Operation_Details::result (CORBA::Any *any)
 {
@@ -124,5 +114,3 @@ TAO_Operation_Details::result (CORBA::Any *any)
 
   return true;
 }
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index 5950a8b3235..7f217584581 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SystemException.h"
+#include "Exception.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -141,11 +141,9 @@ public:
    * the list of parameters passed by the operation, exceptions
    * declared for the operation, and the result when available.
    */
-  bool exception_list (Dynamic::ExceptionList &);
-#if TAO_HAS_INTERCEPTORS == 1
   bool parameter_list (Dynamic::ParameterList &);
+  bool exception_list (Dynamic::ExceptionList &);
   bool result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
   //@}
 
   /// Accessors for the argumet list
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index 15108839291..00e613ea836 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -26,8 +26,6 @@
 #include "Typecode.h"
 #include "Any_Impl.h"
 #include "tao/CDR.h"
-#include "SystemException.h"
-
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tao,
@@ -91,7 +89,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
             LM_DEBUG,
             ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n")
           ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
+      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         TAO::TRAVERSE_STOP);
     }
@@ -209,7 +207,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
             LM_DEBUG,
             ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n")
           ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
+      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         TAO::TRAVERSE_STOP);
     }
@@ -240,7 +238,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
             LM_DEBUG,
             ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n")
           ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
+      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         TAO::TRAVERSE_STOP);
     }
@@ -303,7 +301,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
             LM_DEBUG,
             ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n")
           ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
+      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         TAO::TRAVERSE_STOP);
     }
@@ -342,7 +340,7 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Struct::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -620,7 +618,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n")));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
+      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         TAO::TRAVERSE_STOP);
     }
@@ -857,7 +855,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Alias::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -907,7 +905,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Except::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -938,7 +936,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_WString::skip detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
@@ -1035,7 +1033,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Marshal_Value::skip detected error\n")));
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
+  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 34819bd2bfd..e4b9a2108b9 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_core {
+project(TAO) : acelib, taoversion, core, tao_output, taodefaults, extra_core {
   sharedname   = TAO
   dynamicflags = TAO_BUILD_DLL
 
@@ -77,8 +77,6 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
       CurrentC.cpp
       CurrentA.cpp
       Exception.cpp
-      SystemException.cpp
-      UserException.cpp
       WrongTransactionC.cpp
       WrongTransactionA.cpp
       Environment.cpp
@@ -204,7 +202,6 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
       Wait_On_Read.cpp
       Wait_On_Reactor.cpp
       Wait_On_Leader_Follower.cpp
-      Wait_On_LF_No_Upcall.cpp
       Transport_Mux_Strategy.cpp
       Exclusive_TMS.cpp
       Muxed_TMS.cpp
@@ -230,6 +227,7 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
       TAOA.cpp
       Object_Loader.cpp
       TAO_Singleton_Manager.cpp
+      DLL_ORB.cpp
       Adapter.cpp
       Services_Activate.cpp
       Service_Callbacks.cpp
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index 9c883a1d3f5..e9121e9442f 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -104,7 +104,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in admin:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 856abb57673..3a76569817e 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -248,7 +248,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp
index ba5fa487943..34a30ebcd40 100644
--- a/TAO/tests/AMI_Buffering/server.cpp
+++ b/TAO/tests/AMI_Buffering/server.cpp
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in server:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
index 3844d79fd15..e67492447d7 100644
--- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
+++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
@@ -1,40 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, valuetype {
-  idlflags += -Sc
-
-  IDL_Files {
-    test.idl
-  }
-
-  Source_Files {
+project(*client) : taoexe, portableserver {
+  source_files {
     client.cpp
-    testC.cpp
-  }
-
-  Header_Files {
-    testC.h
   }
 }
 
-project(*server) : taoexe, portableserver, valuetype {
-  idlflags += -Sc
-
-  IDL_Files {
-    test.idl
-  }
-
-  Source_Files {
+project(*server) : taoexe, portableserver {
+  source_files {
     server.cpp
     test_i.cpp
-    testC.cpp
-    testS.cpp
-  }
-
-  Header_Files {
-    test_i.h
-    testC.h
-    testS.h
   }
 }
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index e94a3250a79..d79cd191638 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -31,9 +31,9 @@ int
 Session::svc (void)
 {
   this->barrier_.wait ();
-  CORBA::ULong i = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
+
   ACE_TRY
     {
       // Use the same payload over and over
@@ -52,7 +52,7 @@ Session::svc (void)
       this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      for (; i != this->message_count_; ++i)
+      for (CORBA::ULong i = 0; i != this->message_count_; ++i)
         {
 #if 0
           if (i % 500 == 0)
@@ -84,10 +84,6 @@ Session::svc (void)
     }
   ACE_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) ERROR: Session::svc, "
-                          "send %d messages out of %d\n",
-                          i, message_count_));
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Session::svc - ");
       return -1;
     }
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index 12f3c2d7566..5b5c2e8ee44 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -23,20 +23,20 @@ Session_Control::~Session_Control (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Session_Control::~Session_control, "
-                  "good, all sessions did finish\n"));
+                  " good, all sessions did finish\n"));
     }
   else if (session_count_ != 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "ERROR: (%P|%t) Session_Control::~Session_control, "
-                  "%d sessions did not finish\n",
+                  " %d sessions did not finish\n",
                   this->session_count_));
     }
   else
     {
       ACE_ERROR ((LM_ERROR,
                   "ERROR: (%P|%t) Session_Control::~Session_control, "
-                  "some sessions failed\n"));
+                  " some sessions failed\n"));
     }
 }
 
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 8b8d51936b7..ff763eeff67 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -135,8 +135,6 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      ACE_DEBUG ((LM_DEBUG, "Building session list . . . "));
-
       Session_Control *session_control_impl;
       ACE_NEW_RETURN (session_control_impl,
                       Session_Control (peer_count),
@@ -158,10 +156,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       ACE_ASSERT (session_list.length () == peer_count);
- 
-      ACE_DEBUG ((LM_DEBUG, "done.\n"));
-      ACE_DEBUG ((LM_DEBUG, "Giving start signal . . . "));
-      
+
       CORBA::ULong j;
       for (j = 0; j != peer_count; ++j)
         {
@@ -183,7 +178,6 @@ main (int argc, char *argv[])
 
         }
 
-      ACE_DEBUG ((LM_DEBUG ,"done\n"));
       ACE_DEBUG ((LM_DEBUG, "Waiting for sessions . . . \n"));
       for (int k = 0;
            k != 300 && !session_control_impl->all_sessions_finished ();
@@ -201,7 +195,7 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      ACE_DEBUG ((LM_DEBUG, "All sessions finished, destroy session list . . .\n"));
+      ACE_DEBUG ((LM_DEBUG, "All sessions finished . . . \n"));
 
       for (j = 0; j != peer_count; ++j)
         {
@@ -210,13 +204,9 @@ main (int argc, char *argv[])
 
         }
 
-      ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n"));
-
       coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "Shutdown poa and orb . . .\n"));
-
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index 16c9a0bde8e..9bd550fdc91 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -35,9 +35,9 @@ Session::svc (void)
   /// Automatically decrease the reference count at the end of the
   /// thread
   PortableServer::ServantBase_var auto_decrement (this);
-  CORBA::ULong i = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
+
   ACE_TRY
     {
       // Use the same payload over and over
@@ -48,7 +48,7 @@ Session::svc (void)
       CORBA::ULong session_count =
         this->other_sessions_.length ();
 
-      for (; i != this->message_count_; ++i)
+      for (CORBA::ULong i = 0; i != this->message_count_; ++i)
         {
 #if 0
           if (i % 500 == 0)
@@ -81,10 +81,6 @@ Session::svc (void)
     }
   ACE_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) ERROR: Session::svc, "
-                          "send %d messages out of %d\n",
-                          i, message_count_));
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Session::svc - ");
       return -1;
     }
diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
index 828fa8ce052..76e18048de3 100644
--- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
+++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
@@ -1,14 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, amh {
+project(*Server): taoserver {
+  idlflags += -Gv -GH
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): taoserver, amh {
+project(*Client): taoserver {
   exename = client
+  idlflags += -Gv -GH
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Bug_1636_Regression/test.mpc b/TAO/tests/Bug_1636_Regression/test.mpc
index fff450cca15..194e1e090d1 100644
--- a/TAO/tests/Bug_1636_Regression/test.mpc
+++ b/TAO/tests/Bug_1636_Regression/test.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project (bug_1636_testclient) : taoexe, dynamicany, dynamicinterface, portableserver, minimum_corba {
+project (bug_1636_testclient) : taoexe, dynamicany, dynamicinterface, portableserver {
+   avoids += minimum_corba
    exename = client
 
    IDL_Files {
diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
index 828fa8ce052..76e18048de3 100644
--- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
+++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
@@ -1,14 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, amh {
+project(*Server): taoserver {
+  idlflags += -Gv -GH
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): taoserver, amh {
+project(*Client): taoserver {
   exename = client
+  idlflags += -Gv -GH
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index cb2d21ec0a3..08caf86c4a7 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -20,13 +20,10 @@
 #include "tao/ORB.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (CDR,
-           basic_types,
-           "$Id$")
+ACE_RCSID(CDR, basic_types, "$Id$")
 
 static int n = 4096;
 static int nloops = 100;
diff --git a/TAO/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp
index c9759652961..25880d656e7 100644
--- a/TAO/tests/Connection_Failure/client.cpp
+++ b/TAO/tests/Connection_Failure/client.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
 #include "testC.h"
-#include "tao/SystemException.h"
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Connection_Failure,
-           client,
-           "$Id$")
+ACE_RCSID(Connection_Failure, client, "$Id$")
 
 const char *ior =
   "corbaloc:iiop:192.3.47/10007/RandomObject";
diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h
index e9561c0d63b..9af4eb1293e 100644
--- a/TAO/tests/DynAny_Test/data.h
+++ b/TAO/tests/DynAny_Test/data.h
@@ -13,7 +13,6 @@
 
 
 #include "tao/ORB.h"
-#include "tao/Object.h"
 #include "tao/TC_Constants_Forward.h"
 
 class Data
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 80fb8ffc43a..320a7e98043 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -191,7 +191,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 8791dfa0c45..ef468b2c87b 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -128,7 +128,7 @@ main (int argc, char *argv[])
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "middle - event loop finished\n"));
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -137,7 +137,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in middle:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index d8eed8882c6..e630ffec6c7 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -121,7 +121,7 @@ main (int argc, char *argv[])
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "ping - event loop finished\n"));
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in ping:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index 530af043ca7..b0c343886d4 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -102,7 +102,7 @@ main (int argc, char *argv[])
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "server - event loop finished\n"));
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -110,7 +110,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in server:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/IDL_Test/array.idl b/TAO/tests/IDL_Test/array.idl
index 910bc04a740..aa940776ec9 100644
--- a/TAO/tests/IDL_Test/array.idl
+++ b/TAO/tests/IDL_Test/array.idl
@@ -72,14 +72,6 @@ module ABCModule
 typedef octet oa1[22];
 typedef octet oa2[22];
 
-// Test generation of Arg_Traits specialization for identical
-// arrays.
-interface array_args
-{
-  void all_arrays (in oa1 arg1,
-                   in oa2 arg2);
-};
-
 // This should generate unique _var and _forany types, but
 // also generate TAO_String_Manager as the element type for both.
 module string_array
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index 1711b12b175..2d6c4fbbdd8 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -23,8 +23,8 @@
 
 ACE_RCSID(Leader_Followers, client, "$Id$")
 
-// Name of file contains ior.
-static const char *IOR = "file://ior";
+  // Name of file contains ior.
+  static const char *IOR = "file://ior";
 
 // Number of client threads.
 static int number_of_client_threads = 3;
@@ -162,17 +162,17 @@ public:
     }
 
 private:
-  // server reference.
   test_var test_;
+  // server reference.
 
-  // Work counter.
   u_long work_so_far_;
+  // Work counter.
 
-  // Lock for work counter.
   TAO_SYNCH_MUTEX lock_;
+  // Lock for work counter.
 
+  u_long sleep_;
   // Small pause to avoid overrunning the server.
-  long sleep_;
 };
 
 class Event_Loop_Task : public ACE_Task_Base
@@ -225,14 +225,14 @@ public:
     }
 
 private:
-  // ORB reference.
   CORBA::ORB_var orb_;
+  // ORB reference.
 
-  // Event loop timeout counter.
   u_long event_loop_timeout_so_far_;
+  // Event loop timeout counter.
 
-  // Lock for event loop timeout counter.
   TAO_SYNCH_MUTEX lock_;
+  // Lock for event loop timeout counter.
 };
 
 int
diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp
index 345f699a8eb..a5cae37e11e 100644
--- a/TAO/tests/ORB_init/ORB_init.cpp
+++ b/TAO/tests/ORB_init/ORB_init.cpp
@@ -2,14 +2,10 @@
 // $Id$
 
 #include "tao/ORB.h"
-#include "tao/Object.h"
-#include "tao/SystemException.h"
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ORB_init,
-           ORB_init,
-           "$Id$")
+ACE_RCSID(ORB_init, ORB_init, "$Id$")
 
 // Valid test IOR.
 // Do not attempt to narrow the object represented by this IOR, nor
diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc
index bce316fb85d..fb932d28ff1 100644
--- a/TAO/tests/ORT/ORT.mpc
+++ b/TAO/tests/ORT/ORT.mpc
@@ -1,8 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project(Test_ORT_Server): taoexe, portableserver, objreftemplate, iorinterceptor {
+
+project(Test_ORT_Server): taoexe, portableserver {
   requires += interceptors
+  idlflags += -I$(TAO_ROOT) -Gv
 
   IDL_Files {
     ORT_test.idl
@@ -25,6 +27,7 @@ project(Test_ORT_Server): taoexe, portableserver, objreftemplate, iorinterceptor
 
 project(Test_ORT_Client): taoexe {
   requires += interceptors
+  idlflags += -I$(TAO_ROOT) -Gv
   after += Test_ORT_Server
 
   IDL_Files {
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp
index 45cb966bc7e..04b815f5a1f 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.cpp
+++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp
@@ -28,6 +28,7 @@ ObjectReferenceFactory::make_object (
     const char *repository_id,
     const PortableInterceptor::ObjectId & id
     ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (repository_id != 0);
 
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.h b/TAO/tests/ORT/ObjectReferenceFactory.h
index 2b487101520..6332380c8ab 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.h
+++ b/TAO/tests/ORT/ObjectReferenceFactory.h
@@ -58,7 +58,8 @@ class ObjectReferenceFactory
   virtual CORBA::Object_ptr make_object (
       const char *repository_id,
       const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
 protected:
diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 4ab858a5e46..fae4e0193ff 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -104,7 +104,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in admin:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 33061a3f815..b6fa9e179c8 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -216,7 +216,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index 6997308857d..f25cfe7e532 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/server.cpp
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in server:");
+                           "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
index c96018f073f..749786fdc8a 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA Default Servant): taoserver, minimum_corba {
+project(POA Default Servant): taoserver {
   exename = Default_Servant
+  avoids += minimum_corba
 }
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
index 6443ce82a36..1fcc6facae2 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
@@ -1,5 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, minimum_corba {
+project(POA*): taoexe, portableserver {
+  avoids += minimum_corba
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
index 621e3fb2e22..4ca2f8415ba 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
@@ -47,7 +47,7 @@ Client_Task::svc (void)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client task:");
+			                     "Exception caught:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
index 1133217c973..d879e719298 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
@@ -85,7 +85,7 @@ Server_Task::svc (void)
      sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
-     ACE_DEBUG ((LM_DEBUG, "server task - event loop finished\n"));
+     ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
@@ -96,7 +96,7 @@ Server_Task::svc (void)
  ACE_CATCHANY
    {
      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
+                          "Exception caught:");
      return 1;
    }
  ACE_ENDTRY;
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
index 5b93fd006af..441c641931d 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -1,8 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, iorinterceptor {
+project(*Server): taoexe, portableserver {
   requires += interceptors
+  idlflags += -I$(TAO_ROOT)
 
   Source_Files {
     test_i.cpp
@@ -14,6 +15,7 @@ project(*Server): taoexe, portableserver, iorinterceptor {
 
 project(*Client): taoexe {
   requires += interceptors
+  idlflags += -I$(TAO_ROOT)
 
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
index 886f561eeba..ce089af72fd 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
@@ -4,6 +4,7 @@
 
 project(*Server): taoexe, portableserver {
   requires += interceptors
+  idlflags += -I$(TAO_ROOT)
 
   Source_Files {
     test_i.cpp
@@ -14,6 +15,7 @@ project(*Server): taoexe, portableserver {
 }
 
 project(*Client): taoexe {
+  idlflags += -I$(TAO_ROOT)
 
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc b/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
index c2b9f291e3c..4f1e6863969 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
@@ -2,8 +2,9 @@
 //
 // $Id$
 
-project(*Server): taoexe, portableserver, iorinterceptor {
+project(*Server): taoexe, portableserver {
   requires += interceptors
+  idlflags += -I$(TAO_ROOT)
 
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
index 7138aa20720..2e4c9d4fd1f 100644
--- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -1,14 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver, rtcorba, minimum_corba {
+project(*client) : taoexe, portableserver, rtcorba {
+  avoids += minimum_corba
   source_files {
     client.cpp
     Custom_Network_Priority_Mapping.cpp
   }
 }
 
-project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba {
+project(*server) : taoexe, rtportableserver, rtcorba {
+  avoids += minimum_corba
   source_files {
     server.cpp
     Custom_Network_Priority_Mapping.cpp
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
index 10ba9a8a48f..5b41a9b0826 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
+++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, minimum_corba {
+project(*Server): strategies, rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, minimum_corba {
+project(*Client): strategies, rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index 0f82a323a72..16c54a31b82 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): rt_server, minimum_corba {
+project(*Server): rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): rt_client, minimum_corba {
+project(*Client): rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
index 10ba9a8a48f..5b41a9b0826 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, minimum_corba {
+project(*Server): strategies, rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, minimum_corba {
+project(*Client): strategies, rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index 0662db7fb4e..81573c2dfab 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): rt_server, minimum_corba {
+project(*Server): rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): taoexe, minimum_corba {
+project(*Client): taoexe {
+  avoids += minimum_corba
   requires += rt_corba
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc
index 1e97eefaee4..b4b68d36e7a 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.mpc
+++ b/TAO/tests/RTCORBA/Policies/Policies.mpc
@@ -1,5 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTCORBA Policies Server): rt_server, minimum_corba {
+project(RTCORBA Policies Server): rt_server {
+  avoids += minimum_corba
 }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index 49d690018fd..399abfea95e 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): rt_server, minimum_corba {
+project(*Server): rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
index 4cb4bcb6c23..6902d4a09fb 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
@@ -1,14 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, minimum_corba {
+project(*Server): strategies, rt_server {
+  avoids += minimum_corba
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, minimum_corba {
+project(*Client): strategies, rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index 0f82a323a72..16c54a31b82 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): rt_server, minimum_corba {
+project(*Server): rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): rt_client, minimum_corba {
+project(*Client): rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
index 81a533380b3..220bbb47171 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
@@ -1,11 +1,13 @@
 // $Id$
-project(*Server): rt_server, strategies, portableserver, minimum_corba {
+project(*Server): rt_server, strategies, portableserver {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): rt_client, strategies, portableserver, minimum_corba {
+project(*Client): rt_client, strategies, portableserver {
+  avoids += minimum_corba
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index a232f56b1af..12964d835bc 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -485,8 +485,6 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
       // Wait for the threads to exit.
       ACE_Thread_Manager::instance ()->wait ();
 
-      mutex->unlock ();
-
       CORBA::release (mutex);
 
     }
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index 10ba9a8a48f..5b41a9b0826 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -1,13 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, minimum_corba {
+project(*Server): strategies, rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, minimum_corba {
+project(*Client): strategies, rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index 4cb4bcb6c23..6902d4a09fb 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -1,14 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, minimum_corba {
+project(*Server): strategies, rt_server {
+  avoids += minimum_corba
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, minimum_corba {
+project(*Client): strategies, rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/utils/NamingViewer/BindDialog.h b/TAO/utils/NamingViewer/BindDialog.h
index afb39a5739f..a32ec385597 100644
--- a/TAO/utils/NamingViewer/BindDialog.h
+++ b/TAO/utils/NamingViewer/BindDialog.h
@@ -8,7 +8,7 @@
 // BindDialog.h : header file
 //
 #include "tao/corba.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 /////////////////////////////////////////////////////////////////////////////
 // CBindDialog dialog
 
diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h
index ac243f51b91..48f4c7073f3 100644
--- a/TAO/utils/NamingViewer/BindNewContext.h
+++ b/TAO/utils/NamingViewer/BindNewContext.h
@@ -7,7 +7,7 @@
 #endif // _MSC_VER > 1000
 // BindNewContext.h : header file
 //
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 /////////////////////////////////////////////////////////////////////////////
 // CBindNewContext dialog
 
diff --git a/TAO/utils/NamingViewer/NamingObject.h b/TAO/utils/NamingViewer/NamingObject.h
index 5dd5a1fed27..ce257320641 100644
--- a/TAO/utils/NamingViewer/NamingObject.h
+++ b/TAO/utils/NamingViewer/NamingObject.h
@@ -10,7 +10,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 class CNamingObject
 {
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.h b/TAO/utils/NamingViewer/NamingTreeCtrl.h
index 8c871ad3792..dcfe3b12a9c 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.h
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.h
@@ -7,7 +7,7 @@
 #endif // _MSC_VER > 1000
 // NamingTreeCtrl.h : header file
 //
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 class CNamingObject;
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/utils/NamingViewer/NamingViewer.mpc b/TAO/utils/NamingViewer/NamingViewer.mpc
index 372bff084c8..c0dfce20c2b 100644
--- a/TAO/utils/NamingViewer/NamingViewer.mpc
+++ b/TAO/utils/NamingViewer/NamingViewer.mpc
@@ -3,7 +3,6 @@
 
 project : namingexe, ace_mfc {
   exename    = NamingViewer
-  install    = $(ACE_ROOT)/bin
   pch_header = StdAfx.h
   pch_source = StdAfx.cpp
 
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
index fc741184c38..356f90237bd 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
@@ -4,7 +4,7 @@
 #include "NamingViewer.h"
 #include "NamingViewerDlg.h"
 #include "ViewIORDialog.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 #include "SelectNSDialog.h"
 
 #ifdef _DEBUG
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.h b/TAO/utils/NamingViewer/NamingViewerDlg.h
index fbda6676e4d..4ddbe2e6e36 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.h
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.h
@@ -9,7 +9,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "NamingTreeCtrl.h"
 /////////////////////////////////////////////////////////////////////////////
 // CNamingViewerDlg dialog
diff --git a/TAO/utils/catior/catior.mpc b/TAO/utils/catior/catior.mpc
index 6bb4ff143fc..6c5ed2405a2 100644
--- a/TAO/utils/catior/catior.mpc
+++ b/TAO/utils/catior/catior.mpc
@@ -1,4 +1,4 @@
 // $Id$
-project : taoexe, rtcorba, core {
+project : taoexe, rtcorba {
   install = $(ACE_ROOT)/bin
 }
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index a177230a856..591998b48cd 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -17,7 +17,7 @@
 //
 // ================================================================
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
@@ -96,11 +96,11 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj;
-      if (ior)
-        {
-          obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      if(ior)
+      {
+         obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      }
 
       CORBA::Object_var nc_obj =
         orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 9905c6b40f7..0d913af8c7f 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -17,7 +17,7 @@
 //
 // ================================================================
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
@@ -26,14 +26,12 @@ CORBA::ORB_var orb;
 int showIOR = 0;
 int showNSonly = 0;
 
-const char* USAGE = "Usage: %s [ --name <name> ] [--destroy]\n";
 int
 main (int argc, char *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
   int i;
-  int destroy_after_unbind = 0;
   ACE_TRY
     {
       CORBA::ORB_var orb =
@@ -57,13 +55,10 @@ main (int argc, char *argv[])
               argv++;
               name = *argv;
             }
-          else if (ACE_OS::strcmp (*argv, "--destroy") == 0)
-            {
-              destroy_after_unbind = 1;
-            }
           else if (ACE_OS::strncmp(*argv, "--", 2) == 0)
             {
-              ACE_DEBUG ((LM_DEBUG, USAGE, pname));
+              ACE_DEBUG ((LM_DEBUG,
+                          "Usage: %s [ --name <name> ]\n", pname));
               return 1;
             }
           argc--;
@@ -72,7 +67,8 @@ main (int argc, char *argv[])
 
       if (name == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, USAGE, pname));
+          ACE_DEBUG ((LM_DEBUG,
+                      "Usage: %s [ --name <name> ]\n", pname));
           return 1;
         }
         // make a copy
@@ -139,19 +135,7 @@ main (int argc, char *argv[])
       the_name[ntoks - 1].id = CORBA::string_dup (lastname);
       if (kind != 0)
         the_name[ntoks - 1].kind = CORBA::string_dup (kind);
-
-      // This needs to be bounded by a try/catch
-      CORBA::Object_var the_context = root_nc->resolve (the_name ACE_ENV_ARG_PARAMETER);
       root_nc->unbind (the_name ACE_ENV_ARG_PARAMETER );
-
-      if (destroy_after_unbind)
-        {
-          CosNaming::NamingContext_var nc =
-            CosNaming::NamingContext::_narrow (the_context.in () ACE_ENV_ARG_PARAMETER);
-          if (! CORBA::is_nil(nc.in()))
-            nc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        }
-
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index 46acd2d6b4a..5f082199fee 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -15,7 +15,7 @@
 
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "tao/Endpoint.h"
 #include "tao/Profile.h"
 #include "tao/Stub.h"
@@ -37,7 +37,7 @@ get_tag_name (CORBA::ULong tag, ACE_CString& tag_string)
 {
   if (tag == IOP::TAG_INTERNET_IOP)
       tag_string = "IIOP";
-  else if (tag == TAO_TAG_UIOP_PROFILE)
+  else if (tag == TAO_TAG_UIOP_PROFILE)  
       tag_string = "UIOP";
   else if (tag == TAO_TAG_SHMEM_PROFILE)
       tag_string = "SHMEM";
@@ -53,11 +53,6 @@ get_tag_name (CORBA::ULong tag, ACE_CString& tag_string)
 static void
 display_endpoint_info (CORBA::Object_ptr obj)
 {
-  if (CORBA::is_nil (obj))
-    {
-      ACE_DEBUG ((LM_DEBUG, "Nil\n"));
-      return;
-    }
 
   TAO_Stub *stub = obj->_stubobj ();
   if (!stub)
@@ -254,7 +249,7 @@ main (int argc, char *argv[])
           else if (ACE_OS::strcmp (*argv, "--ctxior") == 0)
             {
               showCtxIOR = 1;
-            }
+            }          
           else if (ACE_OS::strncmp (*argv, "--", 2) == 0)
             {
               ACE_DEBUG ((LM_DEBUG, "Usage: %s [[ --ior ][ --ctxior ] | --nsior ]\n", pname));
diff --git a/TAO/utils/nslist/nslist.mpc b/TAO/utils/nslist/nslist.mpc
index 4b8ee5c03d7..e58be6bfc62 100644
--- a/TAO/utils/nslist/nslist.mpc
+++ b/TAO/utils/nslist/nslist.mpc
@@ -1,22 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(nsadd): namingexe, core {
-  install = $(ACE_ROOT)/bin
+project(nsadd): namingexe {
   Source_Files {
     nsadd.cpp
   }
 }
 
-project(nsdel): namingexe, core {
-  install = $(ACE_ROOT)/bin
+project(nsdel): namingexe {
   Source_Files {
     nsdel.cpp
   }
 }
 
-project(nslist): namingexe, core {
-  install = $(ACE_ROOT)/bin
+project(nslist): namingexe {
   Source_Files {
     nslist.cpp
   }
diff --git a/TAO/utils/nslist/run_test.pl b/TAO/utils/nslist/run_test.pl
index 6d9b1032d1f..b2d30bbade3 100755
--- a/TAO/utils/nslist/run_test.pl
+++ b/TAO/utils/nslist/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-# This is a Perl script that runs some Naming Service tests.
+# This is a Perl script that runs some Naming Service tests.  
 # It runs all the tests that will run with min CORBA.
 # It starts all the servers and clients as necessary.
 
@@ -19,8 +19,8 @@ use PerlACE::Run_Test;
 my $iorfile = PerlACE::LocalFile ("ns.ior");
 my $NS = new PerlACE::Process ("../../orbsvcs/Naming_Service/Naming_Service");
 my $CL = new PerlACE::Process ("../../orbsvcs/tests/Simple_Naming/client");
-my $LS = new PerlACE::Process ("../../../bin/nslist");
-my $AD = new PerlACE::Process ("../../../bin/nsadd");
+my $LS = new PerlACE::Process ("nslist");
+my $AD = new PerlACE::Process ("nsadd");
 my $status = 0;
 
 
@@ -37,7 +37,7 @@ sub name_server
 
     if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
         print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-        $NS->Kill ();
+        $NS->Kill (); 
         exit 1;
     }
 }
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
index f8e11f06a4e..3cf4f449e3f 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
@@ -8,7 +8,7 @@
 #include "wxNamingViewerFrame.h"
 
 #include "wx/clipbrd.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
 #include "wxNamingViewer.h"
 #include "wxSelectNSDialog.h"
 #include "ace/SString.h"
diff --git a/THANKS b/THANKS
index 17c3cd11f81..eb0bbfb6035 100644
--- a/THANKS
+++ b/THANKS
@@ -61,9 +61,8 @@ Gabriele Trombetti <gabtromb at isis dot vanderbilt dot edu>
 Emre Turkay <turkaye at dre dot vanderbilt dot edu>
 Nanbor Wang <nanbor at cs dot wustl dot edu>
 Seth Widoff <sbw1 at cs dot wustl dot edu>
-Jules White <jules at dre dot vanderbilt dot edu>
 Torben Worm <tworm at cs dot wustl dot edu>
-
+Gabriele Trombetti <gabtromb at isis dot vanderbilt dot edu>
 
 I would also like to thank all the following people who have also
 contributed to ACE and TAO over the years:
@@ -291,6 +290,7 @@ Dave Moore <dave dot moore at gecm dot com>
 Joseph Cross <joseph dot k dot cross at lmco dot com>
 Cherif Sleiman <sleiman at research dot moore dot com>
 Stefan Ericsson <Stefan dot Ericsson at osd dot uab dot ericsson dot se>
+Wei Chiang <wei dot chiang at horizon dot ntc dot nokia dot com>
 Thanh Ma <tma at encore dot com>
 Oleg Krivosheev <kriol at fnal dot gov>
 Stephen Coy <stevec at wsa dot com dot au>
@@ -319,6 +319,7 @@ Mike Kamrad <J dot M dot KAMRAD dot II at cdev dot com>
 Marios Zikos <zikos at csi dot forth dot gr>
 Mark L Boriack <mboriack at dctc dot saic dot com>
 Mark Hyett <mhyett at dctd dot saic dot com>
+Caleb Epstein <epstein_caleb_unix at jpmorgan dot com>
 Valik Solrzano Barboza <valik at xs4all dot nl>
 John Connett <jrc at skylon dot demon dot co dot uk>
 Tom Arbuckle <arbuckle at uran dot informatik dot uni-bonn dot de>
@@ -364,6 +365,7 @@ Paul von Behren <Paul_von_Behren at stortek dot com>
 Sudish Joseph <sj at eng dot mindspring dot net>
 Loren Rittle <rittle at comm dot mot dot com>
 Alexander Ovsiankin <sasha at technologist dot com>
+Fred Kuhns <fredk at arl dot wustl dot edu>
 Ravi Nagabhyru <ravi at future-minds dot com>
 Tom Brusehaver <tgb at cozy dot netco dot com>
 Dave Tallman <tallman at acsys dot com>
@@ -411,6 +413,7 @@ Jeff Franks <Jeffrey_Franks at i-o dot com>
 John Mulhern <9107 at mn3 dot lawson dot lawson dot com>
 Johan Lundin <johan at lundin dot com>
 Eric Powers <powerg at deltanet dot com>
+Zheng Han <zhan at glenvan dot glenayre dot com>
 Gabriel Lima <gali at enea dot se>
 Doug Anderson <dla at home dot com>
 Hongyin Quan <hq1 at arl dot wustl dot edu>
@@ -439,6 +442,7 @@ Dongwook Kim <baksoo at dbserver dot kaist dot ac dot kr>
 Don Davis <ded at heart dot jhuapl dot edu>
 Alberto Villarica <Alberto dot Villarica dot rav at nt dot com>
 XuYifeng <xuyf at pop dot zg169 dot net>
+Ossama Othman <othman at astrosun dot tn dot cornell dot edu>
 Tom Shields <Shields at MarsHotel dot CMPU dot NET>
 Krishna Padmasola <pkrishna at cybercash dot co dot in>
 Andre Folkers <folkers at informatik dot mu-luebeck dot de>
@@ -592,6 +596,7 @@ Jaepil Kim <jpkim at lgsoft dot com>
 Dmitry Goldshtain <goldstein at arcormail dot de>
 Carl Grinstead <grinstea at tsunami dot com>
 Henric Jungheim <junghelh at pe-nelson dot com>
+Konstantinos Margaritis <kmargar at cc dot uoa dot gr>
 Michael Preobrazhensky <mikep at xpedite dot com>
 Gregory D dot  Fee <gdf2 at cec dot wustl dot edu>
 Roland Gigler <roland at mch dot pn dot siemens dot de>
@@ -759,6 +764,7 @@ Yosi Sarusi <yosi at appstream dot com>
 Robert Shewan <rshew at peri dot com>
 Skye Sweeney <ssweeney at sanders dot com>
 Lars Immisch <lars at ibp dot de>
+Adrian Mercieca <adrian at anvil dot co dot uk>
 Stefan Wendt <wendts at stud dot fh-luebeck dot de>
 Herbert <herbert at shym dot com>
 Clarence Bishop <clarence dot bishop at na dot marconicomms dot com>
@@ -821,6 +827,7 @@ Bruce Alderson <balderso at triant dot com>
 Christoph Poggemann <Christoph dot Poggemann at ptv dot de>
 Travis Shirk <travis at pobox dot com>
 Alain Sauron <sauron at syseca dot thomson-csf dot com>
+Yury Kuznesov <yury at websci dot ru>
 David Delano <delanod at agcs dot com>
 Boris Sukholitko <boriss at richfx dot com>
 Brian Mason <bmason at oresis dot com>
@@ -870,7 +877,7 @@ Pierre Oberson <oberson at nagra-kudelski dot ch>
 Chris Uzdavinis <chris at atdesk dot com>
 Ishay Green <ishaygreen at hotmail dot com>
 Andrey Nechypurenko <andreynech at yahoo dot com>
-Charlie Duke <cduke at fvc dot com>
+Charlie Duke <cduke at cuseeme dot com>
 Jonathan Luellen <jluellen at scires dot com>
 Andrew Psaltis <apsaltis at mho dot net>
 Erik Jones <ej at pcslink dot com>
@@ -947,6 +954,7 @@ Ralph Loader <suckfish at ihug dot co dot nz>
 Ji Wuliu <jiwuliu0952_cn at sina dot com>
 Wada Hiroshi <syu- at yhb dot att dot ne dot jp>
 Sal Amander <virgis at megagis dot lt>
+Bill Tonseth <tonseth at shamra dot mv dot com>
 Torsten Pfuetzenreuter <torsten_pf at geocities dot com>
 John M dot  Mills <jmills at tga dot com>
 David McWeeny <davemcw at tr dot comm dot mot dot com>
@@ -978,6 +986,7 @@ Michael Laing <mpl at flni dot com>
 Benoit Viaud <benoit dot viaud at artal dot fr>
 Ken Weinert <kenw at ihs dot com>
 Ferran Boladeres Salvad <salvadof at iis dot fhg dot de>
+Bill Tonseth <tonseth at shamra dot mv dot com>
 Steve Vranyes <steve dot vranyes at veritas dot com>
 Jim Melton <Jim dot Melton at lmco dot com>
 Ron Klein <rklein at west dot raytheon dot com>
@@ -1095,6 +1104,7 @@ Joachim Tremouroux <joachim dot tremouroux at microresearch dot be>
 Momchil Velikov <velco at fadata dot bg>
 Munagala Ramanath <amberarrow at yahoo dot com>
 Kevin Marshall <KCMarshall at att dot net>
+Adrian Mercieca <adrian at anvil dot co dot uk>
 David Channon <djc at uq dot net dot au>
 Andy Guy <andy at emory dot demon dot co dot uk>
 Oscar Rodriquez <Oscar dot Rodriquez at eln dot ericsson dot se>
@@ -1104,6 +1114,7 @@ Paul Rubel <prubel at bbn dot com>
 Jon Loeliger <jloeliger at chiaro dot com>
 Ricardo Chan <ricchan at nortelnetworks dot com>
 Sarabjeet Duhra <sarabjeet_duhra at hp dot com>
+Sathish Tiptur <Sathish dot Tiptur at geind dot ge dot com>
 Michael Rushton <miker at mbmnz dot co dot nz>
 Arno Pernozzoli <a dot bernicchia at tiscalinet dot it>
 Calum Mitchell <calum dot mitchell at cp dot net>
@@ -1190,6 +1201,7 @@ Carsten Madsen <com at navicon dot dk>
 David Sperry <sperryd at res dot raytheon dot com>
 Ted Horst <Ted dot Horst at ubsw dot com>
 Diana Arroyo <darroyo at infoglide dot com>
+Peter Phillips <pphillip at home dot com>
 Benny Prijono <bennylp at switchlab dot net>
 Roland Ziegler <zi at ave-web dot de>
 Stelios Sfakianakis <ssfak at ics dot forth dot gr>
@@ -1198,7 +1210,7 @@ Brian Gilmer <Brian dot Gilmer at jhuapl dot edu>
 James Dunham <James dot Dunham at esecurityinc dot com>
 Juergen Pfreundt <Juergen dot Pfreundt at gft dot com>
 Joel Sherrill <joel at OARcorp dot com>
-Jules Colding <jules at tdcadsl dot dk>
+Jules Colding <dsl11814 at vip dot cybercity dot dk>
 Stephane Pion <PION_Stephane at stna dot dgac dot fr>
 Raghu Narayan <raghu_narayan at non dot hp dot com>
 Richard Goold <rgoold at inexum dot com>
@@ -1279,6 +1291,7 @@ Jenny Kowald <jkowald at oz dot agile dot tv>
 Oren Zeev-Ben-Mordehai <oren at phonedo dot com>
 Holger P dot  Krekel <krekel at merlinux dot de>
 Glenn Popelka <gpp at gpopelka dot com>
+Marco Kranawetter <Marco dot Kranawetter at icn dot siemens dot de>
 Tibor Kiss <tkiss at mindmaker dot hu>
 Robert Davidson <robert at rdavidson dot freeserve dot co dot uk>
 Peter Crowther <peter dot crowther at networkinference dot com>
@@ -1316,8 +1329,9 @@ Eamonn Saunders <Esaunders at softricity dot com>
 Yev Omenzel <omenzel at yahoo dot com>
 John E Hein <jhein at timing dot com>
 Tino Schwarze <tino dot schwarze at informatik dot tu-chemnitz dot de>
+Don Hinton <dhinton at ieee dot org>
 Gergely Timar <timarok at elender dot hu>
-Peter Phillips <pphillip at home dot com>
+Peter Phillips <pphillip at opentext dot com>
 Yury Kuznesov <yury at newst dot net>
 Daniel Manfis <dany_100 at yahoo dot com>
 Massimo Pichini <massimo at webbridges dot it>
@@ -1492,6 +1506,7 @@ Kevin Heifner <heifner_k at ociweb dot com>
 James Haiar <haiar at ll dot mit dot edu>
 Pavel Repin <pavel at repin dot com>
 Whitney Kew <Whitney dot Kew at Invensys dot com>
+Jaroslaw Nozderko <jarek at eko dot net dot pl>
 Tom Phan <tomp at telhub dot com>
 Andrew Guy <andrew dot guy at monis dot com>
 Bharathi Kangatharan <bharathi dot kangatharan at baesystems dot com>
@@ -1521,6 +1536,7 @@ Marek Maleta <marek_maleta at agilent dot com>
 David Smith <dts at prismtechnologies dot com>
 Dimitrije Jankovic <djankov99 at yahoo dot com>
 Frank O dot  Flemisch <f dot o dot flemisch at larc dot nasa dot gov>
+Ken Sedgwick <ken at bonsai dot com>
 Cary Steinmetz <cary dot s dot steinmetz at boeing dot com>
 Ty Tenait <tytenait at yahoo dot com>
 Nitin Mallya <Nitin dot Mallya at med dot ge dot com>
@@ -1690,6 +1706,7 @@ Nick Lewycky <nicholas at fresco dot org>
 Ira Burton <imburton at micron dot com>
 Thomas Wiegert <wiegert at schlund dot de>
 Craig Watcham <craigw at ananzi dot co dot za>
+Roland Meub <roland dot meub at gmx dot de>
 Pit Linnartz <Pit dot Linnartz at t-mobile dot de>
 Peder Norgaard <pcn at pogt dot dk>
 David Ohlemacher <ohlemacher at bbn dot com>
@@ -1718,6 +1735,7 @@ Danta Cannarozzi <djc2 at cse dot wustl dot edu>
 Valery Salamakha <ccapstan at bigpond dot net dot au>
 Karim Fodil-Lemelin <kfl at xiphos dot ca>
 Wenlong Tang <tang_long at hotmail dot com>
+Marek Brudka <M dot Brudka at elka dot pw dot edu dot pl>
 Manish Jain <majain at hss dot hns dot com>
 Robin Farine <robin dot farine at acn-group dot ch>
 Roland Schimmack <SC at ProCom dot de>
@@ -1771,6 +1789,7 @@ Gary Maxey <gary dot maxey at hp dot com>
 Yoav Borer <yoav dot borer at data-pod dot com>
 Andre Kleibeuker <kleibeuk at natlab dot research dot philips dot com>
 Andy Bellafaire <Andy_M_Bellafaire at raytheon dot com>
+Pierre Pacchioni <pierre dot pacchioni at avisto dot com>
 John Fletcher <john dot fletcher at rd dot bbc dot co dot uk>
 Terry Ware <terry dot ware at dc dot alphatech dot com>
 Pierre Pacchioni <pierre dot pacchioni at avisto dot com>
@@ -1807,7 +1826,7 @@ Daniel Buchs <acelib at dbux dot ch>
 Matt Murphy <murphym at cs dot uri dot edu>
 Brian Nelson <pyro at debian dot org>
 Avi Ouziel <ouziel_a at hotmail dot com>
-Matthew Gillen <mgillen at bbn dot com>
+Matthew Gillen <gillen at ohio dot edu>
 Chris Reed <cr at apama dot com>
 Andrew Reid <andrew dot reid at eservglobal dot com>
 Praveen Sharma <psharma at bbn dot com>
@@ -1888,24 +1907,11 @@ Dave Knox <david dot knox at Intrado dot com>
 Lance Paine <lance at ams dot co dot nz>
 Brian Waltersdorf <brian dot j dot waltersdorf at boeing dot com>
 Johann Kandlbauer <hkandl at gamed dot com>
-Adam Rymarczuk <adam dot rymarczuk at suntradingllc dot com>
+Adam Rymarczuk <adam dot rymarczuk at suntradingllc dot com> 
 Heiko Nardmann <heiko dot nardmann at secunet dot com>
 J. Abelardo Gutierrez <jabelardo at cantv dot net>
 Roger Sala <Roger dot Sala at gd-ais dot com>
 Raz Ben-Yehuda <raz dot b at corigin dot com>
-Geo Sebastian <geosebastian at onmobile dot com>
-Simon Massey <simon dot massey a tprismtechnologies dot com>
-Rich Shapiro <rshapiro at bbn dot com>
-Ramiro Morales <rm0 at gmx dot net>
-Andrew Athan <aathan-ace-bugs-1524 at cloakmail dot com>
-Sebastien Roy <sroy at positron dot qc dot ca>
-Matthew Townsend <mtownsen at harris dot com>
-Rick Robinson <rick at oyarsa dot com>
-John D. Robertson <john at rrci dot com>
-Paul Lew <paullew at cisco dot com>
-Eider Oliveira <eider at oliveira dot gmail at com>
-Jeff Jones <jjones at zonetrading dot com>
-Jean-Christophe Cota <jean-christophe dot cota at eurocontrol dot int>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 60a97d33f87..4db8c1ead1d 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -31,28 +31,21 @@
 #  include "ace/OS_NS_poll.h"
 #endif /* ACE_HAS_POLL  && ACE_HAS_LIMITED_SELECT */
 
+ACE_RCSID(ace, ACE, "$Id$")
 
-ACE_RCSID (ace,
-           ACE,
-           "$Id$")
+  // Static data members.
 
+// Keeps track of whether we're in some global debug mode.
+char ACE::debug_ = 0;
 
-namespace ACE
-{
-  // private:
-  //  Used internally so not exported.
-
-  // Size of allocation granularity.
-  size_t allocation_granularity_ = 0;
+// Hex characters.
+const ACE_TCHAR ACE::hex_chars_[] = ACE_LIB_TEXT ("0123456789abcdef");
 
-  // Size of a VM page.
-  size_t pagesize_ = 0;
-
-  // Are we debugging ACE?
-  // Keeps track of whether we're in some global debug mode.
-  char debug_;
-}
+// Size of a VM page.
+size_t ACE::pagesize_ = 0;
 
+// Size of allocation granularity.
+size_t ACE::allocation_granularity_ = 0;
 
 int
 ACE::out_of_handles (int error)
@@ -154,18 +147,6 @@ ACE::compiler_beta_version (void)
 #endif
 }
 
-char
-ACE::debug (void)
-{
-  return ACE::debug_;
-}
-
-void
-ACE::debug (char c)
-{
-  ACE::debug_ = c;
-}
-
 int
 ACE::select (int width,
              ACE_Handle_Set *readfds,
@@ -416,64 +397,60 @@ ACE::hash_pjw (const wchar_t *str)
  * SUCH DAMAGE.
  */
 
-namespace ACE
-{
-  u_long crc_table_[] =
-    {
-      0x0,
-      0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
-      0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
-      0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
-      0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x5f15adac,
-      0x5bd4b01b, 0x569796c2, 0x52568b75, 0x6a1936c8, 0x6ed82b7f,
-      0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, 0x709f7b7a,
-      0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
-      0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58,
-      0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033,
-      0xa4ad16ea, 0xa06c0b5d, 0xd4326d90, 0xd0f37027, 0xddb056fe,
-      0xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
-      0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0xe13ef6f4,
-      0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
-      0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5,
-      0x2ac12072, 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
-      0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, 0x7897ab07,
-      0x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, 0x6f52c06c,
-      0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1,
-      0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
-      0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b,
-      0xbb60adfc, 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698,
-      0x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, 0x902b669d,
-      0x94ea7b2a, 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
-      0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, 0xc6bcf05f,
-      0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
-      0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80,
-      0x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
-      0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x5c007b8a,
-      0x58c1663d, 0x558240e4, 0x51435d53, 0x251d3b9e, 0x21dc2629,
-      0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, 0x3f9b762c,
-      0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
-      0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e,
-      0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65,
-      0xeba91bbc, 0xef68060b, 0xd727bbb6, 0xd3e6a601, 0xdea580d8,
-      0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
-      0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, 0xae3afba2,
-      0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
-      0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74,
-      0x857130c3, 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
-      0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, 0x7b827d21,
-      0x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, 0x6c47164a,
-      0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, 0x18197087,
-      0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
-      0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d,
-      0x2056cd3a, 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce,
-      0xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb,
-      0xdbee767c, 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
-      0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, 0x89b8fd09,
-      0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
-      0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf,
-      0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
-    };
-}
+u_long ACE::crc_table_[] =
+{
+  0x0,
+  0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
+  0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
+  0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
+  0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x5f15adac,
+  0x5bd4b01b, 0x569796c2, 0x52568b75, 0x6a1936c8, 0x6ed82b7f,
+  0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, 0x709f7b7a,
+  0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+  0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58,
+  0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033,
+  0xa4ad16ea, 0xa06c0b5d, 0xd4326d90, 0xd0f37027, 0xddb056fe,
+  0xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
+  0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0xe13ef6f4,
+  0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
+  0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5,
+  0x2ac12072, 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
+  0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, 0x7897ab07,
+  0x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, 0x6f52c06c,
+  0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1,
+  0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+  0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b,
+  0xbb60adfc, 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698,
+  0x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, 0x902b669d,
+  0x94ea7b2a, 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
+  0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, 0xc6bcf05f,
+  0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
+  0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80,
+  0x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
+  0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x5c007b8a,
+  0x58c1663d, 0x558240e4, 0x51435d53, 0x251d3b9e, 0x21dc2629,
+  0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, 0x3f9b762c,
+  0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+  0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e,
+  0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65,
+  0xeba91bbc, 0xef68060b, 0xd727bbb6, 0xd3e6a601, 0xdea580d8,
+  0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
+  0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, 0xae3afba2,
+  0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
+  0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74,
+  0x857130c3, 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
+  0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, 0x7b827d21,
+  0x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, 0x6c47164a,
+  0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, 0x18197087,
+  0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+  0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d,
+  0x2056cd3a, 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce,
+  0xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb,
+  0xdbee767c, 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
+  0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, 0x89b8fd09,
+  0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
+  0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf,
+  0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
 
 // Compute a POSIX 1003.2 checksum.  The routine takes an string and
 // computes the CRC for it (it stops on the first '\0' character).
@@ -2698,20 +2675,16 @@ ACE::timestamp (ACE_TCHAR date_and_time[],
   ACE_OS::strsncpy (date_and_time,
                     timebuf,
                     date_and_timelen);
-  ACE_TCHAR yeartmp[5];
+  char yeartmp[5];
   ACE_OS::strsncpy (yeartmp,
                     &date_and_time[20],
                     5);
-  ACE_TCHAR timetmp[9];
+  char timetmp[9];
   ACE_OS::strsncpy (timetmp,
                     &date_and_time[11],
                     9);
   ACE_OS::sprintf (&date_and_time[11],
-#  if defined (ACE_USES_WCHAR)
-                   ACE_LIB_TEXT ("%ls %ls.%06ld"),
-#  else
-                   ACE_LIB_TEXT ("%s %s.%06ld"),
-#  endif /* ACE_USES_WCHAR */
+                   "%s %s.%06ld",
                    yeartmp,
                    timetmp,
                    cur_time.usec ());
@@ -3118,8 +3091,7 @@ ACE::max_handles (void)
 // Otherwise, set it to be the value of NEW_LIMIT.
 
 int
-ACE::set_handle_limit (int new_limit,
-                       int increase_limit_only)
+ACE::set_handle_limit (int new_limit)
 {
   ACE_TRACE ("ACE::set_handle_limit");
   int cur_limit = ACE::max_handles ();
@@ -3147,7 +3119,6 @@ ACE::set_handle_limit (int new_limit,
     }
   else if (new_limit > cur_limit)
     {
-      // Increase the limit.
 #if !defined (ACE_LACKS_RLIMIT) && defined (RLIMIT_NOFILE)
       rl.rlim_cur = new_limit;
       return ACE_OS::setrlimit (RLIMIT_NOFILE, &rl);
@@ -3156,9 +3127,8 @@ ACE::set_handle_limit (int new_limit,
       ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_LACKS_RLIMIT */
     }
-  else if (increase_limit_only == 0)
+  else
     {
-      // Decrease the limit.
 #if !defined (ACE_LACKS_RLIMIT) && defined (RLIMIT_NOFILE)
       rl.rlim_cur = new_limit;
       return ACE_OS::setrlimit (RLIMIT_NOFILE, &rl);
@@ -3170,7 +3140,11 @@ ACE::set_handle_limit (int new_limit,
 #endif /* ACE_LACKS_RLIMIT */
     }
 
-  return 0;
+  // Irix complains without this return statement.  DEC cxx
+  // (correctly) says that it's not reachable.  ACE_NOTREACHED won't
+  // work here, because it handles both platforms the same.
+  // IRIX does not complain anymore [7.2]
+  ACE_NOTREACHED (return 0);
 }
 
 int
@@ -3371,52 +3345,6 @@ ACE::sock_error (int error)
 #endif /* ACE_WIN32 */
 }
 
-bool
-ACE::is_sock_error (int error)
-{
-#if defined (ACE_WIN32)
-  switch (error)
-    {
-    case WSAVERNOTSUPPORTED:
-    case WSASYSNOTREADY:
-    case WSAEINVAL:
-    case WSAHOST_NOT_FOUND:
-    case WSATRY_AGAIN:
-    case WSANO_RECOVERY:
-    case WSANO_DATA:
-      /*
-        case WSANO_ADDRESS:
-      */
-    case WSANOTINITIALISED:
-    case WSAENETDOWN:
-    case WSAEINPROGRESS:
-    case WSAEINTR:
-    case WSAEAFNOSUPPORT:
-    case WSAEMFILE:
-    case WSAENOBUFS:
-    case WSAEPROTONOSUPPORT:
-    case WSAEPROTOTYPE:
-    case WSAESOCKTNOSUPPORT:
-    case WSAENOTSOCK:
-    case WSAEWOULDBLOCK:
-    case WSAEADDRINUSE:
-    case WSAECONNABORTED:
-    case WSAECONNRESET:
-    case WSAENOTCONN:
-    case WSAETIMEDOUT:
-    case WSAECONNREFUSED:
-    case WSAEHOSTDOWN:
-    case WSAEHOSTUNREACH:
-    case WSAEADDRNOTAVAIL:
-    case WSAEISCONN:
-      return true;
-    }
-#else
-  ACE_UNUSED_ARG (error);
-#endif /* ACE_WIN32 */
-  return false;
-}
-
 char *
 ACE::strndup (const char *str, size_t n)
 {
diff --git a/ace/ACE.h b/ace/ACE.h
index 3a0e4063394..ac389a9e7f3 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -1,25 +1,17 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
- * @file    ACE.h
+ *  @file    ACE.h
  *
- * $Id$
+ *  $Id$
  *
- * This file contains value added ACE functions that extend the
- * behavior of the UNIX and Win32 OS calls.
- *
- * All these ACE static functions are consolidated in a single place
- * in order to manage the namespace better.  These functions are put
- * here rather than in @c ACE_OS in order to separate concerns.
- *
- * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
 #ifndef ACE_ACE_H
 #define ACE_ACE_H
-
 #include /**/ "ace/pre.h"
 
 #include "ace/config-all.h"
@@ -54,76 +46,78 @@ class ACE_Handle_Set;
 # undef log2
 #endif /* log2 */
 
-#if defined (ACE_EXPORT_MACRO)
-#  undef ACE_EXPORT_MACRO
-#endif
-#define ACE_EXPORT_MACRO ACE_Export
-
-
 /**
- * @namespace ACE
+ * @class ACE
  *
- * @brief The namespace containing the ACE framework itself.
+ * @brief Contains value added ACE methods that extend the behavior
+ * of the UNIX and Win32 OS calls.
  *
- * The ACE namespace contains all types (classes, structures,
- * typedefs, etc), and global functions and variables in the ACE
- * framework.
+ * This class consolidates all these ACE static methods in a
+ * single place in order to manage the namespace better.  These
+ * methods are put here rather than in ACE_OS in order to
+ * separate concerns.
  */
-namespace ACE
+class ACE_Export ACE : public ACE_Flag_Manip, public ACE_Handle_Ops,
+                       public ACE_Lib_Find, public ACE_Init_ACE,
+                       public ACE_Sock_Connect
 {
+
+  ACE_CLASS_IS_NAMESPACE (ACE);
+public:
+
   // = ACE version information.
   /// e.g., the "5" in ACE 5.1.12.
-  extern ACE_Export u_int major_version (void);
+  static u_int major_version (void);
 
   /// e.g., the "1" in ACE 5.1.12.
-  extern ACE_Export u_int minor_version (void);
+  static u_int minor_version (void);
 
   /// e.g., the "12" in ACE 5.1.12.
   /// Returns 0 for "stable" (non-beta) releases.
-  extern ACE_Export u_int beta_version (void);
+  static u_int beta_version (void);
 
   // = C++ compiler version information.
   /// E.g., the "SunPro C++" in SunPro C++ 4.32.0
-  extern ACE_Export const ACE_TCHAR * compiler_name (void);
+  static const ACE_TCHAR * compiler_name (void);
 
   /// E.g., the "4" in SunPro C++ 4.32.0
-  extern ACE_Export u_int compiler_major_version (void);
+  static u_int compiler_major_version (void);
 
   /// E.g., the "32" in SunPro C++ 4.32.0
-  extern ACE_Export u_int compiler_minor_version (void);
+  static u_int compiler_minor_version (void);
 
   /// E.g., the "0" in SunPro C++ 4.32.0
-  extern ACE_Export u_int compiler_beta_version (void);
+  static u_int compiler_beta_version (void);
 
   /// Check if error indicates the process being out of handles (file
   /// descriptors).
-  extern ACE_Export int out_of_handles (int error);
+  static int out_of_handles (int error);
 
   /**
    * @name I/O operations
    *
    * Notes on common parameters:
    *
-   * @a handle is the connected endpoint that will be used for I/O.
+   * <handle> is the connected endpoint that will be used for I/O.
    *
-   * @a buf is the buffer to write from or receive into.
+   * <buf> is the buffer to write from or receive into.
    *
-   * @a len is the number of bytes to transfer.
+   * <len> is the number of bytes to transfer.
    *
-   * The @a timeout parameter in the following methods indicates how
-   * long to blocking trying to transfer data.  If @a timeout == 0,
+   * The <timeout> parameter in the following methods indicates how
+   * long to blocking trying to transfer data.  If <timeout> == 0,
    * then the call behaves as a normal send/recv call, i.e., for
    * blocking sockets, the call will block until action is possible;
-   * for non-blocking sockets, @c EWOULDBLOCK will be returned if no
+   * for non-blocking sockets, EWOULDBLOCK will be returned if no
    * action is immediately possible.
    *
-   * If @a timeout != 0, the call will wait until the relative time
-   * specified in  @a *timeout elapses.
+   * If <timeout> != 0, the call will wait until the relative time
+   * specified in *<timeout> elapses.
    *
    * The "_n()" I/O methods keep looping until all the data has been
    * transferred.  These methods also work for sockets in non-blocking
-   * mode i.e., they keep looping on @c EWOULDBLOCK.  @a timeout is
-   * used to make sure we keep making progress, i.e., the same timeout
+   * mode i.e., they keep looping on EWOULDBLOCK.  <timeout> is used
+   * to make sure we keep making progress, i.e., the same timeout
    * value is used for every I/O operation in the loop and the timeout
    * is not counted down.
    *
@@ -131,84 +125,80 @@ namespace ACE
    * from the non "_n()" methods and are specified as follows:
    *
    * - On complete transfer, the number of bytes transferred is returned.
-   * - On timeout, -1 is returned, @c errno == @c ETIME.
-   * - On error, -1 is returned, @c errno is set to appropriate error.
-   * - On @c EOF, 0 is returned, @c errno is irrelevant.
+   * - On timeout, -1 is returned, errno == ETIME.
+   * - On error, -1 is returned, errno is set to appropriate error.
+   * - On EOF, 0 is returned, errno is irrelevant.
    *
    * On partial transfers, i.e., if any data is transferred before
-   * timeout / error / @c EOF, @a bytes_transferred> will contain the
-   * number of bytes transferred.
+   * timeout/error/EOF, <bytes_transferred> will contain the number of
+   * bytes transferred.
    *
-   * Methods with @a iovec parameter are I/O vector variants of the
-   * I/O operations.
+   * Methods with <iovec> parameter are I/O vector variants of the I/O
+   * operations.
    *
-   * Methods with the extra @a flags argument will always result in
-   * @c send getting called. Methods without the extra @a flags
-   * argument will result in @c send getting called on Win32
-   * platforms, and @c write getting called on non-Win32 platforms.
+   * Methods with the extra <flags> argument will always result in
+   * <send> getting called. Methods without the extra <flags> argument
+   * will result in <send> getting called on Win32 platforms, and
+   * <write> getting called on non-Win32 platforms.
    */
   //@{
-  extern ACE_Export ssize_t recv (ACE_HANDLE handle,
-                                  void *buf,
-                                  size_t len,
-                                  int flags,
-                                  const ACE_Time_Value *timeout = 0);
+  static ssize_t recv (ACE_HANDLE handle,
+                       void *buf,
+                       size_t len,
+                       int flags,
+                       const ACE_Time_Value *timeout = 0);
 
 #if defined (ACE_HAS_TLI)
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t t_rcv (ACE_HANDLE handle,
-                 void *buf,
-                 size_t len,
-                 int *flags,
-                 const ACE_Time_Value *timeout = 0);
+  static ssize_t t_rcv (ACE_HANDLE handle,
+                        void *buf,
+                        size_t len,
+                        int *flags,
+                        const ACE_Time_Value *timeout = 0);
 
 #endif /* ACE_HAS_TLI */
 
-  extern ACE_Export ssize_t recv (ACE_HANDLE handle,
-                                  void *buf,
-                                  size_t len,
-                                  const ACE_Time_Value *timeout = 0);
-
-  extern ACE_Export ssize_t recvmsg (ACE_HANDLE handle,
-                                     struct msghdr *msg,
-                                     int flags,
-                                     const ACE_Time_Value *timeout = 0);
-
-  extern ACE_Export ssize_t recvfrom (ACE_HANDLE handle,
-                                      char *buf,
-                                      int len,
-                                      int flags,
-                                      struct sockaddr *addr,
-                                      int *addrlen,
-                                      const ACE_Time_Value *timeout = 0);
-
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t recv_n (ACE_HANDLE handle,
-                  void *buf,
-                  size_t len,
-                  int flags,
-                  const ACE_Time_Value *timeout = 0,
-                  size_t *bytes_transferred = 0);
+  static ssize_t recv (ACE_HANDLE handle,
+                       void *buf,
+                       size_t len,
+                       const ACE_Time_Value *timeout = 0);
+
+  static ssize_t recvmsg (ACE_HANDLE handle,
+                          struct msghdr *msg,
+                          int flags,
+                          const ACE_Time_Value *timeout = 0);
+
+  static ssize_t recvfrom (ACE_HANDLE handle,
+                           char *buf,
+                           int len,
+                           int flags,
+                           struct sockaddr *addr,
+                           int *addrlen,
+                           const ACE_Time_Value *timeout = 0);
+
+  static ssize_t recv_n (ACE_HANDLE handle,
+                         void *buf,
+                         size_t len,
+                         int flags,
+                         const ACE_Time_Value *timeout = 0,
+                         size_t *bytes_transferred = 0);
 
 #if defined (ACE_HAS_TLI)
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t t_rcv_n (ACE_HANDLE handle,
-                   void *buf,
-                   size_t len,
-                   int *flags,
-                   const ACE_Time_Value *timeout = 0,
-                   size_t *bytes_transferred = 0);
+  static ssize_t t_rcv_n (ACE_HANDLE handle,
+                          void *buf,
+                          size_t len,
+                          int *flags,
+                          const ACE_Time_Value *timeout = 0,
+                          size_t *bytes_transferred = 0);
 
 #endif /* ACE_HAS_TLI */
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t recv_n (ACE_HANDLE handle,
-                  void *buf,
-                  size_t len,
-                  const ACE_Time_Value *timeout = 0,
-                  size_t *bytes_transferred = 0);
+  static ssize_t recv_n (ACE_HANDLE handle,
+                         void *buf,
+                         size_t len,
+                         const ACE_Time_Value *timeout = 0,
+                         size_t *bytes_transferred = 0);
 
   /// Receive into a variable number of pieces.
   /**
@@ -220,218 +210,208 @@ namespace ACE
    *
    * @return -1 on error, else total number of bytes received.
    */
-  extern ACE_Export ssize_t recv (ACE_HANDLE handle, size_t n, ...);
-
-  extern ACE_Export ssize_t recvv (ACE_HANDLE handle,
-                                   iovec *iov,
-                                   int iovcnt,
-                                   const ACE_Time_Value *timeout = 0);
-
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t recvv_n (ACE_HANDLE handle,
-                   iovec *iov,
-                   int iovcnt,
-                   const ACE_Time_Value *timeout = 0,
-                   size_t *bytes_transferred = 0);
-
-  extern ACE_Export ssize_t recv_n (ACE_HANDLE handle,
-                                    ACE_Message_Block *message_block,
-                                    const ACE_Time_Value *timeout = 0,
-                                    size_t *bytes_transferred = 0);
-
-  extern ACE_Export ssize_t send (ACE_HANDLE handle,
-                                  const void *buf,
-                                  size_t len,
-                                  int flags,
-                                  const ACE_Time_Value *timeout = 0);
+  static ssize_t recv (ACE_HANDLE handle, size_t n, ...);
+
+  static ssize_t recvv (ACE_HANDLE handle,
+                        iovec *iov,
+                        int iovcnt,
+                        const ACE_Time_Value *timeout = 0);
+
+  static ssize_t recvv_n (ACE_HANDLE handle,
+                          iovec *iov,
+                          int iovcnt,
+                          const ACE_Time_Value *timeout = 0,
+                          size_t *bytes_transferred = 0);
+
+  static ssize_t recv_n (ACE_HANDLE handle,
+                         ACE_Message_Block *message_block,
+                         const ACE_Time_Value *timeout = 0,
+                         size_t *bytes_transferred = 0);
+
+  static ssize_t send (ACE_HANDLE handle,
+                       const void *buf,
+                       size_t len,
+                       int flags,
+                       const ACE_Time_Value *timeout = 0);
 
 #if defined (ACE_HAS_TLI)
 
-  extern ACE_Export ssize_t t_snd (ACE_HANDLE handle,
-                                   const void *buf,
-                                   size_t len,
-                                   int flags,
-                                   const ACE_Time_Value *timeout = 0);
+  static ssize_t t_snd (ACE_HANDLE handle,
+                        const void *buf,
+                        size_t len,
+                        int flags,
+                        const ACE_Time_Value *timeout = 0);
 
 #endif /* ACE_HAS_TLI */
 
-  extern ACE_Export ssize_t send (ACE_HANDLE handle,
-                                  const void *buf,
-                                  size_t len,
-                                  const ACE_Time_Value *timeout = 0);
-
-  extern ACE_Export ssize_t sendmsg (ACE_HANDLE handle,
-                                     const struct msghdr *msg,
-                                     int flags,
-                                     const ACE_Time_Value *timeout = 0);
-
-  extern ACE_Export ssize_t sendto (ACE_HANDLE handle,
-                                    const char *buf,
-                                    int len,
-                                    int flags,
-                                    const struct sockaddr *addr,
-                                    int addrlen,
-                                    const ACE_Time_Value *timeout = 0);
-
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t send_n (ACE_HANDLE handle,
-                  const void *buf,
-                  size_t len,
-                  int flags,
-                  const ACE_Time_Value *timeout = 0,
-                  size_t *bytes_transferred = 0);
+  static ssize_t send (ACE_HANDLE handle,
+                       const void *buf,
+                       size_t len,
+                       const ACE_Time_Value *timeout = 0);
+
+  static ssize_t sendmsg (ACE_HANDLE handle,
+                          const struct msghdr *msg,
+                          int flags,
+                          const ACE_Time_Value *timeout = 0);
+
+  static ssize_t sendto (ACE_HANDLE handle,
+                         const char *buf,
+                         int len,
+                         int flags,
+                         const struct sockaddr *addr,
+                         int addrlen,
+                         const ACE_Time_Value *timeout = 0);
+
+  static ssize_t send_n (ACE_HANDLE handle,
+                         const void *buf,
+                         size_t len,
+                         int flags,
+                         const ACE_Time_Value *timeout = 0,
+                         size_t *bytes_transferred = 0);
 
 #if defined (ACE_HAS_TLI)
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t t_snd_n (ACE_HANDLE handle,
-                   const void *buf,
-                   size_t len,
-                   int flags,
-                   const ACE_Time_Value *timeout = 0,
-                   size_t *bytes_transferred = 0);
+  static ssize_t t_snd_n (ACE_HANDLE handle,
+                          const void *buf,
+                          size_t len,
+                          int flags,
+                          const ACE_Time_Value *timeout = 0,
+                          size_t *bytes_transferred = 0);
 
 #endif /* ACE_HAS_TLI */
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t send_n (ACE_HANDLE handle,
-                  const void *buf,
-                  size_t len,
-                  const ACE_Time_Value *timeout = 0,
-                  size_t *bytes_transferred = 0);
+  static ssize_t send_n (ACE_HANDLE handle,
+                         const void *buf,
+                         size_t len,
+                         const ACE_Time_Value *timeout = 0,
+                         size_t *bytes_transferred = 0);
 
   /// Varargs variant.
-  extern ACE_Export ssize_t send (ACE_HANDLE handle, size_t n, ...);
-
-  extern ACE_Export ssize_t sendv (ACE_HANDLE handle,
-                                   const iovec *iov,
-                                   int iovcnt,
-                                   const ACE_Time_Value *timeout = 0);
-
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t sendv_n (ACE_HANDLE handle,
-                   const iovec *iov,
-                   int iovcnt,
-                   const ACE_Time_Value *timeout = 0,
-                   size_t *bytes_transferred = 0);
-
-  /// Send all the @a message_blocks chained through their @c next and
-  /// @c cont pointers.  This call uses the underlying OS gather-write
+  static ssize_t send (ACE_HANDLE handle, size_t n, ...);
+
+  static ssize_t sendv (ACE_HANDLE handle,
+                        const iovec *iov,
+                        int iovcnt,
+                        const ACE_Time_Value *timeout = 0);
+
+  static ssize_t sendv_n (ACE_HANDLE handle,
+                          const iovec *iov,
+                          int iovcnt,
+                          const ACE_Time_Value *timeout = 0,
+                          size_t *bytes_transferred = 0);
+
+  /// Send all the <message_block>s chained through their <next> and
+  /// <cont> pointers.  This call uses the underlying OS gather-write
   /// operation to reduce the domain-crossing penalty.
-  extern ACE_Export ssize_t send_n (ACE_HANDLE handle,
-                                    const ACE_Message_Block *message_block,
-                                    const ACE_Time_Value *timeout = 0,
-                                    size_t *bytes_transferred = 0);
+  static ssize_t send_n (ACE_HANDLE handle,
+                         const ACE_Message_Block *message_block,
+                         const ACE_Time_Value *timeout = 0,
+                         size_t *bytes_transferred = 0);
 
   // = File system I/O functions (these don't support timeouts).
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t read_n (ACE_HANDLE handle,
-                  void *buf,
-                  size_t len,
-                  size_t *bytes_transferred = 0);
-
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t write_n (ACE_HANDLE handle,
-                   const void *buf,
-                   size_t len,
-                   size_t *bytes_transferred = 0);
-
-  /// Write all the @a message_blocks chained through their @c next
-  /// and @c cont pointers.  This call uses the underlying OS
-  /// gather-write operation to reduce the domain-crossing penalty.
-  extern ACE_Export ssize_t write_n (ACE_HANDLE handle,
-                                     const ACE_Message_Block *message_block,
-                                     size_t *bytes_transferred = 0);
-
-  extern ACE_Export ssize_t readv_n (ACE_HANDLE handle,
-                                     iovec *iov,
-                                     int iovcnt,
-                                     size_t *bytes_transferred = 0);
-
-  extern ACE_Export ssize_t writev_n (ACE_HANDLE handle,
-                                      const iovec *iov,
-                                      int iovcnt,
-                                      size_t *bytes_transferred = 0);
+  static ssize_t read_n (ACE_HANDLE handle,
+                         void *buf,
+                         size_t len,
+                         size_t *bytes_transferred = 0);
+
+  static ssize_t write_n (ACE_HANDLE handle,
+                          const void *buf,
+                          size_t len,
+                          size_t *bytes_transferred = 0);
+
+  /// Write all the <message_block>s chained through their <next> and
+  /// <cont> pointers.  This call uses the underlying OS gather-write
+  /// operation to reduce the domain-crossing penalty.
+  static ssize_t write_n (ACE_HANDLE handle,
+                          const ACE_Message_Block *message_block,
+                          size_t *bytes_transferred = 0);
+
+  static ssize_t readv_n (ACE_HANDLE handle,
+                          iovec *iov,
+                          int iovcnt,
+                          size_t *bytes_transferred = 0);
+
+  static ssize_t writev_n (ACE_HANDLE handle,
+                           const iovec *iov,
+                           int iovcnt,
+                           size_t *bytes_transferred = 0);
   //@}
 
   /**
-   * Wait up to @a timeout amount of time to passively establish a
-   * connection.  This method doesn't perform the @c accept, it just
-   * does the timed wait.
+   * Wait up to <timeout> amount of time to passively establish a
+   * connection.  This method doesn't perform the <accept>, it just
+   * does the timed wait...
    */
-  extern ACE_Export int handle_timed_accept (ACE_HANDLE listener,
-                                             ACE_Time_Value *timeout,
-                                             int restart);
+  static int handle_timed_accept (ACE_HANDLE listener,
+                                  ACE_Time_Value *timeout,
+                                  int restart);
 
   /**
-   * Wait up to @a timeout amount of time to complete an actively
-   * established non-blocking connection.  If @a is_tli is non-0 then
+   * Wait up to <timeout> amount of time to complete an actively
+   * established non-blocking connection.  If <is_tli> is non-0 then
    * we are being called by a TLI wrapper (which behaves slightly
    * differently from a socket wrapper).
    */
-  extern ACE_Export ACE_HANDLE handle_timed_complete (
-    ACE_HANDLE listener,
-    const ACE_Time_Value *timeout,
-    int is_tli = 0);
+  static ACE_HANDLE handle_timed_complete (ACE_HANDLE listener,
+                                           const ACE_Time_Value *timeout,
+                                           int is_tli = 0);
 
   /**
-   * Reset the limit on the number of open handles.  If @a new_limit
-   * == -1 set the limit to the maximum allowable.  Otherwise, set
-   * the limit value to @a new_limit.  If @a increase_limit_only is 
-   * non-0 then only allow increases to the limit.
+   * Reset the limit on the number of open handles.  If <new_limit> ==
+   * -1 set the limit to the maximum allowable.  Otherwise, set it to
+   * be the value of <new_limit>.
    */
-  extern ACE_Export int set_handle_limit (int new_limit = -1,
-                                          int increase_limit_only = 0);
+  static int set_handle_limit (int new_limit = -1);
 
   /**
    * Returns the maximum number of open handles currently permitted in
    * this process.  This maximum may be extended using
-   * @c ACE::set_handle_limit.
+   * <ACE::set_handle_limit>.
    */
-  extern ACE_Export int max_handles (void);
+  static int max_handles (void);
 
   // = String functions
 #if !defined (ACE_HAS_WINCE)
   /**
-   * Return a dynamically allocated duplicate of @a str, substituting
-   * the environment variable if @c str[0] @c == @c '$'.  Note that
-   * the pointer is allocated with @c ACE_OS::malloc and must be freed
-   * by @c ACE_OS::free.
+   * Return a dynamically allocated duplicate of <str>, substituting
+   * the environment variable if <str[0] == '$'>.  Note that the
+   * pointer is allocated with <ACE_OS::malloc> and must be freed by
+   * <ACE_OS::free>.
    */
-  extern ACE_Export ACE_TCHAR *strenvdup (const ACE_TCHAR *str);
+  static ACE_TCHAR *strenvdup (const ACE_TCHAR *str);
 #endif /* ACE_HAS_WINCE */
 
   /// Returns a pointer to the "end" of the string, i.e., the character
-  /// past the @c '\0'.
-  extern ACE_Export const char *strend (const char *s);
+  /// past the '\0'.
+  static const char *strend (const char *s);
 
-  /// This method is just like @c strdup, except that it uses
-  /// @c operator @c new rather than @c malloc.  If @a s is NULL
-  /// returns NULL rather than segfaulting.
-  extern ACE_Export char *strnew (const char *s);
+  /// This method is just like <strdup>, except that it uses <operator
+  /// new> rather than <malloc>.  If <s> is NULL returns NULL rather than
+  /// segfaulting...
+  static char *strnew (const char *s);
 
-  /// Delete the memory allocated by @c strnew.
-  extern ACE_Export void strdelete (char *s);
+  /// Delete the memory allocated by <strnew>.
+  static void strdelete (char *s);
 
-  /// Create a fresh new copy of @a str, up to @a n chars long.  Uses
-  /// @c ACE_OS::malloc to allocate the new string.
-  extern ACE_Export char *strndup (const char *str, size_t n);
+  /// Create a fresh new copy of <str>, up to <n> chars long.  Uses
+  /// <ACE_OS::malloc> to allocate the new string.
+  static char *strndup (const char *str, size_t n);
 
-  /// Create a fresh new copy of @a str, up to @a n chars long.  Uses
-  /// @c ACE_OS::malloc to allocate the new string.
-  extern ACE_Export char *strnnew (const char *str, size_t n);
+  /// Create a fresh new copy of <str>, up to <n> chars long.  Uses
+  /// <ACE_OS::malloc> to allocate the new string.
+  static char *strnnew (const char *str, size_t n);
 
 #if defined (ACE_HAS_WCHAR)
-  extern ACE_Export const wchar_t *strend (const wchar_t *s);
+  static const wchar_t *strend (const wchar_t *s);
 
-  extern ACE_Export wchar_t *strnew (const wchar_t *s);
+  static wchar_t *strnew (const wchar_t *s);
 
-  extern ACE_Export void strdelete (wchar_t *s);
+  static void strdelete (wchar_t *s);
 
-  extern ACE_Export wchar_t *strndup (const wchar_t *str, size_t n);
+  static wchar_t *strndup (const wchar_t *str, size_t n);
 
-  extern ACE_Export wchar_t *strnnew (const wchar_t *str, size_t n);
+  static wchar_t *strnnew (const wchar_t *str, size_t n);
 
 #endif /* ACE_HAS_WCHAR */
 
@@ -451,141 +431,130 @@ namespace ACE
    *         a ".exe" suffix. The caller is responsible for freeing the
    *         memory using delete [].
    */
-  extern ACE_Export const ACE_TCHAR *execname (const ACE_TCHAR *pathname);
+  static const ACE_TCHAR *execname (const ACE_TCHAR *pathname);
 
   /**
-   * Returns the "basename" of a @a pathname separated by @a delim.
-   * For instance, the basename of "/tmp/foo.cpp" is "foo.cpp" when
-   * @a delim is @a '/'.
+   * Returns the "basename" of a <pathname> separated by <delim>.  For
+   * instance, the basename of "/tmp/foo.cpp" is "foo.cpp" when
+   * <delim> is '/'.
    */
-  extern ACE_Export const ACE_TCHAR *basename (const ACE_TCHAR *pathname,
-                                               ACE_TCHAR delim =
-                                               ACE_DIRECTORY_SEPARATOR_CHAR);
+  static const ACE_TCHAR *basename (const ACE_TCHAR *pathname,
+                                    ACE_TCHAR delim =
+                                      ACE_DIRECTORY_SEPARATOR_CHAR);
 
   /**
-   * Returns the "dirname" of a @a pathname.  For instance, the
-   * dirname of "/tmp/foo.cpp" is "/tmp" when @a delim is @a '/'.  If
-   * @a pathname has no @a delim ".\0" is returned.  This method does
-   * not modify @a pathname and is not reentrant.
+   * Returns the "dirname" of a <pathname>.  For instance, the dirname
+   * of "/tmp/foo.cpp" is "/tmp" when <delim> is '/'.  If <pathname>
+   * has no <delim> ".\0" is returned.  This method does not modify
+   * <pathname> and is not reentrant.
    */
-  extern ACE_Export const ACE_TCHAR *dirname (const ACE_TCHAR *pathname,
-                                              ACE_TCHAR delim =
-                                              ACE_DIRECTORY_SEPARATOR_CHAR);
+  static const ACE_TCHAR *dirname (const ACE_TCHAR *pathname,
+                                   ACE_TCHAR delim = ACE_DIRECTORY_SEPARATOR_CHAR);
 
   /**
    * Returns the current timestamp in the form
    * "hour:minute:second:microsecond."  The month, day, and year are
-   * also stored in the beginning of the @a date_and_time array, which
-   * is a user-supplied array of size @a time_len> @c ACE_TCHARs.
-   * Returns 0 if unsuccessful, else returns pointer to beginning of the
-   * "time" portion of @a date_and_time.  If @a
-   * return_pointer_to_first_digit is 0 then return a pointer to the
+   * also stored in the beginning of the <date_and_time> array, which
+   * is a user-supplied array of size <time_len> <ACE_TCHAR>s.  Returns
+   * 0 if unsuccessful, else returns pointer to beginning of the
+   * "time" portion of <date_and_time>.  If
+   * <return_pointer_to_first_digit> is 0 then return a pointer to the
    * space before the time, else return a pointer to the beginning of
    * the time portion.
    */
-  extern ACE_Export ACE_TCHAR *timestamp (ACE_TCHAR date_and_time[],
-                                          int time_len,
-                                          int return_pointer_to_first_digit =
-                                            0);
+  static ACE_TCHAR *timestamp (ACE_TCHAR date_and_time[],
+                               int time_len,
+                               int return_pointer_to_first_digit = 0);
 
   /**
-   * if @a avoid_zombies == 0 call @c ACE_OS::fork directly, else
-   * create an orphan process that's inherited by the init process;
-   * init cleans up when the orphan process terminates so we don't
-   * create zombies.
+   * if <avoid_zombies> == 0 call <ACE_OS::fork> directly, else create
+   * an orphan process that's inherited by the init process; init
+   * cleans up when the orphan process terminates so we don't create
+   * zombies.
    */
-  extern ACE_Export pid_t fork (
-    const ACE_TCHAR *program_name = ACE_LIB_TEXT ("<unknown>"),
-    int avoid_zombies = 0);
+  static pid_t fork (const ACE_TCHAR *program_name = ACE_LIB_TEXT ("<unknown>"),
+                     int avoid_zombies = 0);
 
   /**
    * Become a daemon process using the algorithm in Richard Stevens
    * "Advanced Programming in the UNIX Environment."  If
-   * @a close_all_handles is non-zero then all open file handles are
+   * <close_all_handles> is non-zero then all open file handles are
    * closed.
    */
-  extern ACE_Export int daemonize (
-    const ACE_TCHAR pathname[] = ACE_LIB_TEXT ("/"),
-    int close_all_handles = ACE_DEFAULT_CLOSE_ALL_HANDLES,
-    const ACE_TCHAR program_name[] = ACE_LIB_TEXT ("<unknown>"));
+  static int daemonize (const ACE_TCHAR pathname[] = ACE_LIB_TEXT ("/"),
+                        int close_all_handles = ACE_DEFAULT_CLOSE_ALL_HANDLES,
+                        const ACE_TCHAR program_name[] = ACE_LIB_TEXT ("<unknown>"));
 
-  // = Miscellaneous functions.
+  // = Miscelleous functions.
   /// Rounds the request to a multiple of the page size.
-  extern ACE_Export size_t round_to_pagesize (off_t length);
+  static size_t round_to_pagesize (off_t length);
 
   /// Rounds the request to a multiple of the allocation granularity.
-  extern ACE_Export size_t round_to_allocation_granularity (off_t len);
+  static size_t round_to_allocation_granularity (off_t len);
 
   // @@ UNICODE what about buffer?
   /// Format buffer into printable format.  This is useful for
   /// debugging.
-  extern ACE_Export size_t format_hexdump (const char *buffer, size_t size,
-                                           ACE_TCHAR *obuf, size_t obuf_sz);
+  static size_t format_hexdump (const char *buffer, size_t size,
+                                ACE_TCHAR *obuf, size_t obuf_sz);
 
   /// Computes the hash value of <str> using the "Hash PJW" routine.
-  extern ACE_Export u_long hash_pjw (const char *str);
+  static u_long hash_pjw (const char *str);
 
   /// Computes the hash value of <str> using the "Hash PJW" routine.
-  extern ACE_Export u_long hash_pjw (const char *str, size_t len);
+  static u_long hash_pjw (const char *str, size_t len);
 
 #if defined (ACE_HAS_WCHAR)
   /// Computes the hash value of <str> using the "Hash PJW" routine.
-  extern ACE_Export u_long hash_pjw (const wchar_t *str);
+  static u_long hash_pjw (const wchar_t *str);
 
   /// Computes the hash value of <str> using the "Hash PJW" routine.
-  extern ACE_Export u_long hash_pjw (const wchar_t *str, size_t len);
+  static u_long hash_pjw (const wchar_t *str, size_t len);
 #endif /* ACE_HAS_WCHAR */
 
   /// Computes the ISO 8802-3 standard 32 bits CRC for the string
   /// (not for a file).
-  extern ACE_Export u_long crc32 (const char *str);
+  static u_long crc32 (const char *str);
 
   /// Computes the ISO 8802-3 standard 32 bits CRC for the given
   /// buffer (the length is included in the CRC).
-  extern ACE_Export u_long crc32 (const char *buf, ACE_UINT32 len);
+  static u_long crc32 (const char *buf, ACE_UINT32 len);
 
   /// Computes the ISO 8802-3 standard 32 bits CRC for the
   /// @ len iovec buffers.
-  extern ACE_Export u_long crc32 (iovec *iov, int len);
+  static u_long crc32 (iovec *iov, int len);
 
   /// Euclid's greatest common divisor algorithm.
-  extern ACE_Export u_long gcd (u_long x, u_long y);
+  static u_long gcd (u_long x, u_long y);
 
   /// Calculates the minimum enclosing frame size for the given values.
-  extern ACE_Export u_long minimum_frame_size (u_long period1, u_long period2);
+  static u_long minimum_frame_size (u_long period1, u_long period2);
 
   /**
    * Function that can burn up noticeable CPU time:  brute-force
-   * determination of whether number @a n is prime.  Returns 0 if
-   * it is prime, or the smallest factor if it is not prime.
-   * @a min_factor and @a max_factor can be used to partition the work
-   * among threads. For just one thread, typical values are 2 and
-   * n/2.
+   * determination of whether number "n" is prime.  Returns 0 if
+   * it is prime, or the smallest factor if it is not prime.  min_factor
+   * and max_factor can be used to partition the work among threads.
+   * For just one thread, typical values are 2 and n/2.
    */
-  extern ACE_Export u_long is_prime (const u_long n,
-                                     const u_long min_factor,
-                                     const u_long max_factor);
+  static u_long is_prime (const u_long n,
+                          const u_long min_factor,
+                          const u_long max_factor);
 
   /// Map troublesome win32 errno values to values that standard C
   /// strerr function understands.  Thank you Microsoft.
-  extern ACE_Export int map_errno (int error);
+  static int map_errno (int error);
 
   /// Returns a string containing the error message corresponding to a
-  /// WinSock error.  This works around an omission in the Win32 API.
-  /// @internal
-  extern ACE_Export const ACE_TCHAR * sock_error (int error);
-
-  /// Determins whether the given error code corresponds to to a
-  /// WinSock error. If so returns true, false otherwise.
-  /// @internal
-  extern ACE_Export bool is_sock_error (int error);
+  /// WinSock error.  This works around an omission in the Win32 API...
+  static const ACE_TCHAR *sock_error (int error);
 
   /**
    * Checks if process with <pid> is still alive.  Returns 1 if it is
    * still alive, 0 if it isn't alive, and -1 if something weird
    * happened.
    */
-  extern ACE_Export int process_active (pid_t pid);
+  static int process_active (pid_t pid);
 
   /**
    * Terminate the process abruptly with id <pid>.  On Win32 platforms
@@ -595,7 +564,7 @@ namespace ACE
    * since the process being terminated may not have a chance to
    * cleanup before it shuts down.
    */
-  extern ACE_Export int terminate_process (pid_t pid);
+  static int terminate_process (pid_t pid);
 
   /**
    * This method uses process id and object pointer to come up with a
@@ -605,209 +574,214 @@ namespace ACE
    * the same process. The uniqueness of this name is therefore only
    * valid for the life of <object>.
    */
-  ACE_NAMESPACE_INLINE_FUNCTION void unique_name (const void *object,
-                                                  ACE_TCHAR *name,
-                                                  size_t length);
+  static void unique_name (const void *object,
+                           ACE_TCHAR *name,
+                           size_t length);
 
   /// Computes the base 2 logarithm of <num>.
-  ACE_NAMESPACE_INLINE_FUNCTION u_long log2 (u_long num);
+  static u_long log2 (u_long num);
 
   /// Hex conversion utility.
-  ACE_NAMESPACE_INLINE_FUNCTION ACE_TCHAR nibble2hex (u_int n);
+  static ACE_TCHAR nibble2hex (u_int n);
 
   /// Convert a hex character to its byte representation.
-  ACE_NAMESPACE_INLINE_FUNCTION u_char hex2byte (ACE_TCHAR c);
+  static u_char hex2byte (ACE_TCHAR c);
 
   // = Set/get the debug level.
-  extern ACE_Export char debug (void);
-  extern ACE_Export void debug (char d);
-
-  /// Wrapper facade for @c select that uses @c ACE_Handle_Sets.
-  extern ACE_Export int select (int width,
-                                ACE_Handle_Set *readfds,
-                                ACE_Handle_Set *writefds = 0,
-                                ACE_Handle_Set *exceptfds = 0,
-                                const ACE_Time_Value *timeout = 0);
-
-  /// Wrapper facade for the most common use of @c select that uses
-  /// @c ACE_Handle_Sets.
-  extern ACE_Export int select (int width,
-                                ACE_Handle_Set &readfds,
-                                const ACE_Time_Value *timeout = 0);
+  static char debug (void);
+  static void debug (char d);
+
+  /// Wrapper facade for <select> that uses <ACE_Handle_Set>s.
+  static int select (int width,
+                     ACE_Handle_Set *readfds,
+                     ACE_Handle_Set *writefds = 0,
+                     ACE_Handle_Set *exceptfds = 0,
+                     const ACE_Time_Value *timeout = 0);
+
+  /// Wrapper facade for the most common use of <select> that uses
+  /// <ACE_Handle_Set>s.
+  static int select (int width,
+                     ACE_Handle_Set &readfds,
+                     const ACE_Time_Value *timeout = 0);
 
   /// Timed wait for handle to get read ready.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int handle_read_ready (ACE_HANDLE handle,
-                         const ACE_Time_Value *timeout);
+  static int handle_read_ready (ACE_HANDLE handle,
+                                const ACE_Time_Value *timeout);
 
   /// Timed wait for handle to get write ready.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int handle_write_ready (ACE_HANDLE handle,
-                          const ACE_Time_Value *timeout);
+  static int handle_write_ready (ACE_HANDLE handle,
+                                 const ACE_Time_Value *timeout);
 
   /// Timed wait for handle to get exception ready.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int handle_exception_ready (ACE_HANDLE handle,
-                              const ACE_Time_Value *timeout);
+  static int handle_exception_ready (ACE_HANDLE handle,
+                                     const ACE_Time_Value *timeout);
 
   /// Timed wait for handle to get read, write, or exception ready.
-  extern ACE_Export int handle_ready (ACE_HANDLE handle,
-                                      const ACE_Time_Value *timeout,
-                                      int read_ready,
-                                      int write_ready,
-                                      int exception_ready);
-
-  /// Wait for @a timeout before proceeding to a @c recv operation.
-  /// @a val keeps track of whether we're in non-blocking mode or
-  /// not.
-  extern ACE_Export int enter_recv_timedwait (ACE_HANDLE handle,
-                                              const ACE_Time_Value *timeout,
-                                              int &val);
-
-  /// Wait for @a timeout before proceeding to a @c send operation.
-  /// @a val keeps track of whether we're in non-blocking mode or
-  /// not.
-  extern ACE_Export int enter_send_timedwait (ACE_HANDLE handle,
-                                              const ACE_Time_Value* timeout,
-                                              int &val);
-
-  /// This makes sure that @a handle is set into non-blocking mode.
-  /// @a val keeps track of whether were in non-blocking mode or not.
-  extern ACE_Export void record_and_set_non_blocking_mode (ACE_HANDLE handle,
-                                                           int &val);
+  static int handle_ready (ACE_HANDLE handle,
+                           const ACE_Time_Value *timeout,
+                           int read_ready,
+                           int write_ready,
+                           int exception_ready);
+
+  /// Wait for <timeout> before proceeding to a <recv> operation.
+  /// <val> keeps track of whether we're in non-blocking mode or not.
+  static int enter_recv_timedwait (ACE_HANDLE handle,
+                                   const ACE_Time_Value *timeout,
+                                   int &val);
+
+  /// Wait for <timeout> before proceeding to a <send> operation.
+  /// <val> keeps track of whether we're in non-blocking mode or not.
+  static int enter_send_timedwait (ACE_HANDLE handle,
+                                   const ACE_Time_Value* timeout,
+                                   int &val);
+
+  /// This makes sure that <handle> is set into non-blocking mode.
+  /// <val> keeps track of whether were in non-blocking mode or not.
+  static void record_and_set_non_blocking_mode (ACE_HANDLE handle,
+                                                int &val);
 
   /// Cleanup after a timed operation, restore the appropriate
-  /// non-blocking status of @a handle.
-  extern ACE_Export void restore_non_blocking_mode (ACE_HANDLE handle,
-                                                    int val);
+  /// non-blocking status of <handle>.
+  static void restore_non_blocking_mode (ACE_HANDLE handle,
+                                         int val);
 
-  // private:
-  //   These functions aren't meant to be used internally, so they are
-  //   not exported.
+private:
 
   //
   // = Recv_n helpers
   //
 
-  ACE_NAMESPACE_INLINE_FUNCTION ssize_t recv_i (ACE_HANDLE handle,
-                                                void *buf,
-                                                size_t len);
+  static ssize_t recv_i (ACE_HANDLE handle,
+                         void *buf,
+                         size_t len);
 
-  extern ACE_Export ssize_t recv_n_i (ACE_HANDLE handle,
-                                      void *buf,
-                                      size_t len,
-                                      int flags,
-                                      size_t *bytes_transferred);
+  static ssize_t recv_n_i (ACE_HANDLE handle,
+                           void *buf,
+                           size_t len,
+                           int flags,
+                           size_t *bytes_transferred);
 
-  extern ACE_Export ssize_t recv_n_i (ACE_HANDLE handle,
-                                      void *buf,
-                                      size_t len,
-                                      int flags,
-                                      const ACE_Time_Value *timeout,
-                                      size_t *bytes_transferred);
+  static ssize_t recv_n_i (ACE_HANDLE handle,
+                           void *buf,
+                           size_t len,
+                           int flags,
+                           const ACE_Time_Value *timeout,
+                           size_t *bytes_transferred);
 
 #if defined (ACE_HAS_TLI)
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t t_rcv_n_i (ACE_HANDLE handle,
-                     void *buf,
-                     size_t len,
-                     int *flags,
-                     size_t *bytes_transferred);
-
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t t_rcv_n_i (ACE_HANDLE handle,
-                     void *buf,
-                     size_t len,
-                     int *flags,
-                     const ACE_Time_Value *timeout,
-                     size_t *bytes_transferred);
+  static ssize_t t_rcv_n_i (ACE_HANDLE handle,
+                            void *buf,
+                            size_t len,
+                            int *flags,
+                            size_t *bytes_transferred);
+
+  static ssize_t t_rcv_n_i (ACE_HANDLE handle,
+                            void *buf,
+                            size_t len,
+                            int *flags,
+                            const ACE_Time_Value *timeout,
+                            size_t *bytes_transferred);
 
 #endif /* ACE_HAS_TLI */
 
-  extern ACE_Export ssize_t recv_n_i (ACE_HANDLE handle,
-                                      void *buf,
-                                      size_t len,
-                                      size_t *bytes_transferred);
+  static ssize_t recv_n_i (ACE_HANDLE handle,
+                           void *buf,
+                           size_t len,
+                           size_t *bytes_transferred);
 
-  extern ACE_Export ssize_t recv_n_i (ACE_HANDLE handle,
-                                      void *buf,
-                                      size_t len,
-                                      const ACE_Time_Value *timeout,
-                                      size_t *bytes_transferred);
+  static ssize_t recv_n_i (ACE_HANDLE handle,
+                           void *buf,
+                           size_t len,
+                           const ACE_Time_Value *timeout,
+                           size_t *bytes_transferred);
 
-  extern ACE_Export ssize_t recvv_n_i (ACE_HANDLE handle,
-                                       iovec *iov,
-                                       int iovcnt,
-                                       size_t *bytes_transferred);
+  static ssize_t recvv_n_i (ACE_HANDLE handle,
+                            iovec *iov,
+                            int iovcnt,
+                            size_t *bytes_transferred);
 
-  extern ACE_Export ssize_t recvv_n_i (ACE_HANDLE handle,
-                                       iovec *iov,
-                                       int iovcnt,
-                                       const ACE_Time_Value *timeout,
-                                       size_t *bytes_transferred);
+  static ssize_t recvv_n_i (ACE_HANDLE handle,
+                            iovec *iov,
+                            int iovcnt,
+                            const ACE_Time_Value *timeout,
+                            size_t *bytes_transferred);
 
   //
   // = Send_n helpers
   //
 
-  ACE_NAMESPACE_INLINE_FUNCTION ssize_t send_i (ACE_HANDLE handle,
-                                                const void *buf,
-                                                size_t len);
+  static ssize_t send_i (ACE_HANDLE handle,
+                         const void *buf,
+                         size_t len);
 
-  extern ACE_Export ssize_t send_n_i (ACE_HANDLE handle,
-                                      const void *buf,
-                                      size_t len,
-                                      int flags,
-                                      size_t *bytes_transferred);
+  static ssize_t send_n_i (ACE_HANDLE handle,
+                           const void *buf,
+                           size_t len,
+                           int flags,
+                           size_t *bytes_transferred);
 
-  extern ACE_Export ssize_t send_n_i (ACE_HANDLE handle,
-                                      const void *buf,
-                                      size_t len,
-                                      int flags,
-                                      const ACE_Time_Value *timeout,
-                                      size_t *bytes_transferred);
+  static ssize_t send_n_i (ACE_HANDLE handle,
+                           const void *buf,
+                           size_t len,
+                           int flags,
+                           const ACE_Time_Value *timeout,
+                           size_t *bytes_transferred);
 
 #if defined (ACE_HAS_TLI)
 
-  extern ACE_Export ssize_t t_snd_n_i (ACE_HANDLE handle,
-                                       const void *buf,
-                                       size_t len,
-                                       int flags,
-                                       size_t *bytes_transferred);
+  static ssize_t t_snd_n_i (ACE_HANDLE handle,
+                            const void *buf,
+                            size_t len,
+                            int flags,
+                            size_t *bytes_transferred);
 
-  extern ACE_Export ssize_t t_snd_n_i (ACE_HANDLE handle,
-                                       const void *buf,
-                                       size_t len,
-                                       int flags,
-                                       const ACE_Time_Value *timeout,
-                                       size_t *bytes_transferred);
+  static ssize_t t_snd_n_i (ACE_HANDLE handle,
+                            const void *buf,
+                            size_t len,
+                            int flags,
+                            const ACE_Time_Value *timeout,
+                            size_t *bytes_transferred);
 
 #endif /* ACE_HAS_TLI */
 
-  extern ACE_Export ssize_t send_n_i (ACE_HANDLE handle,
-                                      const void *buf,
-                                      size_t len,
-                                      size_t *bytes_transferred);
+  static ssize_t send_n_i (ACE_HANDLE handle,
+                           const void *buf,
+                           size_t len,
+                           size_t *bytes_transferred);
 
-  extern ACE_Export ssize_t send_n_i (ACE_HANDLE handle,
-                                      const void *buf,
-                                      size_t len,
-                                      const ACE_Time_Value *timeout,
-                                      size_t *bytes_transferred);
+  static ssize_t send_n_i (ACE_HANDLE handle,
+                           const void *buf,
+                           size_t len,
+                           const ACE_Time_Value *timeout,
+                           size_t *bytes_transferred);
 
-  extern ACE_Export ssize_t sendv_n_i (ACE_HANDLE handle,
-                                       const iovec *iov,
-                                       int iovcnt,
-                                       size_t *bytes_transferred);
+  static ssize_t sendv_n_i (ACE_HANDLE handle,
+                            const iovec *iov,
+                            int iovcnt,
+                            size_t *bytes_transferred);
 
-  extern ACE_Export ssize_t sendv_n_i (ACE_HANDLE handle,
-                                       const iovec *iov,
-                                       int iovcnt,
-                                       const ACE_Time_Value *timeout,
-                                       size_t *bytes_transferred);
+  static ssize_t sendv_n_i (ACE_HANDLE handle,
+                            const iovec *iov,
+                            int iovcnt,
+                            const ACE_Time_Value *timeout,
+                            size_t *bytes_transferred);
 
-}
+  /// Size of a VM page.
+  static size_t pagesize_;
+
+  /// Size of allocation granularity.
+  static size_t allocation_granularity_;
+
+  /// CRC table.
+  static u_long crc_table_[];
+
+  /// Hex characters.
+  static const ACE_TCHAR hex_chars_[];
+
+  /// Are we debugging ACE?
+  static char debug_;
+};
 
 #if defined (__ACE_INLINE__)
 #include "ace/ACE.inl"
@@ -818,5 +792,4 @@ namespace ACE
 #endif /* acelog2 */
 
 #include /**/ "ace/post.h"
-
 #endif  /* ACE_ACE_H */
diff --git a/ace/ACE.inl b/ace/ACE.inl
index fcd4e9b407b..9e28d4ea321 100644
--- a/ace/ACE.inl
+++ b/ace/ACE.inl
@@ -278,7 +278,9 @@ ACE::log2 (u_long num)
 {
   u_long log = 0;
 
-  for (; num > 0; ++log)
+  for (;
+       num > 0;
+       log++)
     num >>= 1;
 
   return log;
@@ -287,11 +289,8 @@ ACE::log2 (u_long num)
 ACE_INLINE ACE_TCHAR
 ACE::nibble2hex (u_int n)
 {
-  // Hexadecimal characters.
-  static const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef");
-
   // @@ UNICODE does this work?
-  return hex_chars[n & 0x0f];
+  return ACE::hex_chars_[n & 0x0f];
 }
 
 ACE_INLINE u_char
@@ -304,3 +303,15 @@ ACE::hex2byte (ACE_TCHAR c)
   else
     return (u_char) (10 + c - ACE_LIB_TEXT ('A'));
 }
+
+ACE_INLINE char
+ACE::debug (void)
+{
+  return ACE::debug_;
+}
+
+ACE_INLINE void
+ACE::debug (char c)
+{
+  ACE::debug_ = c;
+}
diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp
index 7e7b323fbdc..16f8ee14dc2 100644
--- a/ace/ARGV.cpp
+++ b/ace/ARGV.cpp
@@ -105,7 +105,61 @@ ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[],
   if (argv == 0 || argv[0] == 0)
     return;
 
-  this->argc_ = ACE_OS::argv_to_string (argv, this->buf_, substitute_env_args);
+  size_t buf_len = 0;
+
+  // Determine the length of the buffer.
+
+  for (int i = 0; argv[i] != 0; i++)
+    {
+#if !defined (ACE_LACKS_ENV)
+      ACE_TCHAR *temp = 0;
+
+      // Account for environment variables.
+      if (this->substitute_env_args_
+	  && (argv[i][0] == '$'
+	  && (temp = ACE_OS::getenv (&argv[i][1])) != 0))
+	buf_len += ACE_OS::strlen (temp);
+      else
+#endif /* !ACE_LACKS_ENV */
+	buf_len += ACE_OS::strlen (argv[i]);
+
+      // Add one for the extra space between each string.
+      buf_len++;
+    }
+
+  // Step through all argv params and copy each one into buf; separate
+  // each param with white space.
+
+  ACE_NEW (this->buf_,
+           ACE_TCHAR[buf_len + 1]);
+
+  ACE_TCHAR *end = this->buf_;
+  int j;
+
+  for (j = 0; argv[j] != 0; j++)
+    {
+#if !defined (ACE_LACKS_ENV)
+      ACE_TCHAR *temp = 0;
+
+      // Account for environment variables.
+      if (this->substitute_env_args_
+	  && (argv[j][0] == '$'
+	  && (temp = ACE_OS::getenv (&argv[j][1])) != 0))
+	end = ACE_OS::strecpy (end, temp);
+      else
+#endif /* ACE_LACKS_ENV */
+	end = ACE_OS::strecpy (end, argv[j]);
+
+      // Replace the null char that strecpy copies with white space as
+      // a separator.
+      *(end - 1) = ACE_LIB_TEXT (' ');
+    }
+
+  // Remember how many arguments there are
+  this->argc_ = j;
+
+  // Null terminate the string.
+  *end = '\0';
 }
 
 ACE_ARGV::ACE_ARGV (ACE_TCHAR *first_argv[],
@@ -128,10 +182,10 @@ ACE_ARGV::ACE_ARGV (ACE_TCHAR *first_argv[],
   ACE_TCHAR *second_buf;
 
   // convert the first argv to a string
-  first_argc = this->argv_to_string (first_argv, first_buf);
+  first_argc = this->argv_to_string (first_argv,first_buf);
 
   // convert the second argv to a string
-  second_argc = this->argv_to_string (second_argv, second_buf);
+  second_argc = this->argv_to_string (second_argv,second_buf);
 
   // Add the number of arguments in both the argvs.
   this->argc_ = first_argc + second_argc;
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index 6303f00f869..719af603aa1 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -78,8 +78,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
     {
       ACE_Errno_Guard g (errno);
       ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("%p\n"),
-                  ACE_LIB_TEXT ("ACE_Asynch_Accept::open")));
+		  ACE_LIB_TEXT ("%p\n"),
+		  ACE_LIB_TEXT ("ACE_Asynch_Accept::open")));
       ACE_OS::closesocket (this->listen_handle_);
       this->listen_handle_ = ACE_INVALID_HANDLE;
       return -1;
@@ -94,29 +94,29 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
                               SO_REUSEADDR,
                               (const char*) &one,
                               sizeof one) == -1)
-        {
-          ACE_Errno_Guard g (errno);
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("%p\n"),
-                      ACE_LIB_TEXT ("ACE_OS::setsockopt")));
-          ACE_OS::closesocket (this->listen_handle_);
-          this->listen_handle_ = ACE_INVALID_HANDLE;
-          return -1;
-        }
+	{
+	  ACE_Errno_Guard g (errno);
+	  ACE_ERROR ((LM_ERROR,
+		      ACE_LIB_TEXT ("%p\n"),
+		      ACE_LIB_TEXT ("ACE_OS::setsockopt")));
+	  ACE_OS::closesocket (this->listen_handle_);
+	  this->listen_handle_ = ACE_INVALID_HANDLE;
+	  return -1;
+	}
     }
 
   // If port is not specified, bind to any port.
   static ACE_INET_Addr sa (ACE_sap_any_cast (const ACE_INET_Addr &));
 
   if (address == sa &&
-      ACE::bind_port (this->listen_handle_,
-                                   INADDR_ANY,
-                                   address.get_type()) == -1)
+      ACE_Sock_Connect::bind_port (this->listen_handle_,
+	                           INADDR_ANY,
+				   address.get_type()) == -1)
     {
       ACE_Errno_Guard g (errno);
       ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("%p\n"),
-                  ACE_LIB_TEXT ("ACE::bind_port")));
+		  ACE_LIB_TEXT ("%p\n"),
+		  ACE_LIB_TEXT ("ACE::bind_port")));
       ACE_OS::closesocket (this->listen_handle_);
       this->listen_handle_ = ACE_INVALID_HANDLE;
       return -1;
@@ -129,8 +129,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
     {
       ACE_Errno_Guard g (errno);
       ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("%p\n"),
-                  ACE_LIB_TEXT ("ACE_OS::bind")));
+		  ACE_LIB_TEXT ("%p\n"),
+		  ACE_LIB_TEXT ("ACE_OS::bind")));
       ACE_OS::closesocket (this->listen_handle_);
       this->listen_handle_ = ACE_INVALID_HANDLE;
       return -1;
@@ -141,8 +141,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
     {
       ACE_Errno_Guard g (errno);
       ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("%p\n"),
-                  ACE_LIB_TEXT ("ACE_OS::listen")));
+		  ACE_LIB_TEXT ("%p\n"),
+		  ACE_LIB_TEXT ("ACE_OS::listen")));
       ACE_OS::closesocket (this->listen_handle_);
       this->listen_handle_ = ACE_INVALID_HANDLE;
       return -1;
@@ -156,15 +156,15 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
     {
       // Initiate accepts.
       if (this->accept (bytes_to_read) == -1)
-        {
-          ACE_Errno_Guard g (errno);
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("%p\n"),
-                      ACE_LIB_TEXT ("ACE_Asynch_Acceptor::accept")));
-          ACE_OS::closesocket (this->listen_handle_);
-          this->listen_handle_ = ACE_INVALID_HANDLE;
-          return -1;
-        }
+	{
+	  ACE_Errno_Guard g (errno);
+	  ACE_ERROR ((LM_ERROR,
+		      ACE_LIB_TEXT ("%p\n"),
+		      ACE_LIB_TEXT ("ACE_Asynch_Acceptor::accept")));
+	  ACE_OS::closesocket (this->listen_handle_);
+	  this->listen_handle_ = ACE_INVALID_HANDLE;
+	  return -1;
+	}
     }
 
   return 0;
diff --git a/ace/Asynch_Connector.cpp b/ace/Asynch_Connector.cpp
index d8cc7b03fd0..927a70e6aa8 100644
--- a/ace/Asynch_Connector.cpp
+++ b/ace/Asynch_Connector.cpp
@@ -22,8 +22,6 @@ ACE_RCSID(ace, Asynch_Connector, "$Id$")
 #include "ace/Message_Block.h"
 #include "ace/INET_Addr.h"
 
-template <class HANDLER>
-const ACE_INET_Addr ACE_Asynch_Connector<HANDLER>::local_default = (u_short) 0;
 
 template <class HANDLER>
 ACE_Asynch_Connector<HANDLER>::ACE_Asynch_Connector (void)
@@ -98,7 +96,7 @@ ACE_Asynch_Connector<HANDLER>::handle_connect (const ACE_Asynch_Connect::Result
 
   // set blocking mode
   if (!error &&
-      ACE::clr_flags
+      ACE_Flag_Manip::clr_flags
         (result.connect_handle (), ACE_NONBLOCK) != 0)
     {
       error = 1;
diff --git a/ace/Asynch_Connector.h b/ace/Asynch_Connector.h
index c1e9a34fb70..8b00b9544af 100644
--- a/ace/Asynch_Connector.h
+++ b/ace/Asynch_Connector.h
@@ -44,7 +44,6 @@ template <class HANDLER>
 class ACE_Asynch_Connector : public ACE_Handler
 {
 public:
-  static const ACE_INET_Addr local_default;
 
   /// A do nothing constructor.
   ACE_Asynch_Connector (void);
@@ -61,7 +60,8 @@ public:
 
   /// This initiates a new asynchronous connect
   virtual int connect (const ACE_INET_Addr &remote_sap,
-                       const ACE_INET_Addr &local_sap = local_default,
+                       const ACE_INET_Addr &local_sap =
+                                   ACE_INET_Addr ((u_short)0),
                        int reuse_addr = 1,
                        const void *act = 0);
 
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index 7565e66cad0..ab56839c2c3 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -92,23 +92,6 @@ public:
 
 #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 
-
-/**
- * @brief Implements the draft C++ standard auto_ptr abstraction.
- * This version can be used instead of auto_ptr<T>, and obviates
- * the need for the ACE_AUTO_PTR_RESET macro on platforms like
- * VC6 where the auto_ptr<T> is broken.
- */
-template <class X>
-class ACE_Auto_Ptr : public ACE_Auto_Basic_Ptr <X>
-{
-public:
-  // = Initialization and termination methods
-  explicit ACE_Auto_Ptr (X *p = 0) : ACE_Auto_Basic_Ptr<X> (p) {}
-
-  X *operator-> () const;
-};
-
 /**
  * @class ACE_Auto_Basic_Array_Ptr
  *
@@ -167,18 +150,18 @@ public:
 // easily.  Portability to these platforms requires
 // use of the following ACE_AUTO_PTR_RESET macro.
 # if defined (ACE_AUTO_PTR_LACKS_RESET)
-#   define ACE_AUTO_PTR_RESET(AUTOPTR,NEWPTR,TYPE) \
+#   define ACE_AUTO_PTR_RESET(X,Y,Z) \
       do { \
-        if (NEWPTR != AUTOPTR.get ()) \
+        if (Y != X.get ()) \
           { \
-            AUTOPTR.release (); \
-            AUTOPTR = auto_ptr<TYPE> (NEWPTR); \
+            X.release (); \
+            X = auto_ptr<Z> (Y); \
           } \
       } while (0)
 # else /* ! ACE_AUTO_PTR_LACKS_RESET */
-#   define ACE_AUTO_PTR_RESET(AUTOPTR,NEWPTR,TYPE) \
+#   define ACE_AUTO_PTR_RESET(X,Y,Z) \
       do { \
-         AUTOPTR.reset (NEWPTR); \
+         X.reset (Y); \
       } while (0)
 # endif /* ACE_AUTO_PTR_LACKS_RESET */
 
diff --git a/ace/Auto_Ptr.inl b/ace/Auto_Ptr.inl
index ce4d53a490c..d891930000e 100644
--- a/ace/Auto_Ptr.inl
+++ b/ace/Auto_Ptr.inl
@@ -92,13 +92,6 @@ auto_ptr<X>::operator-> () const
 #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 
 template<class X> ACE_INLINE X *
-ACE_Auto_Ptr<X>::operator-> () const
-{
-  ACE_TRACE ("ACE_Auto_Ptr<X>::operator->");
-  return this->get ();
-}
-
-template<class X> ACE_INLINE X *
 ACE_Auto_Basic_Array_Ptr<X>::get (void) const
 {
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::get");
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index 3273f6eaccb..4f3e0231d89 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -41,7 +41,7 @@
  */
 //=============================================================================
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #ifndef ACE_BASIC_TYPES_H
 # define ACE_BASIC_TYPES_H
@@ -65,9 +65,9 @@
 
 # include "ace/os_include/sys/os_types.h"
 
-# if !defined (ACE_LACKS_SYS_PARAM_H)
+# if !defined (ACE_LACKS_PARAM_H)
 #  include /**/ <sys/param.h>
-# endif /* ACE_LACKS_SYS_PARAM_H */
+# endif /* ACE_LACKS_PARAM_H */
 
 # include "ace/ACE_export.h"
 
@@ -75,15 +75,11 @@
 # define ACE_SIZEOF_CHAR 1
 
 // Unfortunately, there isn't a portable way to determine the size of a wchar.
-// So we just define them on a platform basis. If the platform doesn't
-// define it and it's an XPG4 system, assume wchar_t is 4 bytes. Some code
-// uses ACE_SIZEOF_WCHAR in preprocessor statements, so sizeof() isn't valid.
-// If the platform config doesn't set this, and this guess is wrong,
-// Basic_Types_Test should catch the inconsistency.
+// So we just define them on a platform basis.
 # if defined (ACE_HAS_WCHAR)
 #   if !defined (ACE_SIZEOF_WCHAR)
 #     if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
-#       define ACE_SIZEOF_WCHAR 4
+#       define ACE_SIZEOF_WCHAR sizeof (wchar_t)
 #     else
 // 0 so the Basic_Types test will catch this.
 #       define ACE_SIZEOF_WCHAR 0
@@ -563,17 +559,17 @@ typedef ptrdiff_t ptr_arith_t;
 # endif /* ! ACE_WIN32  &&  ! ACE_LACKS_LONGLONG_T */
 
 #if !defined (ACE_UINT64_FORMAT_SPECIFIER)
-#  if ACE_SIZEOF_LONG == 8
-#    define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
-#  else
+#  if ACE_SIZEOF_LONG == 8 
+#    define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") 
+#  else 
 #    define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%llu")
 #  endif /* ACE_SIZEOF_LONG == 8*/
 #endif /* ACE_UINT64_FORMAT_SPECIFIER */
 
 #if !defined (ACE_INT64_FORMAT_SPECIFIER)
-#  if ACE_SIZEOF_LONG == 8
-#    define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld")
-#  else
+#  if ACE_SIZEOF_LONG == 8 
+#    define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") 
+#  else 
 #    define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lld")
 #  endif /* ACE_SIZEOF_LONG == 8 */
 #endif /* ACE_INT64_FORMAT_SPECIFIER */
@@ -636,7 +632,7 @@ typedef ptrdiff_t ptr_arith_t;
 #     define ACE_SIZEOF_LONG_DOUBLE 8
 #   elif LDBL_MAX_EXP == 16384
 #     if defined (LDBL_DIG)  &&  LDBL_DIG == 18
-#       if defined (__ia64) || defined (__x86_64)
+#       if defined (__ia64)
 #         define ACE_SIZEOF_LONG_DOUBLE 16
 #       else /* ! __ia64 */
 #       define ACE_SIZEOF_LONG_DOUBLE 12
diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h
index 0503b9cae84..764e7bdcc1b 100644
--- a/ace/CDR_Base.h
+++ b/ace/CDR_Base.h
@@ -39,12 +39,6 @@
 #include "ace/Basic_Types.h"
 #include "ace/Default_Constants.h"
 
-#if !defined (_MSC_VER) || (_MSC_VER >= 1300)
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an unsigned char typedef.
-# include "ace/If_Then_Else.h"
-#endif  /* _MSC_VER < 1300 */
-
 
 class ACE_Message_Block;
 
@@ -167,19 +161,21 @@ public:
   /**
    * @name Basic OMG IDL Types
    *
-   * These types are for use in the CDR classes.  The cleanest way to
+   * These types are for use in the CDRclasses.  The cleanest way to
    * avoid complaints from all compilers is to define them all.
    */
   //@{
-# if (defined (_MSC_VER) && (_MSC_VER < 1300))
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an unsigned char typedef.
+
+  // Versions of GNU G++ less than version 3.0 defined a pre-C99
+  // bool type that was an enumeration.  In some cases the enumeration
+  // could be promoted to an int, causing a potential problem where a
+  // 4 byte integer (for example) could be selected when attempting to
+  // send a boolean over a CDR stream.
+#if defined (__GNUC__) && __GNUC__ < 3
   typedef unsigned char Boolean;
-# else
-  typedef ACE::If_Then_Else<(sizeof (bool) == 1),
-                            bool,
-                            unsigned char>::result_type Boolean;
-# endif  /* _MSC_VER <= 1300 */
+#else
+  typedef bool Boolean;
+#endif  /* bool || __GNUC__ < 3 */
   typedef unsigned char Octet;
   typedef char Char;
   typedef ACE_WCHAR_T WChar;
diff --git a/ace/Cleanup.h b/ace/Cleanup.h
index 4cf7629ac4a..117c65f60e3 100644
--- a/ace/Cleanup.h
+++ b/ace/Cleanup.h
@@ -19,7 +19,7 @@
 
 # include /**/ "ace/pre.h"
 
-# include "ace/config-lite.h"
+# include "ace/config-all.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
diff --git a/ace/DEV_Connector.cpp b/ace/DEV_Connector.cpp
index 5c577754481..3bb63a3aae1 100644
--- a/ace/DEV_Connector.cpp
+++ b/ace/DEV_Connector.cpp
@@ -9,11 +9,7 @@
 #include "ace/DEV_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (ace,
-           DEV_Connector,
-           "$Id$")
-
+ACE_RCSID(ace, DEV_Connector, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector)
 
@@ -32,19 +28,20 @@ ACE_DEV_Connector::ACE_DEV_Connector (void)
 
 int
 ACE_DEV_Connector::connect (ACE_DEV_IO &new_io,
-                            const ACE_DEV_Addr &remote_sap,
-                            ACE_Time_Value *timeout,
-                            const ACE_Addr &,
-                            int,
-                            int flags,
-                            int perms)
+			    const ACE_DEV_Addr &remote_sap,
+			    ACE_Time_Value *timeout,
+			    const ACE_Addr &,
+			    int,
+			    int flags,
+			    int perms)
 {
   ACE_TRACE ("ACE_DEV_Connector::connect");
 
-  ACE_HANDLE handle = ACE::handle_timed_open (timeout,
-                                              remote_sap.get_path_name (),
-                                              flags, perms);
+  ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout,
+					      remote_sap.get_path_name (),
+					      flags, perms);
   new_io.set_handle (handle);
   new_io.addr_ = remote_sap; // class copy.
   return handle == ACE_INVALID_HANDLE ? -1 : 0;
 }
+
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index bdb5bee9f16..6050db06050 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -22,10 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_STREAM_PIPES)
-#  include "ace/OS_NS_stropts.h"
-#endif /* ACE_HAS_STREAM_PIPES */
-
 #include "ace/os_include/os_stdio.h"
 #include "ace/os_include/sys/os_uio.h"
 
diff --git a/ace/DLL_Manager.cpp b/ace/DLL_Manager.cpp
index 8d1e75c6660..204d1f5ebb9 100644
--- a/ace/DLL_Manager.cpp
+++ b/ace/DLL_Manager.cpp
@@ -86,72 +86,33 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
           if (ACE::debug ())
             ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_DLL_Handle::open: calling dlopen on ")
                         ACE_LIB_TEXT ("\"%s\"\n"), dll_name));
-
-          /*
-          ** Get the set of names to try loading. We need to do this to
-          ** properly support the ability for a user to specify a simple,
-          ** unadorned name (for example, "ACE") that will work across
-          ** platforms. We apply platform specifics to get a name that will
-          ** work (e.g. libACE, ACEd.dll, ACE.dll, etc.) We rely on the
-          ** underlying dlopen() implementation to "Do The Right Thing" in
-          ** terms of using relative paths, LD_LIBRARY_PATH, system security
-          ** rules, etc. except when ACE_MUST_HELP_DLOPEN_SEARCH_PATH is set.
-          ** If it is set, then ACE::ldfind() scans the configured path
-          ** looking for a match on the name and prefix/suffix applications.
-          ** NOTE: having ACE scan for a file and then pass a fully-qualified
-          ** pathname to dlopen() is a potential security hole; therefore,
-          ** do not use ACE_MUST_HELP_DLOPEN_SEARCH_PATH unless necessary
-          ** and only after considering the risks.
-          */
-          ACE_Array<ACE_TString> dll_names;
-          dll_names.max_size (10);    // Decent guess to avoid realloc later
-
-#if defined (ACE_MUST_HELP_DLOPEN_SEARCH_PATH)
           // Find out where the library is
           ACE_TCHAR dll_pathname[MAXPATHLEN + 1];
 
           // Transform the pathname into the appropriate dynamic link library
           // by searching the ACE_LD_SEARCH_PATH.
-          ACE::ldfind (dll_name,
-                       dll_pathname,
-                       (sizeof dll_pathname / sizeof (ACE_TCHAR)));
-          ACE_TString dll_str (dll_pathname);
-          dll_names.size (1);
-          dll_names.set (dll_str, 0);
-#else
-          this->get_dll_names (dll_name, dll_names);
-#endif
-
-          ACE_Array_Iterator<ACE_TString> name_iter (dll_names);
-          ACE_TString *name = 0;
-          while (name_iter.next (name))
-            {
-              // The ACE_SHLIB_HANDLE object is obtained.
-              this->handle_ = ACE_OS::dlopen (name->c_str (),
-                                              open_mode);
-              if (this->handle_ != ACE_SHLIB_INVALID_HANDLE)   // Good one
-                break;
+          ACE_Lib_Find::ldfind (dll_name,
+                                dll_pathname,
+                                (sizeof dll_pathname / sizeof (ACE_TCHAR)));
+
+          // The ACE_SHLIB_HANDLE object is obtained.
+          this->handle_ = ACE_OS::dlopen (dll_pathname,
+                                          open_mode);
 
 #if defined (AIX)
-              // AIX often puts the shared library file (most often named
-              // shr.o) inside an archive library. If this is an archive
-              // library name, then try appending [shr.o] and retry.
-              if (ACE_TString::npos != name->strstr (ACE_LIB_TEXT (".a")))
+          if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
+            {
+              // AIX often puts the shared library file (most often named shr.o)
+              // inside an archive library. If this is an archive library
+              // name, then try appending [shr.o] and retry.
+              if (0 != ACE_OS::strstr (dll_pathname, ACE_LIB_TEXT (".a")))
                 {
-                  ACE_TCHAR aix_pathname[MAXPATHLEN + 1];
-                  ACE_OS::strncpy (aix_pathname,
-                                   name->c_str (),
-                                   name->length ());
-                  aix_pathname[name->length ()] = '\0';
-                  ACE_OS::strcat (aix_pathname, ACE_LIB_TEXT ("(shr.o)"));
+                  ACE_OS::strcat (dll_pathname, ACE_LIB_TEXT ("(shr.o)"));
                   open_mode |= RTLD_MEMBER;
-                  this->handle_ = ACE_OS::dlopen (aix_pathname, open_mode);
-                  if (this->handle_ != ACE_SHLIB_INVALID_HANDLE)
-                    break;
+                  this->handle_ = ACE_OS::dlopen (dll_pathname, open_mode);
                 }
-#endif /* AIX */
-              name_iter.advance ();
             }
+#endif /* AIX */
 
           if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
             {
@@ -232,7 +193,7 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, int ignore_errors)
   ACE_TRACE ("ACE_DLL_Handle::symbol");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
 
-  ACE_Auto_Array_Ptr <ACE_TCHAR> auto_name (ACE::ldname (sym_name));
+  ACE_Auto_Array_Ptr <ACE_TCHAR> auto_name (ACE_Lib_Find::ldname (sym_name));
     // handle_ can be invalid especially when ACE_DLL_Handle resigned ownership
     // BTW. Handle lifecycle management is a little crazy in ACE
   if ( this->handle_ != ACE_SHLIB_INVALID_HANDLE )
@@ -305,97 +266,6 @@ ACE_DLL_Handle::error (void)
   return str;
 }
 
-void
-ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name,
-                               ACE_Array<ACE_TString> &try_names)
-{
-  // Build the array of DLL names to try on this platform by applying the
-  // proper prefixes and/or suffixes to the specified dll_name.
-  ACE_TString base (dll_name);
-  ACE_TString base_dir, base_file, base_suffix;
-
-  // 1. Separate the dll_name into the dir part and the file part. We
-  // only decorate the file part to determine the names to try loading.
-  int pos = base.rfind (ACE_DIRECTORY_SEPARATOR_CHAR);
-  if (pos != ACE_TString::npos)
-    {
-      base_dir = base.substr (0, static_cast<ssize_t>(pos) + 1);
-      base_file = base.substr (static_cast<size_t>(pos) + 1);
-    }
-  else
-    base_file = base;
-
-  // 2. Locate the file suffix, if there is one. Move the '.' and the
-  // suffix to base_suffix.
-  if ((pos = base_file.rfind (ACE_TEXT ('.'))) != ACE_TString::npos)
-    {
-      base_suffix = base_file.substr (static_cast<size_t>(pos));
-      base_file = base_file.substr (0, static_cast<ssize_t>(pos));
-    }
-
-  // 3. Build the combinations to try for this platform.
-  // Try these combinations:
-  //   - name as originally given
-  //   - name with decorator and platform's suffix appended (if not supplied)
-  //   - name with platform's suffix appended (if not supplied)
-  //   - name with platform's dll prefix (if it has one) and suffix
-  //   - name with platform's dll prefix, decorator, and suffix.
-  // So we need room for 5 entries in try_names.
-  try_names.size (0);
-  if ((try_names.max_size () - try_names.size ()) < 5)
-    try_names.max_size (try_names.max_size () + 5);
-#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-  ACE_TString decorator (ACE_LD_DECORATOR_STR);
-#endif
-  ACE_TString suffix (ACE_DLL_SUFFIX);
-  ACE_TString prefix (ACE_DLL_PREFIX);
-
-  for (size_t i = 0; i < 5 && try_names.size () < try_names.max_size (); ++i)
-    {
-      ACE_TString try_this;
-      size_t j = try_names.size ();
-      switch (i)
-        {
-        case 0:
-          try_this = dll_name;
-          break;
-
-        case 1:        // Name + decorator + suffix
-        case 2:        // Name + suffix
-        case 3:        // Prefix + name + decorator + suffix
-        case 4:        // Prefix + name + suffix
-          if (
-              base_suffix.length () > 0
-#if !(defined(ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK))
-              || (i == 2 || i == 4)    // No decorator desired; skip
-#endif
-              )
-            break;
-          try_this = base_dir;
-          if (i > 2)
-            try_this += prefix;
-          try_this += base_file;
-          if (base_suffix.length () > 0)
-            try_this += base_suffix;
-          else
-            {
-#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-              try_this += decorator;
-#endif
-              try_this += suffix;
-            }
-          break;
-        }
-
-      if (try_this.length ())
-        {
-          try_names.size (j + 1);
-          try_names.set (try_this, j);
-        }
-    }
-  return;
-}
-
 /******************************************************************/
 
 // Pointer to the Singleton instance.
@@ -672,8 +542,6 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload)
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array_Base<ACE_TString>;
-template class ACE_Array_Iterator<ACE_TString>;
 template class auto_ptr<ACE_TString>;
 #  if defined (ACE_LACKS_AUTO_PTR) \
       || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
@@ -681,9 +549,7 @@ template class auto_ptr<ACE_TString>;
 template class ACE_Auto_Basic_Ptr<ACE_TString>;
 #  endif  /* ACE_LACKS_AUTO_PTR */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate ACE_Array_Base<ACE_TString>
-# pragma instantiate ACE_Array_Iterator<ACE_TString>
-# pragma instantiate auto_ptr<ACE_TString>
+#pragma instantiate auto_ptr<ACE_TString>
 #  if defined (ACE_LACKS_AUTO_PTR) \
       || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
            && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
diff --git a/ace/DLL_Manager.h b/ace/DLL_Manager.h
index 856fbe4e861..0203155bd94 100644
--- a/ace/DLL_Manager.h
+++ b/ace/DLL_Manager.h
@@ -22,7 +22,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Auto_Ptr.h"
-#include "ace/Containers_T.h"
 #include "ace/SStringfwd.h"
 #include "ace/os_include/os_dlfcn.h"
 
@@ -108,12 +107,6 @@ private:
   /// to the caller.
   auto_ptr <ACE_TString> error (void);
 
-  // Builds array of DLL names to try to dlopen, based on platform
-  // and configured DLL prefixes/suffixes.
-  // Returns the array of names to try in try_names.
-  void get_dll_names (const ACE_TCHAR *dll_name,
-                      ACE_Array<ACE_TString> &try_names);
-
   // Keep track of how many ACE_DLL objects have a reference to this
   // dll.
   sig_atomic_t refcount_;
diff --git a/ace/Default_Constants.h b/ace/Default_Constants.h
index b483d4152c2..f1d99a59b9b 100644
--- a/ace/Default_Constants.h
+++ b/ace/Default_Constants.h
@@ -500,9 +500,9 @@ const unsigned int ACE_CONNECTOR_HANDLER_MAP_SIZE = 16;
  // Used for dynamic linking.
 #if !defined (ACE_DEFAULT_SVC_CONF)
 #  if (ACE_USES_CLASSIC_SVC_CONF == 1)
-#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf")
+#    define ACE_DEFAULT_SVC_CONF "./svc.conf"
 #  else
-#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf.xml")
+#    define ACE_DEFAULT_SVC_CONF "./svc.conf.xml"
 #  endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
 #endif /* ACE_DEFAULT_SVC_CONF */
 
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index f0bf6b15a1b..90dc7ac525a 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/ace/Dev_Poll_Reactor.cpp
@@ -14,7 +14,7 @@ ACE_RCSID (ace,
 #    include "ace/OS_NS_unistd.h"
 #    include "ace/OS_NS_fcntl.h"
 
-#    include /**/ <sys/epoll.h>
+#    include <sys/epoll.h>
 
 #  elif defined (ACE_HAS_DEV_POLL)
 
diff --git a/ace/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h
index a35a087d6a1..77efe756d21 100644
--- a/ace/Dev_Poll_Reactor.h
+++ b/ace/Dev_Poll_Reactor.h
@@ -29,7 +29,7 @@
 // The sys_epoll interface was introduced in Linux kernel 2.5.45.
 // Don't support backported versions since they appear to be buggy.
 // The obsolete ioctl()-based interface is no longer supported.
-# include /**/ <linux/version.h>
+# include <linux/version.h>
 # if LINUX_VERSION_CODE < KERNEL_VERSION (2,5,45)
 #   undef ACE_HAS_EVENT_POLL
 #   error Disabling Linux epoll support.  Kernel used in C library is too old.
diff --git a/ace/Dump_T.cpp b/ace/Dump_T.cpp
index fe83085ee1a..806ccd2f443 100644
--- a/ace/Dump_T.cpp
+++ b/ace/Dump_T.cpp
@@ -6,7 +6,6 @@
 
 #include "ace/Dump_T.h"
 #include "ace/Global_Macros.h"
-#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h
index e7cddce6ad8..85d1a2f7730 100644
--- a/ace/Dynamic_Service.h
+++ b/ace/Dynamic_Service.h
@@ -39,11 +39,10 @@ template <class TYPE>
 class ACE_Dynamic_Service : public ACE_Dynamic_Service_Base
 {
 public:
-  /// Return instance using @a name to search the Service_Repository.
-  static TYPE* instance (const ACE_TCHAR *name);
+  /// Return instance using <name> to search the Service_Repository.
+  static TYPE*instance (const ACE_TCHAR *name);
 
 #if defined (ACE_USES_WCHAR)
-  /// Return instance using @a name to search the Service_Repository.
   static TYPE* instance (const ACE_ANTI_TCHAR *name);
 #endif  // ACE_USES_WCHAR
 };
diff --git a/ace/Env_Value_T.inl b/ace/Env_Value_T.inl
index 2a58036c2f3..9f98f0fdb45 100644
--- a/ace/Env_Value_T.inl
+++ b/ace/Env_Value_T.inl
@@ -33,15 +33,10 @@ ACE_Env_Value<T>::open (const ACE_TCHAR *varname,
 template <class T> ACE_INLINE void
 ACE_Env_Value<T>::fetch_value (void)
 {
-#if defined (ACE_WIN32)
-  const ACE_TCHAR *env = ACE_OS::getenv (this->varname_);
+  const ACE_TCHAR *env = ACE_OS::getenv (varname_);
+
   if (env != 0)
     ACE_Convert (env, value_);
-#else
-  char *nenv = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (this->varname_));
-  if (nenv != 0)
-    ACE_Convert (ACE_TEXT_CHAR_TO_TCHAR (nenv), value_);
-#endif
 }
 
 template <class T> ACE_INLINE const ACE_TCHAR*
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index 1352a65d486..4f2d10f3df8 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -100,9 +100,9 @@ public:
   // These methods all delegate down to the <T> operations handler.
   virtual ACE_HANDLE get_handle (void) const;
   virtual void set_handle (ACE_HANDLE);
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  virtual int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE);
+  virtual int handle_input (ACE_HANDLE fd = -1);
+  virtual int handle_output (ACE_HANDLE fd = -1);
+  virtual int handle_exception (ACE_HANDLE fd = -1);
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0);
   virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask);
   virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h
index b7f0e104177..b4efb1607cf 100644
--- a/ace/FIFO_Send_Msg.h
+++ b/ace/FIFO_Send_Msg.h
@@ -21,10 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_STREAM_PIPES)
-#  include "ace/OS_NS_stropts.h"
-#endif /* ACE_HAS_STREAM_PIPES */
-
 // Forward Decls
 class ACE_Str_Buf;
 
diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp
index 8a44c0757c5..5109e375253 100644
--- a/ace/FILE_Addr.cpp
+++ b/ace/FILE_Addr.cpp
@@ -31,7 +31,7 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
       ACE_OS::strcpy (this->filename_,
                       ACE_DEFAULT_TEMP_FILE);
 #else /* ACE_DEFAULT_TEMP_FILE */
-      if (ACE::get_temp_dir (this->filename_,
+      if (ACE_Lib_Find::get_temp_dir (this->filename_,
                                       MAXPATHLEN - 15) == -1)
         // -15 for ace-file-XXXXXX
         {
diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp
index 446be74fdf5..665deb3c077 100644
--- a/ace/FILE_Connector.cpp
+++ b/ace/FILE_Connector.cpp
@@ -32,12 +32,12 @@ ACE_FILE_Connector::ACE_FILE_Connector (void)
 
 int
 ACE_FILE_Connector::connect (ACE_FILE_IO &new_io,
-                             const ACE_FILE_Addr &remote_sap,
-                             ACE_Time_Value *timeout,
-                             const ACE_Addr &,
-                             int,
-                             int flags,
-                             int perms)
+			     const ACE_FILE_Addr &remote_sap,
+			     ACE_Time_Value *timeout,
+			     const ACE_Addr &,
+			     int,
+			     int flags,
+			     int perms)
 {
   ACE_TRACE ("ACE_FILE_Connector::connect");
   ACE_ASSERT (new_io.get_handle () == ACE_INVALID_HANDLE);
@@ -65,7 +65,7 @@ ACE_FILE_Connector::connect (ACE_FILE_IO &new_io,
       handle = ACE_OS::mkstemp (filename); // mkstemp() replaces "XXXXXX"
 
       if (handle == ACE_INVALID_HANDLE
-          || new_io.addr_.set (ACE_TEXT_CHAR_TO_TCHAR (filename)) != 0)
+          || new_io.addr_.set (filename) != 0)
         return -1;
 
       new_io.set_handle (handle);
@@ -76,7 +76,7 @@ ACE_FILE_Connector::connect (ACE_FILE_IO &new_io,
   else
     new_io.addr_ = remote_sap; // class copy.
 
-  handle = ACE::handle_timed_open (timeout,
+  handle = ACE_Handle_Ops::handle_timed_open (timeout,
                                               new_io.addr_.get_path_name (),
                                               flags,
                                               perms);
diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h
index 0bc7c98e187..ee44973a083 100644
--- a/ace/FILE_IO.h
+++ b/ace/FILE_IO.h
@@ -26,10 +26,6 @@
 #include "ace/os_include/os_stdio.h"
 #include "ace/os_include/sys/os_uio.h"
 
-#if defined (ACE_HAS_STREAM_PIPES)
-#  include "ace/OS_NS_stropts.h"
-#endif /* ACE_HAS_STREAM_PIPES */
-
 // Forward decl.
 class ACE_Message_Block;
 class ACE_Time_Value;
diff --git a/ace/Flag_Manip.cpp b/ace/Flag_Manip.cpp
index 50df345d56a..fcd7fa450a5 100644
--- a/ace/Flag_Manip.cpp
+++ b/ace/Flag_Manip.cpp
@@ -15,16 +15,14 @@
 #  include "ace/os_include/os_termios.h"
 #endif /* CYGWIN32 */
 
-ACE_RCSID (ace,
-           Flag_Manip,
-           "$Id$")
+ACE_RCSID(ace, Flag_Manip, "$Id$")
 
 // Flags are file status flags to turn on.
 
 int
-ACE::set_flags (ACE_HANDLE handle, int flags)
+ACE_Flag_Manip::set_flags (ACE_HANDLE handle, int flags)
 {
-  ACE_TRACE ("ACE::set_flags");
+  ACE_TRACE ("ACE_Flag_Manip::set_flags");
 #if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
   switch (flags)
     {
@@ -57,9 +55,9 @@ ACE::set_flags (ACE_HANDLE handle, int flags)
 // Flags are the file status flags to turn off.
 
 int
-ACE::clr_flags (ACE_HANDLE handle, int flags)
+ACE_Flag_Manip::clr_flags (ACE_HANDLE handle, int flags)
 {
-  ACE_TRACE ("ACE::clr_flags");
+  ACE_TRACE ("ACE_Flag_Manip::clr_flags");
 
 #if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
   switch (flags)
diff --git a/ace/Flag_Manip.h b/ace/Flag_Manip.h
index 28646f98350..5357a798a5f 100644
--- a/ace/Flag_Manip.h
+++ b/ace/Flag_Manip.h
@@ -26,26 +26,22 @@
 #include "ace/Global_Macros.h"
 #include "ace/os_include/os_fcntl.h"   /* For values passed to these methods */
 
-#if defined (ACE_EXPORT_MACRO)
-#  undef ACE_EXPORT_MACRO
-#endif
-#define ACE_EXPORT_MACRO ACE_Export
-
-
-namespace ACE
+class ACE_Export ACE_Flag_Manip
 {
+ public:
+
   // = Set/get/clear various flags related to I/O HANDLE.
-  /// Set flags associated with @a handle.
-  extern ACE_Export int set_flags (ACE_HANDLE handle,
-                                   int flags);
+  /// Set flags associated with <handle>.
+  static int set_flags (ACE_HANDLE handle,
+                        int flags);
 
-  /// Clear flags associated with @a handle.
-  extern ACE_Export int clr_flags (ACE_HANDLE handle,
-                                   int flags);
+  /// Clear flags associated with <handle>.
+  static int clr_flags (ACE_HANDLE handle,
+                        int flags);
 
-  /// Return the current setting of flags associated with @a handle.
-  ACE_NAMESPACE_INLINE_FUNCTION int get_flags (ACE_HANDLE handle);
-}
+  /// Return the current setting of flags associated with <handle>.
+  static int get_flags (ACE_HANDLE handle);
+};
 
 #if defined (__ACE_INLINE__)
 #include "ace/Flag_Manip.inl"
diff --git a/ace/Flag_Manip.inl b/ace/Flag_Manip.inl
index 0009be56695..3eb4b236023 100644
--- a/ace/Flag_Manip.inl
+++ b/ace/Flag_Manip.inl
@@ -6,9 +6,9 @@
 #include "ace/OS_NS_fcntl.h"
 
 ACE_INLINE int
-ACE::get_flags (ACE_HANDLE handle)
+ACE_Flag_Manip::get_flags (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE::get_flags");
+  ACE_TRACE ("ACE_Flag_Manip::get_flags");
 
 #if defined (ACE_LACKS_FCNTL)
   // ACE_OS::fcntl is not supported, e.g., on VxWorks.  It
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index 3492b31c263..e95ef4701ad 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -118,13 +118,7 @@ ACE_Get_Opt::ACE_Get_Opt (int argc,
   ACE_NEW (this->last_option_, ACE_TString (ACE_LIB_TEXT ("")));
 
   // First check to see if POSIXLY_CORRECT was set.
-  // Win32 is the only platform capable of wide-char env var.
-#if defined (ACE_WIN32)
-  const ACE_TCHAR *env_check = ACE_LIB_TEXT ("POSIXLY_CORRECT");
-#else
-  const char *env_check = "POSIXLY_CORRECT";
-#endif
-  if (ACE_OS::getenv (env_check) != 0)
+  if (ACE_OS::getenv (ACE_LIB_TEXT ("POSIXLY_CORRECT")) != 0)
     this->ordering_ = REQUIRE_ORDER;
 
   // Now, check to see if any or the following were passed at
diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h
index d4dc3dae628..9304ac28501 100644
--- a/ace/Global_Macros.h
+++ b/ace/Global_Macros.h
@@ -358,6 +358,15 @@ friend class ace_dewarn_gplusplus
             } \
         } \
      while (0)
+#   if defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L
+  // LynxOS 3.0.0's g++ has trouble with the real versions of these.
+#     define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER)
+#     define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER)
+#     define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
+#     define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
+#     define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
+#     define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
+#   else
 #     define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
        do { \
             if (POINTER) \
@@ -422,6 +431,7 @@ friend class ace_dewarn_gplusplus
               } \
           } \
        while (0)
+#   endif /* defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L */
 # endif /* defined ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */
 
 
diff --git a/ace/Handle_Ops.cpp b/ace/Handle_Ops.cpp
index eb373af8020..e58ebfb6f26 100644
--- a/ace/Handle_Ops.cpp
+++ b/ace/Handle_Ops.cpp
@@ -6,18 +6,16 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/Time_Value.h"
 
-ACE_RCSID (ace,
-           Handle_Ops,
-           "$Id$")
+ACE_RCSID(ace, Handle_Ops, "$Id$")
 
 ACE_HANDLE
-ACE::handle_timed_open (ACE_Time_Value *timeout,
-                        const ACE_TCHAR *name,
-                        int flags,
-                        int perms,
-                        LPSECURITY_ATTRIBUTES sa)
+ACE_Handle_Ops::handle_timed_open (ACE_Time_Value *timeout,
+                                   const ACE_TCHAR *name,
+                                   int flags,
+                                   int perms,
+                                   LPSECURITY_ATTRIBUTES sa)
 {
-  ACE_TRACE ("ACE::handle_timed_open");
+  ACE_TRACE ("ACE_Handle_Ops::handle_timed_open");
 
   if (timeout != 0)
     {
diff --git a/ace/Handle_Ops.h b/ace/Handle_Ops.h
index 7f50eba8270..66bdf4dfa34 100644
--- a/ace/Handle_Ops.h
+++ b/ace/Handle_Ops.h
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  This class consolidates the operations on the Handles.
+ * This class consolidates the operations on the Handles.
+ *
  *
  *  @author Priyanka Gontla <pgontla@ece.uci.edu>
  */
@@ -27,21 +28,22 @@
 
 class ACE_Time_Value;
 
-// = Operations on HANDLEs.
-namespace ACE
+class ACE_Export ACE_Handle_Ops
 {
+public:
+  // = Operations on HANDLEs.
+
   /**
-   * Wait up to @a timeout> amount of time to actively open a device.
-   * This method doesn't perform the @c connect, it just does the
-   * timed wait.
+   * Wait up to <timeout> amount of time to actively open a device.
+   * This method doesn't perform the <connect>, it just does the timed
+   * wait...
    */
-  extern ACE_Export ACE_HANDLE handle_timed_open (
-    ACE_Time_Value *timeout,
-    const ACE_TCHAR *name,
-    int flags,
-    int perms,
-    LPSECURITY_ATTRIBUTES sa = 0);
-}
+  static ACE_HANDLE handle_timed_open (ACE_Time_Value *timeout,
+                                       const ACE_TCHAR *name,
+                                       int flags,
+                                       int perms,
+                                       LPSECURITY_ATTRIBUTES sa = 0);
+};
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index f2ba4c05687..57ece6e2f05 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -75,12 +75,11 @@ ACE_High_Res_Timer::get_cpuinfo (void)
   int supported = 0;
 #endif /* __alpha__ */
 
-  FILE *cpuinfo = ACE_OS::fopen (ACE_LIB_TEXT ("/proc/cpuinfo"),
-                                 ACE_LIB_TEXT ("r"));
+  FILE *cpuinfo = ACE_OS::fopen ("/proc/cpuinfo", "r");
 
   if (cpuinfo != 0)
     {
-      char buf[128];
+      ACE_TCHAR buf[128];
 
       // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nReading /proc/cpuinfo...")));
 
@@ -104,7 +103,7 @@ ACE_High_Res_Timer::get_cpuinfo (void)
 #else
           double mhertz = 1;
           double bmips = 1;
-          char arg[128];
+          ACE_TCHAR arg[128];
 
           // CPU type?
           if (::sscanf (buf, "cpu : %s\n", arg) == 1)
@@ -334,17 +333,16 @@ ACE_High_Res_Timer::reset (void)
 {
   ACE_TRACE ("ACE_High_Res_Timer::reset");
 
-  this->start_ = 0;
-  this->end_ = 0;
-  this->total_ = 0;
-  this->start_incr_ = 0;
+  start_ = 0;
+  end_ = 0;
+  total_ = 0;
+  start_incr_ = 0;
 }
 
 void
 ACE_High_Res_Timer::elapsed_time (ACE_Time_Value &tv) const
 {
-  hrtime_to_tv (tv,
-                ACE_High_Res_Timer::elapsed_hrtime (this->end_, this->start_));
+  hrtime_to_tv (tv, end_ - start_);
 }
 
 #if defined (ACE_HAS_POSIX_TIME)
@@ -362,14 +360,12 @@ ACE_High_Res_Timer::elapsed_time (struct timespec &elapsed_time) const
   // Then it converts that to nanoseconds by dividing by the scale
   // factor to convert to usec, and multiplying by 1000.)  The cast
   // avoids a MSVC 4.1 compiler warning about narrowing.
-  ACE_hrtime_t elapsed =
-    ACE_High_Res_Timer::elapsed_hrtime (this->end_, this->start_);
-  u_long nseconds = static_cast<u_long> (elapsed %
+  u_long nseconds = static_cast<u_long> ((this->end_ - this->start_) %
                                          global_scale_factor () * 1000u /
                                          global_scale_factor ());
 
   // Get just the microseconds (dropping any left over nanoseconds).
-  ACE_UINT32 useconds = (ACE_UINT32) (elapsed / global_scale_factor ());
+  ACE_UINT32 useconds = (ACE_UINT32) ((this->end_ - this->start_) / global_scale_factor ());
 
 #if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS)
   elapsed_time.tv_sec = (time_t) (useconds / ACE_ONE_SECOND_IN_USECS);
@@ -397,10 +393,10 @@ ACE_High_Res_Timer::elapsed_time (ACE_hrtime_t &nanoseconds) const
   // native 64-bit ints. In particular, division can be a problem.
   // For more background on this, please see bugzilla #1024.
 #if defined (ACE_WIN32)
-  nanoseconds = ACE_High_Res_Timer::elapsed_hrtime (this->end_, this->start_)
+  nanoseconds = (this->end_ - this->start_)
             * (1024000000u / ACE_High_Res_Timer::global_scale_factor());
 #else
-  nanoseconds = ACE_High_Res_Timer::elapsed_hrtime (this->end_, this->start_)
+  nanoseconds = (this->end_ - this->start_)
             * (1024000u / ACE_High_Res_Timer::global_scale_factor ());
 #endif /* ACE_WIN32 */
   // Caution - Borland has a problem with >>=, so resist the temptation.
@@ -517,7 +513,7 @@ ACE_High_Res_Timer::get_env_global_scale_factor (const ACE_TCHAR *env)
 #if !defined (ACE_HAS_WINCE)
   if (env != 0)
     {
-      const char *env_value = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (env));
+      const ACE_TCHAR *env_value = ACE_OS::getenv (env);
       if (env_value != 0)
         {
           int value = ACE_OS::atoi (env_value);
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 194143b097b..cf9ae847693 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -279,12 +279,6 @@ private:
   static ACE_hrtime_t gettime (const ACE_OS::ACE_HRTimer_Op =
                                  ACE_OS::ACE_HRTIMER_GETTIME);
 
-  /// Calculate the difference between two ACE_hrtime_t values. It is assumed
-  /// that the end time is later than start time, so if end is a smaller
-  /// value, the time counter has wrapped around.
-  static ACE_hrtime_t elapsed_hrtime (const ACE_hrtime_t end,
-                                      const ACE_hrtime_t start);
-
   /// Starting time.
   ACE_hrtime_t start_;
 
diff --git a/ace/High_Res_Timer.inl b/ace/High_Res_Timer.inl
index 49fff1aabe4..8b9e72b828e 100644
--- a/ace/High_Res_Timer.inl
+++ b/ace/High_Res_Timer.inl
@@ -105,15 +105,6 @@ ACE_High_Res_Timer::gettime (const ACE_OS::ACE_HRTimer_Op op)
   return ACE_OS::gethrtime (op);
 }
 
-ACE_INLINE ACE_hrtime_t
-ACE_High_Res_Timer::elapsed_hrtime (const ACE_hrtime_t end,
-                                    const ACE_hrtime_t start)
-{
-  if (end > start)
-    return end - start;
-  return (~start + 1 + end);     // Wrapped-around counter diff
-}
-
 ACE_INLINE
 ACE_High_Res_Timer::~ACE_High_Res_Timer (void)
 {
@@ -144,25 +135,26 @@ ACE_INLINE void
 ACE_High_Res_Timer::stop_incr (const ACE_OS::ACE_HRTimer_Op op)
 {
   ACE_TRACE ("ACE_High_Res_Timer::stop_incr");
-  this->total_ +=
-    ACE_High_Res_Timer::elapsed_hrtime (ACE_High_Res_Timer::gettime (op),
-                                        this->start_incr_);
+  this->total_ += ACE_High_Res_Timer::gettime (op) - this->start_incr_;
 }
 
 ACE_INLINE void
 ACE_High_Res_Timer::elapsed_microseconds (ACE_hrtime_t &usecs) const
 {
-  ACE_hrtime_t elapsed = ACE_High_Res_Timer::elapsed_hrtime (this->end_,
-                                                             this->start_);
 #if defined (ACE_WIN32)
   // Win32 scale factor is in msec
   // This could give overflow when measuring a long time with a
   // big global_scale_factor() (> 48 days with a 4Ghz tick freq.)
   // To be looked after in the future.
-  usecs = (ACE_hrtime_t) ((elapsed * 1000) / global_scale_factor ());
+  usecs = (ACE_hrtime_t) (((this->end_ - this->start_) * 1000) /
+                          global_scale_factor ());
 #else
-  usecs = (ACE_hrtime_t) (elapsed / global_scale_factor ());
+  usecs =
+    (ACE_hrtime_t) ((this->end_ - this->start_) / global_scale_factor ());
 #endif
+
+
+
 }
 
 ACE_INLINE void
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index a80a2fd06a9..ac100d46117 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -40,6 +40,9 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
                       ACE_OS::strlen (this->get_host_addr ()))
     + ACE_OS::strlen ("65536") // Assume the max port number.
     + sizeof (':')
+#if defined ACE_HAS_IPV6
+    + ACE_OS::strlen ("[]")
+#endif
     + sizeof ('\0'); // For trailing '\0'.
 
   if (size < total_len)
@@ -47,7 +50,11 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
   else
     {
       ACE_OS::sprintf (s,
+#if defined ACE_HAS_IPV6
+                       ACE_LIB_TEXT ("[%s]:%d"),
+#else
                        ACE_LIB_TEXT ("%s:%d"),
+#endif
                        ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
                                                ? this->get_host_name ()
                                                : this->get_host_addr ()),
diff --git a/ace/INET_Addr.inl b/ace/INET_Addr.inl
index 41743b5ae7f..2f1b4f6c968 100644
--- a/ace/INET_Addr.inl
+++ b/ace/INET_Addr.inl
@@ -30,7 +30,7 @@ ACE_INET_Addr::determine_type (void) const
 {
 #if defined (ACE_HAS_IPV6)
 #  if defined (ACE_USES_IPV4_IPV6_MIGRATION)
-  return ACE::ipv6_enabled () ? AF_INET6 : AF_INET;
+  return ACE_Sock_Connect::ipv6_enabled () ? AF_INET6 : AF_INET;
 #  else
   return AF_INET6;
 #  endif /* ACE_USES_IPV4_IPV6_MIGRATION */
diff --git a/ace/IOStream.h b/ace/IOStream.h
index 66aa738227a..e4df98db3d9 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -158,7 +158,7 @@ public:
   virtual ~ACE_Streambuf (void);
 
   /// Get the current Time_Value pointer and provide a new one.
-  ACE_Time_Value *recv_timeout (ACE_Time_Value *tv = 0);
+  ACE_Time_Value *recv_timeout (ACE_Time_Value *tv = NULL);
 
   /**
    * Use this to allocate a new/different buffer for put operations.
@@ -169,7 +169,7 @@ public:
    * It is your responsibility to delete this memory when you are done
    * with it.
    */
-  char *reset_put_buffer (char *newBuffer = 0,
+  char *reset_put_buffer (char *newBuffer = NULL,
                           u_int _streambuf_size = 0,
                           u_int _pptr = 0 );
 
@@ -186,7 +186,7 @@ public:
    * It is your responsibility to delete this memory when you are done
    * with it.
    */
-  char *reset_get_buffer (char *newBuffer = 0,
+  char *reset_get_buffer (char *newBuffer = NULL,
                           u_int _streambuf_size = 0,
                           u_int _gptr = 0,
                           u_int _egptr = 0);
@@ -219,7 +219,7 @@ protected:
 
   /// The overflow function receives the character which caused the
   /// overflow.
-  virtual int overflow (int c = EOF);
+  virtual int overflow (int = EOF);
 
   /// Resets the <base> pointer and streambuf mode.  This is used
   /// internally when get/put buffers are allocatd.
@@ -301,15 +301,15 @@ protected:
                         ssize_t len) = 0;
   virtual ssize_t recv (char *buf,
                         ssize_t len,
-                        ACE_Time_Value *tv = 0) = 0;
+                        ACE_Time_Value *tv = NULL) = 0;
   virtual ssize_t recv (char *buf,
                         ssize_t len,
                         int flags,
-                        ACE_Time_Value *tv = 0) = 0;
+                        ACE_Time_Value *tv = NULL) = 0;
   virtual ssize_t recv_n (char *buf,
                           ssize_t len,
                           int flags = 0,
-                          ACE_Time_Value *tv = 0) = 0;
+                          ACE_Time_Value *tv = NULL) = 0;
 
   virtual ACE_HANDLE get_handle (void);
 
diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h
index dfcc5689f09..9569ba15888 100644
--- a/ace/IOStream_T.h
+++ b/ace/IOStream_T.h
@@ -31,10 +31,6 @@
 #  include "ace/Handle_Set.h"
 #  include "ace/Global_Macros.h"
 
-#  if defined (ACE_LACKS_IOSTREAM_FX)
-#   include "ace/os_include/os_ctype.h"
-#  endif /**/
-
 #  if defined (ACE_HAS_STRING_CLASS)
 template <class STREAM> STREAM & operator>> (STREAM &stream, ACE_Quoted_String &str);
 template <class STREAM> STREAM & operator<< (STREAM &stream, ACE_Quoted_String &str);
diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp
index 295b88c9698..1a92cb8ad66 100644
--- a/ace/IO_SAP.cpp
+++ b/ace/IO_SAP.cpp
@@ -72,7 +72,7 @@ ACE_IO_SAP::enable (int value) const
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
                          ACE_IO_SAP::pid_) == -1
-          || ACE::set_flags (this->handle_,
+          || ACE_Flag_Manip::set_flags (this->handle_,
                              FASYNC) == -1)
         return -1;
       break;
@@ -83,7 +83,7 @@ ACE_IO_SAP::enable (int value) const
       ACE_NOTSUP_RETURN (-1);
 #endif /* SIGIO <== */
     case ACE_NONBLOCK:
-      if (ACE::set_flags (this->handle_,
+      if (ACE_Flag_Manip::set_flags (this->handle_,
                           ACE_NONBLOCK) == -1)
         return -1;
       break;
@@ -124,7 +124,7 @@ ACE_IO_SAP::disable (int value) const
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
                          0) == -1
-          || ACE::clr_flags (this->handle_, FASYNC) == -1)
+          || ACE_Flag_Manip::clr_flags (this->handle_, FASYNC) == -1)
         return -1;
       break;
 #else
@@ -134,7 +134,7 @@ ACE_IO_SAP::disable (int value) const
       ACE_NOTSUP_RETURN (-1);
 #endif /* SIGIO <== */
     case ACE_NONBLOCK:
-      if (ACE::clr_flags (this->handle_,
+      if (ACE_Flag_Manip::clr_flags (this->handle_,
                                      ACE_NONBLOCK) == -1)
         return -1;
       break;
diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp
index a67e8a2bd95..7bf4b6f0110 100644
--- a/ace/IPC_SAP.cpp
+++ b/ace/IPC_SAP.cpp
@@ -86,7 +86,7 @@ ACE_IPC_SAP::enable (int value) const
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
                          ACE_IPC_SAP::pid_) == -1
-          || ACE::set_flags (this->handle_,
+          || ACE_Flag_Manip::set_flags (this->handle_,
                                         FASYNC) == -1)
         return -1;
       break;
@@ -104,7 +104,7 @@ ACE_IPC_SAP::enable (int value) const
       break;
 #endif /* F_SETFD */
     case ACE_NONBLOCK:
-      if (ACE::set_flags (this->handle_,
+      if (ACE_Flag_Manip::set_flags (this->handle_,
                                      ACE_NONBLOCK) == ACE_INVALID_HANDLE)
         return -1;
       break;
@@ -158,7 +158,7 @@ ACE_IPC_SAP::disable (int value) const
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
                          0) == -1
-          || ACE::clr_flags (this->handle_,
+          || ACE_Flag_Manip::clr_flags (this->handle_,
                                         FASYNC) == -1)
         return -1;
       break;
@@ -176,7 +176,7 @@ ACE_IPC_SAP::disable (int value) const
       break;
 #endif /* F_SETFD */
     case ACE_NONBLOCK:
-      if (ACE::clr_flags (this->handle_,
+      if (ACE_Flag_Manip::clr_flags (this->handle_,
                                      ACE_NONBLOCK) == -1)
         return -1;
       break;
diff --git a/ace/Init_ACE.cpp b/ace/Init_ACE.cpp
index d1f098438bc..d58574d07c3 100644
--- a/ace/Init_ACE.cpp
+++ b/ace/Init_ACE.cpp
@@ -6,36 +6,36 @@ ACE_RCSID (ace,
            Init_ACE,
            "$Id$")
 
-
-unsigned int ACE::init_fini_count_ = 0;
+// Static data members.
+unsigned int ACE_Init_ACE::init_fini_count_ = 0;
 
 int
-ACE::init (void)
+ACE_Init_ACE::init (void)
 {
   // Don't use ACE_TRACE, because Object_Manager might not have been
   // instantiated yet.
-  // ACE_TRACE ("ACE::init");
+  // ACE_TRACE ("ACE_Init_ACE::init");
 
-  ++ACE::init_fini_count_;
+  ++init_fini_count_;
 
   return ACE_Object_Manager::instance ()->init ();
 }
 
 int
-ACE::fini (void)
+ACE_Init_ACE::fini (void)
 {
-  ACE_TRACE ("ACE::fini");
+  ACE_TRACE ("ACE_Init_ACE::fini");
 
-  if (ACE::init_fini_count_ > 0)
+  if (init_fini_count_ > 0)
     {
-      if (--ACE::init_fini_count_ == 0)
+      if (--init_fini_count_ == 0)
         return ACE_Object_Manager::instance ()->fini ();
       else
         // Wait for remaining fini () calls.
         return 1;
     }
   else
-    // More ACE::fini () calls than ACE::init () calls.  Bad
+    // More ACE_Init_ACE::fini () calls than ACE_Init_ACE::init () calls.  Bad
     // application!
     return -1;
 }
diff --git a/ace/Init_ACE.h b/ace/Init_ACE.h
index 4d9d14da998..487fe4da176 100644
--- a/ace/Init_ACE.h
+++ b/ace/Init_ACE.h
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *  Initialize ACE library services.  Can be called only once per
- *  program invocation.
+ * This class consolidates the operations on the Handles.
  *
  *  @author Priyanka Gontla <pgontla@ece.uci.edu>
  */
@@ -28,11 +27,13 @@
 /**
  * @class ACE_Init_ACE
  *
- * @brief
+ * @brief Initialize ACE library services.  Can be called only once
+ *   per program invocation.
  *
  */
-namespace ACE
+class ACE_Export ACE_Init_ACE
 {
+public:
   /**
    * This class implements the functions for the initialization and
    * shutting down ACE.  These functions are called only once per ACE
@@ -40,7 +41,7 @@ namespace ACE
    * @return Returns 0 on success, -1 on failure, and 1 if it had already been
    * called.
    */
-  extern ACE_Export int init (void);
+  static int init (void);
 
   /**
    * Shut down ACE library services.  Can be called only once per
@@ -48,18 +49,16 @@ namespace ACE
    * @return Returns 0 on success, -1 on failure, and 1 if it had already been
    * called.
    */
-  extern ACE_Export int fini (void);
-
-  // private:
-  //  Used internally, so not exported.
+  static int fini (void);
 
+private:
   /**
    * Counter to match <init()>/<fini()> calls.  <init()> must increment it;
    * <fini()> must decrement it.  <fini()> then does nothing until it
    * reaches 0.
    */
-  extern unsigned int init_fini_count_;
-}
+  static unsigned int init_fini_count_;
+};
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp
index 2a78e8cc94c..8b634773273 100644
--- a/ace/Lib_Find.cpp
+++ b/ace/Lib_Find.cpp
@@ -27,11 +27,11 @@ ACE_RCSID(ace, Lib_Find, "$Id$")
 
 #if ! defined (ACE_PSOS_DIAB_MIPS)
 int
-ACE::ldfind (const ACE_TCHAR* filename,
-             ACE_TCHAR pathname[],
-             size_t maxpathnamelen)
+ACE_Lib_Find::ldfind (const ACE_TCHAR* filename,
+                      ACE_TCHAR pathname[],
+                      size_t maxpathnamelen)
 {
-  ACE_TRACE ("ACE::ldfind");
+  ACE_TRACE ("ACE_Lib_Find::ldfind");
 #if defined (ACE_OPENVMS)
   if (strlen(filename) >= maxpathnamelen)
   {
@@ -138,7 +138,7 @@ ACE::ldfind (const ACE_TCHAR* filename,
 #if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
   // Make all the directory separators "canonical" to simplify
   // subsequent code.
-  ACE::strrepl (tempcopy, ACE_DIRECTORY_SEPARATOR_CHAR, '/');
+  ACE_Lib_Find::strrepl (tempcopy, ACE_DIRECTORY_SEPARATOR_CHAR, '/');
 #endif /* ACE_DIRECTORY_SEPARATOR_CHAR */
 
   // Separate filename from pathname.
@@ -222,9 +222,9 @@ ACE::ldfind (const ACE_TCHAR* filename,
             {
 #if (ACE_DIRECTORY_SEPARATOR_CHAR != '/')
               // Revert to native path name separators.
-              ACE::strrepl (searchpathname,
-                            '/',
-                            ACE_DIRECTORY_SEPARATOR_CHAR);
+              ACE_Lib_Find::strrepl (searchpathname,
+                                     '/',
+                                     ACE_DIRECTORY_SEPARATOR_CHAR);
 #endif /* ACE_DIRECTORY_SEPARATOR_CHAR */
               // First, try matching the filename *without* adding a
               // prefix.
@@ -309,20 +309,12 @@ ACE::ldfind (const ACE_TCHAR* filename,
           else if (pathlen > 0)
               return 0;
 #else
-          ACE_TCHAR *ld_path;
-#  if defined ACE_DEFAULT_LD_SEARCH_PATH
-          ld_path = ACE_DEFAULT_LD_SEARCH_PATH;
-#  else
-#    if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-          ld_path = ACE_OS::getenv (ACE_LD_SEARCH_PATH);
-#    else
-          // Wide-char, non-Windows only offers char * getenv. So capture
-          // it, translate to wide-char, and continue.
-          ACE_Ascii_To_Wide wide_ldpath
-            (ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (ACE_LD_SEARCH_PATH)));
-          ld_path = wide_ldpath.wchar_rep ();
-#    endif /* ACE_WIN32 || !ACE_USES_WCHAR */
-#  endif /* ACE_DEFAULT_LD_SEARCH_PATH */
+          ACE_TCHAR *ld_path =
+#if defined ACE_DEFAULT_LD_SEARCH_PATH
+            ACE_DEFAULT_LD_SEARCH_PATH;
+#else
+            ACE_OS::getenv (ACE_LD_SEARCH_PATH);
+#endif /* ACE_DEFAULT_LD_SEARCH_PATH */
 
 #if defined (ACE_HAS_WINCE)
             ACE_TCHAR *ld_path_temp = 0;
@@ -367,9 +359,9 @@ ACE::ldfind (const ACE_TCHAR* filename,
 
               ACE_TCHAR *nextholder = 0;
               const ACE_TCHAR *path_entry =
-                ACE::strsplit_r (ld_path,
-                                 ACE_LD_SEARCH_PATH_SEPARATOR_STR,
-                                 nextholder);
+                ACE_Lib_Find::strsplit_r (ld_path,
+                                          ACE_LD_SEARCH_PATH_SEPARATOR_STR,
+                                          nextholder);
               int result = 0;
 
               for (;;)
@@ -444,10 +436,9 @@ ACE::ldfind (const ACE_TCHAR* filename,
                     break;
 
                   // Fetch the next item in the path
-                  path_entry =
-                    ACE::strsplit_r (0,
-                                     ACE_LD_SEARCH_PATH_SEPARATOR_STR,
-                                     nextholder);
+                  path_entry = ACE_Lib_Find::strsplit_r (0,
+                                                         ACE_LD_SEARCH_PATH_SEPARATOR_STR,
+                                                         nextholder);
                 }
 
 #if defined (ACE_HAS_WINCE)
@@ -472,13 +463,13 @@ ACE::ldfind (const ACE_TCHAR* filename,
 }
 
 FILE *
-ACE::ldopen (const ACE_TCHAR *filename,
+ACE_Lib_Find::ldopen (const ACE_TCHAR *filename,
              const ACE_TCHAR *type)
 {
-  ACE_TRACE ("ACE::ldopen");
+  ACE_TRACE ("ACE_Lib_Find::ldopen");
 
   ACE_TCHAR buf[MAXPATHLEN + 1];
-  if (ACE::ldfind (filename,
+  if (ACE_Lib_Find::ldfind (filename,
                    buf,
                    sizeof (buf) /sizeof (ACE_TCHAR)) == -1)
     return 0;
@@ -487,9 +478,9 @@ ACE::ldopen (const ACE_TCHAR *filename,
 }
 
 ACE_TCHAR *
-ACE::ldname (const ACE_TCHAR *entry_point)
+ACE_Lib_Find::ldname (const ACE_TCHAR *entry_point)
 {
-  ACE_TRACE ("ACE::ldname");
+  ACE_TRACE ("ACE_Lib_Find::ldname");
 
 #if defined(ACE_NEEDS_DL_UNDERSCORE)
   size_t size =
@@ -526,7 +517,7 @@ ACE::ldname (const ACE_TCHAR *entry_point)
 }
 
 int
-ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
+ACE_Lib_Find::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
 {
   int result;
 #if defined (ACE_WIN32)
@@ -540,16 +531,12 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
 
 #else /* ACE_WIN32 */
 
-  // NOTE! Non-Windows platforms don't deal with wide chars for env.
-  // variables, so do this narrow-char and convert to wide for the
-  // caller if necessary.
-
   // On non-win32 platforms, check to see what the TMPDIR environment
   // variable is defined to be.  If it doesn't exist, just use /tmp
-  const char *tmpdir = ACE_OS::getenv ("TMPDIR");
+  const ACE_TCHAR *tmpdir = ACE_OS::getenv (ACE_LIB_TEXT ("TMPDIR"));
 
   if (tmpdir == 0)
-    tmpdir = "/tmp";
+    tmpdir = ACE_LIB_TEXT ("/tmp");
 
   size_t len = ACE_OS::strlen (tmpdir);
 
@@ -561,11 +548,11 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
     }
   else
     {
-      ACE_OS::strcpy (buffer, ACE_TEXT_CHAR_TO_TCHAR (tmpdir));
+      ACE_OS::strcpy (buffer, tmpdir);
 
       // Add a trailing slash because we cannot assume there is already one
       // at the end.  And having an extra one should not cause problems.
-      buffer[len] = ACE_LIB_TEXT ('/');
+      buffer[len] = '/';
       buffer[len + 1] = 0;
       result = 0;
     }
@@ -574,7 +561,7 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
 }
 
 ACE_HANDLE
-ACE::open_temp_file (const ACE_TCHAR *name, int mode, int perm)
+ACE_Lib_Find::open_temp_file (const ACE_TCHAR *name, int mode, int perm)
 {
 #if defined (ACE_WIN32)
   ACE_UNUSED_ARG(perm);
@@ -599,9 +586,9 @@ ACE::open_temp_file (const ACE_TCHAR *name, int mode, int perm)
 #endif /* ! ACE_PSOS_DIAB_MIPS */
 
 size_t
-ACE::strrepl (char *s, char search, char replace)
+ACE_Lib_Find::strrepl (char *s, char search, char replace)
 {
-  ACE_TRACE ("ACE::strrepl");
+  ACE_TRACE ("ACE_Lib_Find::strrepl");
 
   size_t replaced = 0;
 
@@ -620,9 +607,9 @@ ACE::strrepl (char *s, char search, char replace)
 // "split".
 
 char *
-ACE::strsplit_r (char *str,
-                 const char *token,
-                 char *&next_start)
+ACE_Lib_Find::strsplit_r (char *str,
+                          const char *token,
+                          char *&next_start)
 {
   char *result = 0;
 
@@ -654,9 +641,9 @@ ACE::strsplit_r (char *str,
 
 #if defined (ACE_HAS_WCHAR)
 wchar_t *
-ACE::strsplit_r (wchar_t *str,
-                 const wchar_t *token,
-                 wchar_t *&next_start)
+ACE_Lib_Find::strsplit_r (wchar_t *str,
+                          const wchar_t *token,
+                          wchar_t *&next_start)
 {
   wchar_t *result = 0;
 
@@ -687,9 +674,9 @@ ACE::strsplit_r (wchar_t *str,
 }
 
 size_t
-ACE::strrepl (wchar_t *s, wchar_t search, wchar_t replace)
+ACE_Lib_Find::strrepl (wchar_t *s, wchar_t search, wchar_t replace)
 {
-  ACE_TRACE ("ACE::strrepl");
+  ACE_TRACE ("ACE_Lib_Find::strrepl");
 
   size_t replaced = 0;
 
diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h
index bfaf6a98003..fefcce6439b 100644
--- a/ace/Lib_Find.h
+++ b/ace/Lib_Find.h
@@ -1,12 +1,7 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file   Lib_Find.h
  *
- *  All the static function calls needed to search and open shared
- *  libraries.
- *
  *  $Id$
  *
  *  @author Priyanka Gontla <pgontla@ece.uci.edu>
@@ -21,32 +16,39 @@
 #include "ace/ACE_export.h"
 #include "ace/os_include/os_stdio.h"
 
-
-namespace ACE
+/**
+ * @class ACE_Lib_Find
+ *
+ * This class includes all the static function calls needed to search
+ * and open shared libraries.
+ */
+class ACE_Export ACE_Lib_Find
 {
+ public:
+
   // = Methods for searching and opening shared libraries.
 
   /**
-   * Finds the file @a filename either using an absolute path or using
+   * Finds the file <filename> either using an absolute path or using
    * a relative path in conjunction with ACE_LD_SEARCH_PATH (e.g.,
    * $LD_LIBRARY_PATH on UNIX or the directories scaned by Win32 API
    * SearchPath on Win32).  This function will add appropriate suffix
    * (e.g., .dll on Win32 or .so on UNIX) according to the OS
    * platform.  In addition, this function will apply the appropriate
-   * prefix (e.g., "lib" on UNIX and "" on Win32) if the @a filename
+   * prefix (e.g., "lib" on UNIX and "" on Win32) if the <filename>
    * doesn't match directly.
    */
-  extern ACE_Export int ldfind (const ACE_TCHAR* filename,
-                                ACE_TCHAR pathname[],
-                                size_t maxpathnamelen);
+  static int ldfind (const ACE_TCHAR* filename,
+                     ACE_TCHAR pathname[],
+                     size_t maxpathnamelen);
 
   /**
-   * Uses @c ldfind to locate and open the appropriate @a filename and
+   * Uses <ldfind> to locate and open the appropriate <filename> and
    * returns a pointer to the file, else it returns a NULL
-   * pointer. @a type specifies how the file should be open.
+   * pointer. <type> specifies how the file should be open.
    */
-  extern ACE_Export FILE *ldopen (const ACE_TCHAR *filename,
-                                  const ACE_TCHAR *type);
+  static FILE *ldopen (const ACE_TCHAR *filename,
+                       const ACE_TCHAR *type);
 
   /**
    * Transforms <entry_point> into a form that can be located in a
@@ -55,20 +57,20 @@ namespace ACE
    * have a '_' prepended. Always returns a buffer that has been
    * dynamically allocated using <operator new>.
    */
-  extern ACE_Export ACE_TCHAR *ldname (const ACE_TCHAR *entry_point);
+  static ACE_TCHAR *ldname (const ACE_TCHAR *entry_point);
 
   /**
    * Returns the temporary directory including the trailing slash in
    * <buffer>.  Returns -1 for an error or if the buffer_len is not
    * long enough.
    */
-  extern ACE_Export int get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len);
+  static int get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len);
 
   /// Opening the temp file.  File is automagically unlinked when it is
   /// closed.  This is useful for have temp files.
-  extern ACE_Export ACE_HANDLE open_temp_file (const ACE_TCHAR *name,
-                                               int mode,
-                                               int perm = 0);
+  static ACE_HANDLE open_temp_file (const ACE_TCHAR *name,
+                                    int mode,
+                                    int perm = 0);
 
   // @@ Though the following functions dont come under the same category as
   // above, these are used only in the functions in this class. So it makes
@@ -76,7 +78,7 @@ namespace ACE
   //
   /// Replace all instances of <search> in <s> with <replace>.  Returns
   /// the number of replacements made.
-  extern ACE_Export size_t strrepl (char *s, char search, char replace);
+  static size_t strrepl (char *s, char search, char replace);
 
   /**
    * Splits string <s> into pieces separated by the string <token>.
@@ -85,22 +87,17 @@ namespace ACE
    * This operates very similar to Perl's <split> function except that
    * it returns pieces one at a time instead of into an array.
    */
-  extern ACE_Export char *strsplit_r (char *s,
-                                      const char *token,
-                                      char *&next_start);
+  static char *strsplit_r (char *s, const char *token, char *&next_start);
 
 #if defined (ACE_HAS_WCHAR)
   /// As strrepl, but for wide characters.
-  extern ACE_Export size_t strrepl (wchar_t *s,
-                                    wchar_t search,
-                                    wchar_t replace);
+  static size_t strrepl (wchar_t *s, wchar_t search, wchar_t replace);
 
   /// As strsplit_r, but for wide characters.
-  extern ACE_Export wchar_t *strsplit_r (wchar_t *s,
-                                         const wchar_t *token,
-                                         wchar_t *&next_start);
+  static wchar_t *strsplit_r (wchar_t *s, const wchar_t *token,
+                              wchar_t *&next_start);
 #endif /* ACE_HAS_WCHAR */
-}
+};
 
 #include /**/ "ace/post.h"
 #endif  /* ACE_LIB_FIND_H */
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 0b0e7ee6041..23bd504a178 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -56,7 +56,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg)
 
 ACE_thread_key_t *log_msg_tss_key (void)
 {
-  static ACE_thread_key_t key = 0;
+  static ACE_thread_key_t key;
 
   return &key;
 }
@@ -948,8 +948,8 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
   ACE_TRACE ("ACE_Log_Msg::log");
   // External decls.
 
-// sys_nerr is deprecated on some platforms, and is declared by
-// system header files on others.
+// sys_nerr is deprecated on some platforms, and is declared by 
+// system header files on others. 
 #if ! (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) \
     && !defined(__MINGW32__) && !defined(__GLIBC__)  \
     && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) \
@@ -1174,11 +1174,8 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   break;
 
                 case 'N':             // Source file name
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
-#else
+                  // @@ UNICODE
                   ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
-#endif
                   if (can_check)
                     this_len = ACE_OS::snprintf (bp, bspace, format,
                                                  this->file () ?
@@ -1193,11 +1190,8 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   break;
 
                 case 'n':             // Program name
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
-#else /* ACE_WIN32 && ACE_USES_WCHAR */
+                  // @@ UNICODE
                   ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
-#endif
                   if (can_check)
                     this_len = ACE_OS::snprintf (bp, bspace, format,
                                                  ACE_Log_Msg::program_name_ ?
@@ -1234,11 +1228,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 #  endif  /* !__GLIBC__ */
                         )
                       {
-#  if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                        ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls: %ls"));
-#  else
                         ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s: %s"));
-#  endif
                         if (can_check)
                           this_len = ACE_OS::snprintf
                             (bp, bspace, format, va_arg (argp, ACE_TCHAR *),
@@ -1331,11 +1321,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   }
 
                 case 'M': // Print the name of the priority of the message.
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
-#else
                   ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
-#endif
                   if (can_check)
                     this_len = ACE_OS::snprintf
                       (bp, bspace, format,
@@ -1358,11 +1344,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 #  endif  /* !__GLIBC__ */
                         )
                       {
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                        ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
-#else /* ACE_WIN32 && ACE_USES_WCHAR */
                         ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
-#endif
                         if (can_check)
                           this_len = ACE_OS::snprintf
                             (bp, bspace, format,
@@ -1561,11 +1543,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                     ACE_TCHAR day_and_time[35];
                     ACE::timestamp (day_and_time,
                                     sizeof day_and_time);
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
-#else
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
-#endif
                     if (can_check)
                       this_len = ACE_OS::snprintf
                         (bp, bspace, format, day_and_time);
@@ -1820,7 +1798,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                     if (sizeof (ACE_OS::WChar) != sizeof (wchar_t))
                       {
                         size_t len = ACE_OS::wslen (wchar_str) + 1;
-                        ACE_NEW_NORETURN(wchar_t_str, wchar_t[len]);
+                        //@@ Bad, but there is no such ugly thing as
+                        // ACE_NEW_BREAK and ACE_NEW has a return
+                        // statement inside.
+                        ACE_NEW_RETURN(wchar_t_str, wchar_t[len], 0);
                         if (wchar_t_str == 0)
                           break;
 
@@ -2240,11 +2221,11 @@ ACE_Log_Msg::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("status_ = %d\n"), this->status_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nerrnum_ = %d\n"), this->errnum_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nlinenum_ = %d\n"), this->linenum_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nfile_ = %C\n"), this->file_));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nfile_ = %s\n"), this->file_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_ = %s\n"), this->msg_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nrestart_ = %d\n"), this->restart_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nostream_ = %@\n"), this->ostream_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_callback_ = %@\n"),
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nostream_ = %x\n"), this->ostream_));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_callback_ = %x\n"),
               this->msg_callback_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nprogram_name_ = %s\n"),
               this->program_name_ ? this->program_name_
@@ -2253,14 +2234,14 @@ ACE_Log_Msg::dump (void) const
               this->local_host_ ? this->local_host_
                                 : ACE_LIB_TEXT ("<unknown>")));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d\n"), this->getpid ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = 0x%x\n"), this->flags_));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = %x\n"), this->flags_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntrace_depth_ = %d\n"),
               this->trace_depth_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntrace_active_ = %d\n"),
               this->trace_active_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntracing_enabled_ = %d\n"),
               this->tracing_enabled_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npriority_mask_ = 0x%x\n"),
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npriority_mask_ = %x\n"),
               this->priority_mask_));
   if (this->thr_desc_ != 0 && this->thr_desc_->state () != 0)
     ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_state_ = %d\n"),
@@ -2623,14 +2604,14 @@ ACE_Log_Msg::inherit_hook (ACE_OS_Thread_Descriptor *thr_desc,
 
 # else  /* Don't inherit Log Msg */
 #  if defined (ACE_PSOS)
-  // Create a special name for each thread...
+  //Create a special name for each thread...
   char new_name[MAXPATHLEN]={"Ace_thread-"};
   char new_id[2]={0,0};  //Now it's pre-terminated!
 
   new_id[0] = '0' + (ACE_PSOS_unique_file_id++);  //Unique identifier
   ACE_OS::strcat(new_name, new_id);
 
-  // Initialize the task specific logger
+  //Initialize the task specific logger
   ACE_LOG_MSG->open(new_name);
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) starting %s thread at %D\n"),new_name));
 #  endif /* ACE_PSOS */
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 14be11341e9..258612c27fc 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -36,7 +36,7 @@
   ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \
   ace___->set (__FILE__, __LINE__, -1, __ace_error, ace___->restart (), \
                ace___->msg_ostream (), ace___->msg_callback ()); \
-  ace___->log (LM_ERROR, ACE_LIB_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), ACE_TEXT_CHAR_TO_TCHAR (#X), -1); \
+  ace___->log (LM_ERROR, ACE_LIB_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), #X, -1); \
   } } while (0)
 #endif  /* ACE_NDEBUG */
 
@@ -100,17 +100,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// These workarounds are necessary for nasty libraries or platforms
-// that #define STDERR or THREAD (e.g. LynxOS). We simply #undef
-// these macros as there is no way to save the macro definition using
-// the pre-processor. See Bugzilla Bug #299 for more info.
-
-#if defined (STDERR)
+#if defined (__Lynx__) || defined (INTEGRITY)
 # undef STDERR
-#endif /* STDERR */
+#endif /* __Lynx__ */
 
 #if defined (THREAD)
-# undef THREAD
+// This workaround is necessary for nasty libraries that #define
+// THREAD 1.
+#define ACE_THREAD_HACK THREAD
+#undef THREAD
 #endif /* THREAD */
 
 class ACE_Log_Msg_Callback;
@@ -711,6 +709,11 @@ ACE_TSS_cleanup (void *ptr);
 # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
 #endif /* ACE_MT_SAFE */
 
+#if defined (ACE_THREAD_HACK)
+#define THREAD ACE_THREAD_HACK
+#undef ACE_THREAD_HACK
+#endif /* ACE_THREAD_HACK */
+
 #if defined(ACE_LEGACY_MODE)
 #include "ace/Log_Msg_Callback.h"
 #endif /* ACE_LEGACY_MODE */
diff --git a/ace/Log_Msg_UNIX_Syslog.cpp b/ace/Log_Msg_UNIX_Syslog.cpp
index b502d1dd185..9957ae90575 100644
--- a/ace/Log_Msg_UNIX_Syslog.cpp
+++ b/ace/Log_Msg_UNIX_Syslog.cpp
@@ -41,15 +41,9 @@ ACE_Log_Msg_UNIX_Syslog::open (const ACE_TCHAR * logger_key)
   // options LOG_CONS and LOG_PID to be set.  There really should be a
   // logging strategy option to control the syslog log options,
   // however, we'll take the easy way out for now.
-#if defined (ACE_USES_WCHAR)
-  openlog (ACE_TEXT_ALWAYS_CHAR (logger_key),
-           LOG_CONS|LOG_PID,
-           ACE_DEFAULT_SYSLOG_FACILITY);
-#else
   openlog (const_cast<char *> (logger_key),
            LOG_CONS|LOG_PID,
            ACE_DEFAULT_SYSLOG_FACILITY);
-#endif /* ACE_USES_WCHAR */
 
   // Enable logging of all syslog priorities.  If logging of all
   // priorities is not desired, use the ACE_Log_Msg::priority_mask()
@@ -109,18 +103,14 @@ ACE_Log_Msg_UNIX_Syslog::log (ACE_Log_Record &log_record)
           || ACE_BIT_ENABLED (flags, ACE_Log_Msg::VERBOSE_LITE))
         {
           ACE_TCHAR date_and_time[35];
-          if (0 == ACE::timestamp (date_and_time, sizeof (date_and_time), 1))
-            ACE_OS::strcpy (date_and_time, ACE_LIB_TEXT ("<time error>"));
-          const ACE_TCHAR *prio_name =
-            ACE_Log_Record::priority_name(ACE_Log_Priority(log_record.type()));
           syslog (syslog_priority,
-                  "%s: %s: %s",
-                  ACE_TEXT_ALWAYS_CHAR (date_and_time),
-                  ACE_TEXT_ALWAYS_CHAR (prio_name),
-                  ACE_TEXT_ALWAYS_CHAR (line));
+                  ACE_LIB_TEXT ("%s: %s: %s"),
+                  ACE::timestamp (date_and_time, sizeof (date_and_time), 1),
+                  ACE_Log_Record::priority_name (ACE_Log_Priority(log_record.type ())),
+                  line);
         }
       else // No formatting required.
-        syslog (syslog_priority, "%s", ACE_TEXT_ALWAYS_CHAR (line));
+        syslog (syslog_priority, ACE_LIB_TEXT ("%s"), line);
     }
 
   return 0;
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index 326628ae6a1..d5ca1493b4a 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -174,18 +174,6 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
   /* Oct 18 14:25:36.000 1989<nul> */
   ACE_TCHAR timestamp[26]; // Only used by VERBOSE and VERBOSE_LITE.
 
-  // The sprintf format needs to be different for Windows and POSIX
-  // in the wide-char case.
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-  const ACE_TCHAR *time_fmt =         ACE_LIB_TEXT ("%s.%03ld %s");
-  const ACE_TCHAR *verbose_fmt =      ACE_LIB_TEXT ("%s@%s@%u@%s@%s");
-  const ACE_TCHAR *verbose_lite_fmt = ACE_LIB_TEXT ("%s@%s@%s");
-#else
-  const ACE_TCHAR *time_fmt = ACE_LIB_TEXT ("%ls.%03ld %ls");
-  const ACE_TCHAR *verbose_fmt = ACE_LIB_TEXT ("%ls@%ls@%u@%ls@%ls");
-  const ACE_TCHAR *verbose_lite_fmt = ACE_LIB_TEXT ("%ls@%ls@%ls");
-#endif
-
   if (ACE_BIT_ENABLED (verbose_flag,
                        ACE_Log_Msg::VERBOSE)
       || ACE_BIT_ENABLED (verbose_flag,
@@ -204,7 +192,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
       ctp[24] = '\0'; // NUL-terminate after the date.
 
       ACE_OS::sprintf (timestamp,
-                       time_fmt,
+                       ACE_LIB_TEXT ("%s.%03ld %s"),
                        ctp + 4,
                        ((long) this->usecs_) / 1000,
                        ctp + 20);
@@ -223,7 +211,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
                                       : host_name);
 # endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
       ACE_OS::sprintf (verbose_msg,
-                       verbose_fmt,
+                       ACE_LIB_TEXT ("%s@%s@%u@%s@%s"),
                        timestamp,
                        lhost_name,
                        this->pid_,
@@ -232,12 +220,14 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
     }
   else if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE_LITE))
     ACE_OS::sprintf (verbose_msg,
-                     verbose_lite_fmt,
+                     ACE_LIB_TEXT ("%s@%s@%s"),
                      timestamp,
                      ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)),
                      this->msg_data_);
   else
-    ACE_OS::strcpy (verbose_msg, this->msg_data_);
+    ACE_OS::sprintf (verbose_msg,
+                     ACE_LIB_TEXT ("%s"),
+                     this->msg_data_);
   return 0;
 }
 
diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp
index 73acccd0e0e..e6082f71397 100644
--- a/ace/Logging_Strategy.cpp
+++ b/ace/Logging_Strategy.cpp
@@ -232,7 +232,7 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void)
            ACE_TCHAR[MAXPATHLEN + 1]);
 
   // Get the temporary directory
-  if (ACE::get_temp_dir
+  if (ACE_Lib_Find::get_temp_dir
       (this->filename_,
        MAXPATHLEN - 7) == -1) // 7 for "logfile"
     {
diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp
index adfb7e84945..e2e7de19f38 100644
--- a/ace/MEM_Acceptor.cpp
+++ b/ace/MEM_Acceptor.cpp
@@ -148,7 +148,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream,
     {
       ACE_TCHAR name[25];
       // - 24 is so we can append name to the end.
-      if (ACE::get_temp_dir (buf, MAXPATHLEN - 24) == -1)
+      if (ACE_Lib_Find::get_temp_dir (buf, MAXPATHLEN - 24) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_LIB_TEXT ("Temporary path too long, ")
@@ -237,9 +237,9 @@ ACE_MEM_Acceptor::shared_accept_finish (ACE_MEM_Stream new_stream,
 
       // Only disable ACE_NONBLOCK if we weren't in non-blocking mode
       // originally.
-      ACE::clr_flags (this->get_handle (),
+      ACE_Flag_Manip::clr_flags (this->get_handle (),
                                  ACE_NONBLOCK);
-      ACE::clr_flags (new_handle,
+      ACE_Flag_Manip::clr_flags (new_handle,
                                  ACE_NONBLOCK);
     }
 
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 0beb8b6a5c8..6dd3daa35f4 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -785,7 +785,6 @@ HEADER_FILES = \
   Hash_Map_Manager_T.h \
   Hash_Map_With_Allocator_T.h \
   High_Res_Timer.h \
-  If_Then_Else.h \
   INET_Addr.h \
   Init_ACE.h \
   Intrusive_List.h \
@@ -1367,7 +1366,7 @@ ACE_EXTRA_DIST = os_include
 dist-hook:
 	(cd $(srcdir); tar cf - $(ACE_EXTRA_DIST)) | (cd $(distdir); \
           tar xfBp -)
-	list=`find $(distdir) -type d -a \( -name CVS -o -name .svn \) -a -print`; for p in $$list; do \
+	list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \
           rm -rf $$p; \
         done
 
@@ -1382,7 +1381,7 @@ clean-local:
 ## os_include subdirectory just for installation purposes seemed like
 ## overkill.
 install-data-local:
-	list=`(cd $(srcdir); find os_include -type d -a \! \( \( -name CVS -o -name .svn \) -prune \) )`; for p in $$list; do \
+	list=`(cd $(srcdir); find os_include -type d | $(EGREP) -v CVS)`; for p in $$list; do \
 	  $(mkdir_p) $(DESTDIR)$(pkgincludedir)/$$p; \
 	  files=`(cd $(srcdir)/$$p; $(ECHO) *.h)`; \
           test "$$files" != "*.h"  && \
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 9985ec74849..b0ff605f368 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -138,7 +138,7 @@ void
 ACE_Control_Block::ACE_Name_Node::name (const char *)
 {
 #if !defined (ACE_PSOS)
-  ACE_ASSERT (!"not implemented!");
+  ACE_ASSERT (0 == "not implemented!");
 #endif /* ! ACE_PSOS */
 }
 
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index db31b148fa3..ada5fc23236 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -115,9 +115,6 @@ public:
   /// Return a chunk of memory back to free list cache.
   void free (void *);
 
-  /// Return the number of chunks available in the cache.
-  size_t pool_depth (void);
-
 private:
   /// Remember how we allocate the memory in the first place so
   /// we can clear things up later.
@@ -180,9 +177,6 @@ public:
   /// Return a chunk of memory back to free list cache.
   void free (void *);
 
-  /// Return the number of chunks available in the cache.
-  size_t pool_depth (void);
-
 private:
   /// Remember how we allocate the memory in the first place so
   /// we can clear things up later.
diff --git a/ace/Malloc_T.inl b/ace/Malloc_T.inl
index 109d1153336..b24436fb868 100644
--- a/ace/Malloc_T.inl
+++ b/ace/Malloc_T.inl
@@ -67,12 +67,6 @@ ACE_Cached_Allocator<T, ACE_LOCK>::free (void * ptr)
     this->free_list_.add ((ACE_Cached_Mem_Pool_Node<T> *) ptr) ;
 }
 
-template <class T, class ACE_LOCK> ACE_INLINE size_t
-ACE_Cached_Allocator<T, ACE_LOCK>::pool_depth (void)
-{
-  return this->free_list_.size ();
-}
-
 template <class ACE_LOCK> ACE_INLINE void *
 ACE_Dynamic_Cached_Allocator<ACE_LOCK>::malloc (size_t nbytes)
 {
@@ -113,12 +107,6 @@ ACE_Dynamic_Cached_Allocator<ACE_LOCK>::free (void * ptr)
     this->free_list_.add ((ACE_Cached_Mem_Pool_Node<char> *) ptr);
 }
 
-template <class ACE_LOCK> ACE_INLINE size_t
-ACE_Dynamic_Cached_Allocator<ACE_LOCK>::pool_depth (void)
-{
-  return this->free_list_.size ();
-}
-
 template <class MALLOC> ACE_INLINE void *
 ACE_Allocator_Adapter<MALLOC>::malloc (size_t nbytes)
 {
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index e5de1f19fdf..053fa58749f 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -216,7 +216,7 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (const ACE_TCHAR *backing_store_name,
       ACE_OS::strcpy (this->backing_store_name_,
                       ACE_DEFAULT_BACKING_STORE);
 #else /* ACE_DEFAULT_BACKING_STORE */
-      if (ACE::get_temp_dir (this->backing_store_name_,
+      if (ACE_Lib_Find::get_temp_dir (this->backing_store_name_,
                                       MAXPATHLEN - 17) == -1)
         // -17 for ace-malloc-XXXXXX
         {
@@ -485,6 +485,12 @@ ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (const void *base_add
   // for backwards compatability
   if (base_addr_ == 0 && use_fixed_addr_ == ALWAYS_FIXED)
     use_fixed_addr_ = FIRSTCALL_FIXED;
+
+  // HP-UX 11, 64-bit bug workaround.
+#if defined (__hpux) && defined (__LP64__)
+  long temp = ACE_DEFAULT_BASE_ADDRL;
+  base_addr_ = (void *) temp;
+#endif /* defined (__hpux) && defined (__LP64__) */
 }
 
 // Handle SIGSEGV and SIGBUS signals to remap memory properly.  When a
@@ -628,6 +634,11 @@ ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options (const char *base
     segment_size_ (segment_size)
 {
   ACE_TRACE ("ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options");
+  // HP-UX 11, 64-bit bug workaround
+#if defined (__hpux) && defined (__LP64__)
+  long temp = ACE_DEFAULT_BASE_ADDRL;
+  base_addr_ = (char *) temp;
+#endif /* defined (__hpux) && defined (__LP64__) */
 }
 
 void
@@ -851,15 +862,14 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_n
       // key.
 
       int segment_key;
-      int result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (backing_store_name),
+      int result = ::sscanf (backing_store_name,
                              "%d",
                              &segment_key);
 
       if (result == 0 || result == EOF)
         // The conversion to a number failed so hash with crc32
         // ACE::crc32 is also used in <SV_Semaphore_Simple>.
-        this->base_shm_key_ =
-          (key_t) ACE::crc32 (ACE_TEXT_ALWAYS_CHAR (backing_store_name));
+        this->base_shm_key_ = (key_t) ACE::crc32 (backing_store_name);
       else
         this->base_shm_key_ = segment_key;
 
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index 05659a712c5..97925966fc0 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -116,14 +116,11 @@ ACE_Message_Block::copy (const char *buf)
     }
 }
 
-int
+void
 ACE_Message_Block::crunch (void)
 {
-  if (this->rd_ptr_ != 0)
+  if (this->rd_ptr () > this->base ())
     {
-      if (this->rd_ptr_ > this->wr_ptr_)
-        return -1;
-
       size_t len = this->length ();
       (void) ACE_OS::memmove (this->base (),
                               this->rd_ptr (),
@@ -131,7 +128,6 @@ ACE_Message_Block::crunch (void)
       this->rd_ptr (this->base ());
       this->wr_ptr (this->base () + len);
     }
-  return 0;
 }
 
 void
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index 9379f61a35b..8ea08caf316 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -395,9 +395,8 @@ public:
   /// Normalizes data in the top-level <Message_Block> to align with the base,
   /// i.e., it "shifts" the data pointed to by <rd_ptr> down to the <base> and
   /// then readjusts <rt_ptr> to point to <base> and <wr_ptr> to point
-  /// to <base> + the length of the moved data.  Returns -1 and does
-  /// nothing if the <rd_ptr> is > <wr_ptr>, else 0 on success.
-  int crunch (void);
+  /// to <base> + the length of the moved data.
+  void crunch (void);
 
   /// Resets the Message Block data to contain nothing, i.e., sets the
   /// read and write pointers to align with the base.
diff --git a/ace/Message_Queue_T.inl b/ace/Message_Queue_T.inl
index dc3c06f7ede..3cd1e3cd719 100644
--- a/ace/Message_Queue_T.inl
+++ b/ace/Message_Queue_T.inl
@@ -40,7 +40,7 @@ template <ACE_SYNCH_DECL> ACE_INLINE int
 ACE_Message_Queue<ACE_SYNCH_USE>::is_full_i (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::is_full_i");
-  return this->cur_bytes_ >= this->high_water_mark_;
+  return this->cur_bytes_ > this->high_water_mark_;
 }
 
 // Check if queue is empty (holds locks).
diff --git a/ace/Module.h b/ace/Module.h
index a3e6f4126b8..8f9c78e8228 100644
--- a/ace/Module.h
+++ b/ace/Module.h
@@ -90,7 +90,7 @@ public:
               int flags = M_DELETE);
 
   /**
-   * Initialize the module with <module_name> as its identity
+   * Create an initialized module with <module_name> as its identity
    * and <reader> and <writer> as its tasks.  Previously register
    * reader or writers or closed down and deleted according to the
    * value of flags_.  Should not be called from within
@@ -103,7 +103,7 @@ public:
             int flags = M_DELETE);
 
   /**
-   * Close down the module and its tasks.  The flags argument can be
+   * Close down the Module and its Tasks.  The flags argument can be
    * used to override the default behaviour, which depends on previous
    * <flags> values in calls to c'tor, <open>, <reader>, and <writer>.
    * A previous value M_DELETE[_XXX] can not be overridden.  Should
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index d700b592158..a490e919ed4 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -436,7 +436,7 @@ ACE_Name_Options::ACE_Name_Options (void)
   size_t pathsize = (MAXPATHLEN + 1) * sizeof (ACE_TCHAR);
   this->namespace_dir_ = ACE_static_cast (ACE_TCHAR *, ACE_OS::malloc (pathsize));
 
-  if (ACE::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1)
+  if (ACE_Lib_Find::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_LIB_TEXT ("Temporary path too long, ")
diff --git a/ace/OS.h b/ace/OS.h
index 14f86e2a4ae..96864d4e5af 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -297,6 +297,9 @@ class ACE_Timeout_Manager;
 
 #   if defined (ACE_HAS_TERM_IOCTLS)
 #     include "ace/os_include/os_termios.h"
+#     if defined (HPUX)
+#       include /**/ <sys/modem.h>
+#     endif /* HPUX */
 #   endif /* ACE_HAS_TERM_IOCTLS */
 
 #   if defined (ACE_HAS_AIO_CALLS)
@@ -305,6 +308,14 @@ class ACE_Timeout_Manager;
 
 #     include "ace/os_include/os_limits.h"  // <sys/param.h>
 
+// This is here for ACE_OS::num_processors_online(). On HP-UX, it
+// needs sys/param.h (above) and sys/pstat.h. The implementation of the
+// num_processors_online() method also uses 'defined (__hpux)' to decide
+// whether or not to try the syscall.
+#   if defined (__hpux)
+#     include /**/ <sys/pstat.h>
+#   endif /* __hpux **/
+
 #   if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) && !defined (VXWORKS)
 #     include "ace/os_include/sys/os_un.h"
 #   endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/OS.inl b/ace/OS.inl
index bd725c941e5..39dad0b3df4 100644
--- a/ace/OS.inl
+++ b/ace/OS.inl
@@ -68,9 +68,9 @@ using std::strftime;
 #   include /**/ <sys/systeminfo.h>
 # endif /* ACE_HAS_SYS_INFO */
 
-# if defined (ACE_HAS_SYS_SYSCALL_H)
+# if defined (ACE_HAS_SYSCALL_H)
 #   include /**/ <sys/syscall.h>
-# endif /* ACE_HAS_SYS_SYSCALL_H */
+# endif /* ACE_HAS_SYSCALL_H */
 
 # if defined (UNIXWARE)  /* See strcasecmp, below */
 #   include /**/ <ctype.h>
diff --git a/ace/OS_Errno.h b/ace/OS_Errno.h
index 7318147ae37..5ab0d2f2492 100644
--- a/ace/OS_Errno.h
+++ b/ace/OS_Errno.h
@@ -20,7 +20,42 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/OS_NS_errno.h"
+#include "ace/os_include/os_errno.h"
+
+#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
+/**
+ * @class ACE_CE_Errno
+ *
+ * Some versions of CE don't support <errno> and some versions'
+ * implementations are busted.  So we implement our own.
+ * Our implementation takes up one Tls key, however, it does not
+ * allocate memory fromt the heap so there's no problem with cleanin
+ * up the errno when a thread exit.
+ */
+class ACE_Export ACE_CE_Errno
+{
+public:
+  ACE_CE_Errno () {}
+  static void init ();
+  static void fini ();
+  static ACE_CE_Errno *instance ();
+
+  operator int (void) const;
+  int operator= (int);
+
+private:
+  static ACE_CE_Errno *instance_;
+  static DWORD errno_key_;
+};
+
+# define errno (* (ACE_CE_Errno::instance ()))
+#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
+
+#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
+#  define ACE_ERRNO_TYPE ACE_CE_Errno
+#else
+#  define ACE_ERRNO_TYPE int
+#endif /* ACE_HAS_WINCE */
 
 /**
  * @class ACE_Errno_Guard
diff --git a/ace/OS_Errno.inl b/ace/OS_Errno.inl
index 9330c37deb4..67ef64f3d5c 100644
--- a/ace/OS_Errno.inl
+++ b/ace/OS_Errno.inl
@@ -1,6 +1,31 @@
 // -*- C++ -*-
 // $Id$
 
+#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
+
+ACE_INLINE ACE_CE_Errno *
+ACE_CE_Errno::instance ()
+{
+  // This should be inlined.
+  return ACE_CE_Errno::instance_;
+}
+
+ACE_INLINE
+ACE_CE_Errno::operator int (void) const
+{
+  return (int) TlsGetValue (ACE_CE_Errno::errno_key_);
+}
+
+ACE_INLINE int
+ACE_CE_Errno::operator= (int x)
+{
+  // error checking?
+  TlsSetValue (ACE_CE_Errno::errno_key_, (void *) x);
+  return x;
+}
+
+#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
+
 ACE_INLINE
 ACE_Errno_Guard::ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref,
                                   int error)
diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp
index abf9c5bbe7b..c992554753a 100644
--- a/ace/OS_NS_Thread.cpp
+++ b/ace/OS_NS_Thread.cpp
@@ -16,7 +16,7 @@ ACE_RCSID (ace,
 #include "ace/Object_Manager_Base.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_ctype.h"
-#include "ace/Log_Msg.h" // for ACE_ASSERT
+
 // This is necessary to work around nasty problems with MVS C++.
 
 extern "C" void
@@ -502,11 +502,11 @@ ACE_TSS_Ref::operator != (const ACE_TSS_Ref &tss_ref) const
 // single file of template instantiations
 
 ACE_TSS_Info::ACE_TSS_Info (ACE_thread_key_t key,
-                            ACE_TSS_Info::Destructor dest,
+                            void (*dest)(void *),
                             void *tss_inst)
   : key_ (key),
     destructor_ (dest),
-    tss_inst_ (tss_inst),
+    tss_obj_ (tss_inst),
     thread_count_ (-1)
 {
   ACE_OS_TRACE ("ACE_TSS_Info::ACE_TSS_Info");
@@ -515,7 +515,7 @@ ACE_TSS_Info::ACE_TSS_Info (ACE_thread_key_t key,
 ACE_TSS_Info::ACE_TSS_Info (void)
   : key_ (ACE_OS::NULL_key),
     destructor_ (0),
-    tss_inst_ (0),
+    tss_obj_ (0),
     thread_count_ (-1)
 {
   ACE_OS_TRACE ("ACE_TSS_Info::ACE_TSS_Info");
@@ -563,7 +563,7 @@ ACE_TSS_Info::dump (void)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %u\n"), this->key_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("destructor_ = %u\n"), this->destructor_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("tss_inst_ = %u\n"), this->tss_inst_));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("tss_obj_ = %u\n"), this->tss_obj_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #   endif /* 0 */
 # endif /* ACE_HAS_DUMP */
@@ -639,30 +639,12 @@ ACE_TSS_Keys::is_set (const ACE_thread_key_t key) const
 /**
  * @class ACE_TSS_Cleanup
  *
- * @brief Singleton that helps to manage the lifetime of TSS objects and keys.
+ * @brief Singleton that knows how to clean up all the thread-specific
+ * resources for Win32.
  *
- ***********************************************************************
- * Behavior of TSS_Cleanup was changed to eliminate leaks:
- *                           +------OLD------------+--------NEW---------
- *   Action                  | exit|    detach     |   exit  : detach : remove
- * --------------------------      | Always: Last  |         :        : (if...)
- * --key_info->thread_count_    X  |  X    :       |   X     :        :
- * destructor(tss_obj)          X  | [4]   :       |   X     :        :
- * tss_keys ()->test_and_clear  X  | X[2]  :  X[2] |   X     :        :
- * key_info->inst = 0              | X[2]  :  X[1] |         :  X     :
- *                                 |               | remove  : remove :
- * key_info->in_use (0)            |       :  X[1] |         :        : X
- * key_info->key_ = NULL [6]       |       :  X[1] |         :        :
- * key_info->destructor=0          |       :  X[1] |         :        : X
- * release tss key             [4] |       :  X    |         :        : X
- * clear key in_use_               |       : [5]   |         :        : X
- *----------------------------------------------------------------------
- * [1] delegated to remove
- * [2] done twice;
- * [3] this is a bug.  It should not be done here
- * [4] Resource leak--should be done, but it's not.
- * [5] Should be done here, but it's not.
- * [6] Unnecessary and problematic.
+ * All this nonsense is required since Win32 doesn't
+ * automatically cleanup thread-specific storage on thread exit,
+ * unlike real operating systems... ;-)
  */
 class ACE_TSS_Cleanup
 {
@@ -681,44 +663,22 @@ public:
   int remove (ACE_thread_key_t key);
 
   /// Detaches a tss_instance from its key.
-  int detach (ACE_thread_key_t key, void * inst);
+  int detach (void *inst);
 
   /// Mark a key as being used by this thread.
   void key_used (ACE_thread_key_t key);
 
+  /// Free all keys left in the table before destruction.
+  int free_all_keys_left (void);
+
   /// Indication of whether the ACE_TSS_CLEANUP_LOCK is usable, and
   /// therefore whether we are in static constructor/destructor phase
   /// or not.
-  static int lockable ()
-  {
-    return instance_ != 0;
-  }
+  static int lockable () { return instance_ != 0; }
 
 protected:
   void dump (void);
 
-  /// remove key if it's unused
-  /// @param info reference to the info for this key
-  void remove_key (ACE_TSS_Info &info);
-
-  /// Release a key used by this thread
-  /// @param info reference to the info for this key
-  /// @param destructor out arg to receive destructor function ptr
-  /// @param tss_obj out arg to receive pointer to deletable object
-  void thread_release (
-          ACE_TSS_Info &info,
-          ACE_TSS_Info::Destructor & destructor,
-          void *& tss_obj);
-
-  /// Find the TSS keys (if any) for this thread.
-  /// @param thread_keys reference to pointer to be filled in by this function.
-  /// @return false if keys don't exist.
-  bool find_tss_keys (ACE_TSS_Keys *& thread_keys) const;
-
-  /// Accessor for this threads ACE_TSS_Keys instance.
-  /// Creates the keys if necessary.
-  ACE_TSS_Keys *tss_keys ();
-
   /// Ensure singleton.
   ACE_TSS_Cleanup (void);
 
@@ -730,12 +690,18 @@ private:
   /// Table of <ACE_TSS_Info>'s.
   ACE_TSS_TABLE table_;
 
-  /// Key for the thread-specific ACE_TSS_Keys
-  /// Used by find_tss_keys() or tss_keys() to find the
-  /// bit array that records whether each TSS key is in
-  /// use by this thread.
+  /// Key for the thread-specific array of whether each TSS key is in use.
   ACE_thread_key_t in_use_;
 
+  /// Accessor for this threads ACE_TSS_Keys instance.
+  ACE_TSS_Keys *tss_keys ();
+
+# if defined (ACE_HAS_TSS_EMULATION)
+  /// Key that is used by in_use_.  We save this key so that we know
+  /// not to call its destructor in free_all_keys_left ().
+  ACE_thread_key_t in_use_key_;
+# endif /* ACE_HAS_TSS_EMULATION */
+
   // = Static data.
   /// Pointer to the singleton instance.
   static ACE_TSS_Cleanup *instance_;
@@ -756,74 +722,134 @@ void
 ACE_TSS_Cleanup::exit (void * /* status */)
 {
   ACE_OS_TRACE ("ACE_TSS_Cleanup::exit");
-  // variables to hold the destructors
-  // and pointers to the object to be destructed
-  // the actual destruction is deferred until the guard is released
-  ACE_TSS_Info::Destructor destructor[ACE_DEFAULT_THREAD_KEYS];
-  void * tss_obj[ACE_DEFAULT_THREAD_KEYS];
-  // count of items to be destroyed
-  unsigned int d_count = 0;
-
-  // scope the guard
+
+  ACE_TSS_TABLE_ITERATOR key_info = table_;
+  ACE_TSS_Info info_arr[ACE_DEFAULT_THREAD_KEYS];
+  int info_ix = 0;
+
+  // While holding the lock, we only collect the ACE_TSS_Info objects
+  // in an array without invoking the according destructors.
   {
     ACE_TSS_CLEANUP_GUARD
 
-    // if not initialized or already cleaned up
-    ACE_TSS_Keys *this_thread_keys = 0;
-    if (! find_tss_keys (this_thread_keys) )
-      {
-        return;
-      }
+    // Iterate through all the thread-specific items and free them all
+    // up.
 
-    // Minor hack: Iterating in reverse order means the LOG buffer which is
-    // accidentally allocated first will be accidentally deallocated (almost)
-    // last -- in case someone logs something from the other destructors.
-    // applications should not count on this behavior because platforms which
-    // do not use ACE_TSS_Cleanup may delete objects in other orders.
-    unsigned int key_index = ACE_DEFAULT_THREAD_KEYS;
-    while( key_index > 0)
+    for (unsigned int i = 0;
+         i < ACE_DEFAULT_THREAD_KEYS;
+         ++key_info, ++i)
       {
-        --key_index;
-        ACE_TSS_Info & info = this->table_[key_index];
-        // if this key is in use by this thread
-        if (this_thread_keys->is_set(info.key_))
+        if (key_info->key_ == ACE_OS::NULL_key  ||
+            ! key_info->key_in_use ()) continue;
+
+        // If the key's ACE_TSS_Info in-use bit for this thread was set,
+        // unset it and decrement the key's thread_count_.
+        if (! tss_keys ()->test_and_clear (key_info->key_))
           {
-            // defer deleting the in-use key until all others have been deleted
-            if(info.key_ != this->in_use_)
-              {
-                destructor[d_count] = 0;
-                tss_obj[d_count] = 0;
-                this->thread_release (info, destructor[d_count], tss_obj[d_count]);
-                if (destructor[d_count] != 0 && tss_obj[d_count] != 0)
-                  {
-                    ++d_count;
-                  }
-                this->remove_key (info);
-              }
+            --key_info->thread_count_;
           }
-      }
 
-    // remove the in_use bit vector last
-    ACE_KEY_INDEX (use_index, this->in_use_);
-    ACE_TSS_Info & info = this->table_[use_index];
-    destructor[d_count] = 0;
-    tss_obj[d_count] = 0;
-    this->thread_release (info, destructor[d_count], tss_obj[d_count]);
-    if (destructor[d_count] != 0 &&  tss_obj[d_count] != 0)
-      {
-        ++d_count;
+        void *tss_info = 0;
+
+        if (key_info->destructor_
+            && ACE_OS::thr_getspecific (key_info->key_, &tss_info) == 0
+            && tss_info)
+          {
+            info_arr[info_ix].key_ = key_info->key_;
+            info_arr[info_ix].destructor_ = key_info->destructor_;
+            info_arr[info_ix++].tss_obj_ = key_info->tss_obj_;
+          }
       }
-    this->remove_key (info);
-  } // end of guard scope
-  // WARNING:
-  // Once the guard is released this ACE_TSS_Cleanup may be deleted -- especially
-  // because we are about to delete a Thread_Exit object.
-  // Do not attempt to use any data members for the rest of this method.
+  }
 
-  for (unsigned int d_index = 0; d_index < d_count; ++d_index)
+  // Now we have given up the ACE_TSS_Cleanup::lock_ and we start
+  // invoking destructors, in the reverse order of creation.
+  for (int i = info_ix - 1; i >= 0; --i)
     {
-      (*destructor[d_index])(tss_obj[d_index]);
+      void *tss_info = 0;
+
+      ACE_OS::thr_getspecific (info_arr[i].key_, &tss_info);
+
+      if (tss_info != 0)
+        {
+          // Only call the destructor if the value is non-zero for this
+          // thread.
+          (*info_arr[i].destructor_)(tss_info);
+        }
     }
+
+  // Acquire the ACE_TSS_CLEANUP_LOCK, then free TLS keys and remove
+  // entries from ACE_TSS_Info table.
+  {
+    ACE_TSS_CLEANUP_GUARD
+
+# if 0
+    // We shouldn't free the key and remove it from the table here
+    // because if we do and some thread ends before other threads
+    // even get started (or their TSS object haven't been created yet,)
+    // it's entry will be removed from the table and we are in big chaos.
+    // For TSS object, these have been done in ACE_TSS_Cleanup::detach.
+    // Two other use cases will be user managed TSS'es and system wide
+    // TSS, ones are users responsibilities and the others should be
+    // persistant system wide.
+    for (int i = 0; i < index; i++)
+      {
+#   if defined (ACE_WIN32) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
+        // Calling thr_keyfree here ensure the key
+        // gets removed appropriately.  Notice that
+        // a key should be removed before freeing it.
+        ACE_OS::thr_keyfree (key_info->key_);
+#   else
+        // don't bother to free the key
+        this->remove (key_info->key_);
+#   endif /* ACE_WIN32 */
+      }
+# endif /* 0 */
+  }
+}
+
+int
+ACE_TSS_Cleanup::free_all_keys_left (void)
+  // This is called from ACE_OS::cleanup_tss ().  When this gets
+  // called, all threads should have exited except the main thread.
+  // No key should be freed from this routine.  It there's any,
+  // something might be wrong.
+{
+  ACE_thread_key_t key_arr[ACE_DEFAULT_THREAD_KEYS];
+  ACE_TSS_TABLE_ITERATOR key_info = table_;
+  unsigned int idx = 0;
+  unsigned int i;
+
+  for (i = 0;
+       i < ACE_DEFAULT_THREAD_KEYS;
+       ++key_info, ++i)
+# if defined (ACE_HAS_TSS_EMULATION)
+    if (key_info->key_ != in_use_key_)
+# endif /* ACE_HAS_TSS_EMULATION */
+      // Don't call ACE_OS::thr_keyfree () on ACE_TSS_Cleanup's own
+      // key.  See the comments in ACE_OS::thr_key_detach ():  the key
+      // doesn't get detached, so it will be in the table here.
+      // However, there's no resource associated with it, so we don't
+      // need to keyfree it.  The dynamic memory associated with it
+      // was already deleted by ACE_TSS_Cleanup::exit (), so we don't
+      // want to access it again.
+      key_arr [idx++] = key_info->key_;
+
+  for (i = 0; i < idx; i++)
+    if (key_arr[i] != ACE_OS::NULL_key)
+# if defined (ACE_HAS_TSS_EMULATION)
+      ACE_OS::thr_keyfree (key_arr[i]);
+# elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
+      // Don't call ACE_OS::thr_keyfree here.  It will try to use
+      // <in_use_> which has already been cleaned up here.
+      ::tsd_delete (key_arr[i]);
+# else /* ACE_WIN32 */
+      // Don't call ACE_OS::thr_keyfree here.  It will try to use
+      // <in_use_> which has already been cleaned up here.
+      TlsFree (key_arr[i]);
+# endif /* ACE_HAS_TSS_EMULATION */
+
+  return 0;
 }
 
 extern "C" void
@@ -834,6 +860,11 @@ ACE_TSS_Cleanup_keys_destroyer (void *tss_keys)
 
 ACE_TSS_Cleanup::ACE_TSS_Cleanup (void)
   : in_use_ (ACE_OS::NULL_key)
+# if defined (ACE_HAS_TSS_EMULATION)
+    // ACE_TSS_Emulation::total_keys () provides the value of the next
+    // key to be created.
+  , in_use_key_ (ACE_TSS_Emulation::total_keys ())
+# endif /* ACE_HAS_TSS_EMULATION */
 {
   ACE_OS_TRACE ("ACE_TSS_Cleanup::ACE_TSS_Cleanup");
 }
@@ -885,118 +916,77 @@ ACE_TSS_Cleanup::remove (ACE_thread_key_t key)
 {
   ACE_OS_TRACE ("ACE_TSS_Cleanup::remove");
   ACE_TSS_CLEANUP_GUARD
+
   ACE_KEY_INDEX (key_index, key);
   if (key_index < ACE_DEFAULT_THREAD_KEYS)
     {
-      remove_key (this->table_ [key_index]);
+      // "Remove" the TSS_Info table entry by zeroing out its key_ and
+      // destructor_ fields.  Also, keep track of the number threads
+      // using the key.
+      ACE_TSS_Info &info = this->table_ [key_index];
+
+      // Don't bother to test/clear the in "use bit" if the program is
+      // shutting down.  Doing so will cause a new ACE_TSS object to be
+      // created again.
+      if (!ACE_OS_Object_Manager::shutting_down ())
+        tss_keys ()->test_and_clear (info.key_);
+      info.key_in_use (0);
+      info.key_ = ACE_OS::NULL_key;
+      info.destructor_ = 0;
       return 0;
     }
-  return -1;
+  else
+    return -1;
 }
 
-void
-ACE_TSS_Cleanup::remove_key (ACE_TSS_Info &info)
+int
+ACE_TSS_Cleanup::detach (void *inst)
 {
-  // assume CLEANUP_GUARD is held by caller
-  ACE_OS_TRACE ("ACE_TSS_Cleanup::remove_key");
+  ACE_TSS_CLEANUP_GUARD
 
-  // only remove it if all threads are done with it
-  // and there is no ACE_TSS holding on to it.
-  if (info.thread_count_ == 0 && info.tss_inst_ == 0)
+  ACE_TSS_TABLE_ITERATOR key_info = table_;
+  int success = 0;
+  int ref_cnt = 0;
+
+  // Mark the key as detached in the TSS_Info table.
+  // It only works for the first key that "inst" owns.
+  // I don't know why.
+  for (unsigned int i = 0;
+       i < ACE_DEFAULT_THREAD_KEYS;
+       ++key_info, ++i)
     {
+      if (key_info->tss_obj_ == inst)
+        {
+          key_info->tss_obj_ = 0;
+          ref_cnt = --key_info->thread_count_;
+          success = 1;
+          break;
+        }
+    }
+
+  if (success == 0)
+    return -1;
+  else if (ref_cnt == 0)
+    {
+      // Mark the key as no longer being used.
+      key_info->key_in_use (0);
+# if defined (ACE_WIN32) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
+      ACE_thread_key_t temp_key = key_info->key_;
+# endif /* ACE_WIN32 */
+      int retv = this->remove (key_info->key_);
+
 # if defined (ACE_WIN32)
-      ACE_thread_key_t temp_key = info.key_;
       ::TlsFree (temp_key);
 # elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
-      ACE_thread_key_t temp_key = info.key_;
       ::tsd_delete (temp_key);
 # endif /* ACE_WIN32 */
-      if (info.key_ == this->in_use_)
-        {
-          this->in_use_ = ACE_OS::NULL_key;
-        }
-      info.key_in_use (0);
-      info.destructor_ = 0;
+      return retv;
     }
-}
-
-int
-ACE_TSS_Cleanup::detach (ACE_thread_key_t key, void *inst)
-{
-  // variables to hold the destructor and the object to be destructed
-  // the actual call is deferred until the guard is released
-  ACE_TSS_Info::Destructor destructor = 0;
-  void * tss_obj = 0;
-
-  // scope the guard
-  {
-    ACE_TSS_CLEANUP_GUARD
-
-    ACE_KEY_INDEX (key_index, key);
-    ACE_ASSERT (key_index < sizeof(this->table_)/sizeof(this->table_[0])
-        && this->table_[key_index].key_ == key);
-    ACE_TSS_Info &info = this->table_ [key_index];
-
-
-    // sanity check
-    if (!info.key_in_use ())
-      {
-        return -1;
-      }
 
-    // if we are detaching from a TSS<x>
-    // clear the inst info so we'll actually release the key
-    if (inst != 0)
-      {
-        ACE_ASSERT (info.tss_inst_ == inst);
-        info.tss_inst_ = 0;
-      }
-    this->thread_release (info, destructor, tss_obj);
-
-    // try to remove this key
-    this->remove_key (info);
- 
-  } // end of scope for the Guard
-  // if there's a destructor and an object to be destroyed
-  if (destructor != 0 && tss_obj != 0)
-    {
-      (*destructor) (tss_obj);
-    }
   return 0;
 }
 
 void
-ACE_TSS_Cleanup::thread_release (
-        ACE_TSS_Info &info,
-        ACE_TSS_Info::Destructor & destructor,
-        void *& tss_obj)
-{
-  // assume guard is held by caller
-  // Find the TSS keys (if any) for this thread
-  // do not create them if they don't exist
-  ACE_TSS_Keys * thread_keys = 0;
-  if (find_tss_keys (thread_keys))
-    {
-        // if this key is in use by this thread
-      if (thread_keys->test_and_clear(info.key_) == 0)
-      {
-        // save destructor & pointer to tss object
-        // until after the guard is released
-        destructor = info.destructor_;
-        ACE_OS::thr_getspecific (info.key_, &tss_obj);
-        ACE_ASSERT (info.thread_count_ > 0);
-        --info.thread_count_;
-#ifdef ACE_DEBUGGING_TSS_CLEANUP
-        ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT ("(%P|%t) ACE_TSS_Cleanup::thread_release[%d] decrement %d\n"),
-          key,info.thread_count_));
-#endif //ACE_DEBUGGING_TSS_CLEANUP
-      }
-    }
-}
-
-
-void
 ACE_TSS_Cleanup::key_used (ACE_thread_key_t key)
 {
   // If the key's ACE_TSS_Info in-use bit for this thread is not set,
@@ -1029,24 +1019,10 @@ ACE_TSS_Cleanup::dump (void)
 # endif /* ACE_HAS_DUMP */
 }
 
-bool
-ACE_TSS_Cleanup::find_tss_keys (ACE_TSS_Keys *& tss_keys) const
-{
-  if (this->in_use_ == ACE_OS::NULL_key)
-    return false;
-  if (ACE_OS::thr_getspecific (in_use_,
-          reinterpret_cast<void **> (&tss_keys)) == -1)
-    {
-      ACE_ASSERT (false);
-      return false; // This should not happen!
-    }
-  return tss_keys != 0;
-}
-
 ACE_TSS_Keys *
 ACE_TSS_Cleanup::tss_keys ()
 {
-  if (this->in_use_ == ACE_OS::NULL_key)
+  if (in_use_ == ACE_OS::NULL_key)
     {
       ACE_TSS_CLEANUP_GUARD
       // Double-check;
@@ -1055,20 +1031,14 @@ ACE_TSS_Cleanup::tss_keys ()
           // Initialize in_use_ with a new key.
           if (ACE_OS::thr_keycreate (&in_use_,
                                      &ACE_TSS_Cleanup_keys_destroyer))
-            {
-              ACE_ASSERT (false);
-              return 0; // Major problems, this should *never* happen!
-            }
+            return 0; // Major problems, this should *never* happen!
         }
     }
 
   ACE_TSS_Keys *ts_keys = 0;
   if (ACE_OS::thr_getspecific (in_use_,
         ACE_reinterpret_cast (void **, &ts_keys)) == -1)
-    {
-      ACE_ASSERT (false);
-      return 0; // This should not happen!
-    }
+    return 0; // This should not happen!
 
   if (ts_keys == 0)
     {
@@ -1081,7 +1051,6 @@ ACE_TSS_Cleanup::tss_keys ()
             ACE_reinterpret_cast (void *,
                                   ts_keys)) == -1)
         {
-          ACE_ASSERT (false);
           delete ts_keys;
           return 0; // Major problems, this should *never* happen!
         }
@@ -1123,8 +1092,7 @@ ACE_OS::cleanup_tss (const u_int main_thread)
 {
 #if defined (ACE_HAS_TSS_EMULATION) || defined (ACE_WIN32) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
   // Call TSS destructors for current thread.
-  if (ACE_TSS_Cleanup::lockable ())
-    ACE_TSS_Cleanup::instance ()->exit (0);
+  ACE_TSS_Cleanup::instance ()->exit (0);
 #endif /* ACE_HAS_TSS_EMULATION || ACE_WIN32 || ACE_PSOS_HAS_TSS */
 
   if (main_thread)
@@ -1138,11 +1106,19 @@ ACE_OS::cleanup_tss (const u_int main_thread)
 #endif /* ! ACE_HAS_TSS_EMULATION  &&  ! ACE_HAS_MINIMAL_ACE_OS */
 
 #if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
+# if ! defined (ACE_HAS_TSS_EMULATION)
+      // Don't do this with TSS_Emulation, because the the
+      // ACE_TSS_Cleanup::instance () has already exited ().  We can't
+      // safely access the TSS values that were created by the main
+      // thread.
+
+      // Remove all TSS_Info table entries.
+      ACE_TSS_Cleanup::instance ()->free_all_keys_left ();
+# endif /* ! ACE_HAS_TSS_EMULATION */
+
       // Finally, free up the ACE_TSS_Cleanup instance.  This method gets
       // called by the ACE_Object_Manager.
-      if (ACE_TSS_Cleanup::lockable ())
-        delete ACE_TSS_Cleanup::instance ();
-
+      delete ACE_TSS_Cleanup::instance ();
 #endif /* WIN32 || ACE_HAS_TSS_EMULATION || ACE_PSOS_HAS_TSS */
 
 #if defined (ACE_HAS_TSS_EMULATION)
@@ -3222,11 +3198,11 @@ ACE_OS::thr_join (ACE_thread_t waiter_id,
 #endif /* VXWORKS */
 
 int
-ACE_OS::thr_key_detach (ACE_thread_key_t key, void * inst)
+ACE_OS::thr_key_detach (void *inst)
 {
 #if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
   if (ACE_TSS_Cleanup::lockable ())
-    return ACE_TSS_Cleanup::instance()->detach (key, inst);
+    return ACE_TSS_Cleanup::instance()->detach (inst);
   else
     // We're in static constructor/destructor phase.  Don't
     // try to use the ACE_TSS_Cleanup instance because its lock
@@ -3234,7 +3210,6 @@ ACE_OS::thr_key_detach (ACE_thread_key_t key, void * inst)
     // destroyed already.  Just leak the key . . .
     return -1;
 #else
-  ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (inst);
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION */
@@ -3385,7 +3360,7 @@ ACE_OS::thr_keycreate (ACE_thread_key_t *key,
         // Extract out the thread-specific table instance and stash away
         // the key and destructor so that we can free it up later on...
         return ACE_TSS_Cleanup::instance ()->insert (*key, dest, inst);
-     }
+      }
     else
       ACE_FAIL_RETURN (-1);
       /* NOTREACHED */
@@ -3411,10 +3386,7 @@ ACE_OS::thr_keyfree (ACE_thread_key_t key)
 # if defined (ACE_HAS_TSS_EMULATION)
     // Release the key in the TSS_Emulation administration
     ACE_TSS_Emulation::release_key (key);
-    if (ACE_TSS_Cleanup::lockable ())
-      return ACE_TSS_Cleanup::instance ()->remove (key);
-    else
-      return -1;
+    return ACE_TSS_Cleanup::instance ()->remove (key);
 # elif defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
     ACE_UNUSED_ARG (key);
     ACE_NOTSUP_RETURN (-1);
@@ -3428,14 +3400,12 @@ ACE_OS::thr_keyfree (ACE_thread_key_t key)
 # elif defined (ACE_HAS_WTHREADS)
     // Extract out the thread-specific table instance and free up
     // the key and destructor.
-    if (ACE_TSS_Cleanup::lockable ())
-      return ACE_TSS_Cleanup::instance ()->remove (key);
+    ACE_TSS_Cleanup::instance ()->remove (key);
     ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::TlsFree (key), ace_result_), int, -1);
 # elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
     // Extract out the thread-specific table instance and free up
     // the key and destructor.
-    if (ACE_TSS_Cleanup::lockable ())
-      return ACE_TSS_Cleanup::instance ()->remove (key);
+    ACE_TSS_Cleanup::instance ()->remove (key);
     return (::tsd_delete (key) == 0) ? 0 : -1;
 # else
     ACE_UNUSED_ARG (key);
diff --git a/ace/OS_NS_Thread.h b/ace/OS_NS_Thread.h
index cb93d65773d..d3308a99116 100644
--- a/ace/OS_NS_Thread.h
+++ b/ace/OS_NS_Thread.h
@@ -957,12 +957,9 @@ public:
 class ACE_TSS_Info
 {
 public:
-  /// Declare pointer to function to destroy tss object.
-  typedef void (*Destructor)(void *);
-
   /// Constructor
   ACE_TSS_Info (ACE_thread_key_t key,
-                Destructor dest = 0,
+                void (*dest)(void *) = 0,
                 void *tss_inst = 0);
 
   /// Default constructor
@@ -989,10 +986,10 @@ private:
   ACE_thread_key_t key_;
 
   /// "Destructor" that gets called when the item is finally released.
-  Destructor destructor_;
+  void (*destructor_)(void *);
 
   /// Pointer to ACE_TSS<xxx> instance that has/will allocate the key.
-  void *tss_inst_;
+  void *tss_obj_;
 
   /// Count of threads that are using this key.  Contains -1 when the
   /// key is not in use.
@@ -1660,7 +1657,7 @@ namespace ACE_OS {
                 ACE_THR_FUNC_RETURN *status);
 
   extern ACE_Export
-  int thr_key_detach (ACE_thread_key_t key, void * inst);
+  int thr_key_detach (void *inst);
 
   extern ACE_Export
   int thr_key_used (ACE_thread_key_t key);
diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl
index 89a9c934870..f71b7a03a02 100644
--- a/ace/OS_NS_Thread.inl
+++ b/ace/OS_NS_Thread.inl
@@ -88,7 +88,7 @@ ACE_TSS_Emulation::ts_object (const ACE_thread_key_t key)
         // Zero the entire TSS array.  Do it manually instead of using
         // memset, for optimum speed.  Though, memset may be faster :-)
         void **tss_base_p =
-          reinterpret_cast<void **> (taskIdCurrent->ACE_VXWORKS_SPARE);
+          reinterpret_cast> (void **> (taskIdCurrent->ACE_VXWORKS_SPARE);
         for (u_int i = 0; i < ACE_TSS_THREAD_KEYS_MAX; ++i, ++tss_base_p)
           {
             *tss_base_p = 0;
@@ -668,9 +668,9 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
     {
 #   if defined (ACE_HAS_PTHREADS_DRAFT7) || defined (ACE_HAS_PTHREADS_STD)
 #     if defined (_POSIX_THREAD_PROCESS_SHARED) && !defined (ACE_LACKS_MUTEXATTR_PSHARED)
-      (void) ACE_ADAPT_RETVAL (::pthread_mutexattr_setpshared (attributes,
-                                                               lock_scope),
-                               result);
+      ACE_ADAPT_RETVAL (::pthread_mutexattr_setpshared (attributes,
+                                                        lock_scope),
+                        result);
 #     endif /* _POSIX_THREAD_PROCESS_SHARED && !ACE_LACKS_MUTEXATTR_PSHARED */
 #   else /* Pthreads draft 6 */
 #     if !defined (ACE_LACKS_MUTEXATTR_PSHARED)
@@ -4557,7 +4557,7 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m,
 
 # elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
   // Force the use of USYNC_THREAD!
-  return ACE_OS::mutex_init (m, USYNC_THREAD, name, arg, 0, lock_type);
+  return ACE_OS::mutex_init (m, USYNC_THREAD, name, arg, lock_type);
 
 # elif defined (VXWORKS) || defined (ACE_PSOS)
   return mutex_init (m, type, name, arg);
diff --git a/ace/OS_NS_ctype.h b/ace/OS_NS_ctype.h
index ce738790ef1..b6c9e8d1de3 100644
--- a/ace/OS_NS_ctype.h
+++ b/ace/OS_NS_ctype.h
@@ -42,7 +42,8 @@ namespace ACE_OS {
    *  equivalents.
    *
    *  Since they are often implemented as macros, we don't use the same name
-   *  here.  Instead, we change by prepending "ace_".
+   *  here.  Instead, we change by prepending "ace_" (with the exception of
+   *  to_lower and to_upper).
    */
   //@{
 
@@ -92,22 +93,22 @@ namespace ACE_OS {
 
   /// Converts a character to lower case (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_tolower (int c);
+  int to_lower (int c);
 
 #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWLOWER)
   /// Converts a character to lower case (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  wint_t ace_towlower (wint_t c);
+  wint_t to_lower (wint_t c);
 #endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWLOWER */
 
   /// Converts a character to upper case (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_toupper (int c);
+  int to_upper (int c);
 
 #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWUPPER)
   /// Converts a character to upper case (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  wint_t ace_towupper (wint_t c);
+  wint_t to_upper (wint_t c);
 #endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWUPPER */
 
   //@}
diff --git a/ace/OS_NS_ctype.inl b/ace/OS_NS_ctype.inl
index 13b8e05a1aa..89a7270814d 100644
--- a/ace/OS_NS_ctype.inl
+++ b/ace/OS_NS_ctype.inl
@@ -114,29 +114,30 @@ ACE_OS::ace_isxdigit (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_tolower (int c)
+ACE_OS::to_lower (int c)
 {
   return tolower (c);
 }
 
 #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWLOWER)
 ACE_INLINE wint_t
-ACE_OS::ace_towlower (wint_t c)
+ACE_OS::to_lower (wint_t c)
 {
   return towlower (c);
 }
 #endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWLOWER */
 
 ACE_INLINE int
-ACE_OS::ace_toupper (int c)
+ACE_OS::to_upper (int c)
 {
   return toupper (c);
 }
 
 #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWUPPER)
 ACE_INLINE wint_t
-ACE_OS::ace_towupper (wint_t c)
+ACE_OS::to_upper (wint_t c)
 {
   return towupper (c);
 }
 #endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWUPPER */
+
diff --git a/ace/OS_NS_dirent.inl b/ace/OS_NS_dirent.inl
index 7fe98c850db..ceb27b371a8 100644
--- a/ace/OS_NS_dirent.inl
+++ b/ace/OS_NS_dirent.inl
@@ -51,11 +51,9 @@ ACE_OS::opendir (const ACE_TCHAR *filename)
 #  else /* ! ACE_PSOS */
 #    if defined (ACE_WIN32) && defined (ACE_LACKS_OPENDIR)
   return ::ACE_OS::opendir_emulation (filename);
-#    elif defined (VXWORKS)
-  // VxWorks' ::opendir () is declared with a non-const argument.
-  return ::opendir (const_cast<char *> (filename));
 #    else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */
-  return ::opendir (ACE_TEXT_ALWAYS_CHAR (filename));
+  // VxWorks' ::opendir () is declared with a non-const argument.
+  return ::opendir (const_cast<ACE_TCHAR *> (filename));
 #    endif /* ACE_WIN32 && ACE_LACKS_OPENDIR */
 #  endif /* ACE_PSOS */
 #else
@@ -167,14 +165,7 @@ ACE_OS::scandir (const ACE_TCHAR *dirname,
                                     const struct dirent **f2))
 {
 #if defined (ACE_HAS_SCANDIR)
-  return ::scandir (ACE_TEXT_ALWAYS_CHAR (dirname),
-                    namelist,
-                    selector,
-#  if defined (ACE_SCANDIR_CMP_USES_VOIDPTR)
-                    reinterpret_cast<int(*)(const void*, const void*)> (comparator));
-#  else
-                    comparator);
-#  endif /* ACE_SCANDIR_CMP_USES_VOIDPTR */
+  return ::scandir (dirname, namelist, selector, comparator);
 #else /* ! defined ( ACE_HAS_SCANDIR) */
   return ACE_OS::scandir_emulation (dirname, namelist, selector, comparator);
 #endif /* ACE_HAS_SCANDIR */
diff --git a/ace/OS_NS_dlfcn.inl b/ace/OS_NS_dlfcn.inl
index 181c679b7e5..f939c41dcbe 100644
--- a/ace/OS_NS_dlfcn.inl
+++ b/ace/OS_NS_dlfcn.inl
@@ -4,7 +4,6 @@
 #include "ace/OS_NS_macros.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_fcntl.h"
-#include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Default_Constants.h"
 #include "ace/os_include/os_fcntl.h"
@@ -71,22 +70,11 @@ ACE_OS::dlerror (void)
 {
   ACE_OS_TRACE ("ACE_OS::dlerror");
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
-  const char *err;
-#   if defined(_M_UNIX)
-  ACE_OSCALL (::_dlerror (), const char *, 0, err);
-#   else /* _M_UNIX */
-  ACE_OSCALL (::dlerror (), const char *, 0, err);
-#   endif /* _M_UNIX */
-  if (err == 0)
-    return 0;
-#   if defined (ACE_USES_WCHAR)
-  const size_t BufLen = 256;
-  static wchar_t buf[BufLen];
-  ACE_OS::strncpy (buf, ACE_TEXT_CHAR_TO_TCHAR (err), BufLen);
-  return buf;
-#   else
-  return const_cast <char *> (err);
-#   endif /* ACE_USES_WCHAR */
+#if defined(_M_UNIX)
+  ACE_OSCALL_RETURN ((char *)::_dlerror (), char *, 0);
+#else /* _M_UNIX */
+  ACE_OSCALL_RETURN ((char *)::dlerror (), char *, 0);
+#endif /* _M_UNIX */
 # elif defined (__hpux) || defined (VXWORKS)
   ACE_OSCALL_RETURN (::strerror(errno), char *, 0);
 # elif defined (ACE_WIN32)
@@ -126,14 +114,11 @@ ACE_OS::dlopen (const ACE_TCHAR *fname,
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
   void *handle;
 #   if defined (ACE_HAS_SGIDLADD)
-  ACE_OSCALL
-    (::sgidladd (ACE_TEXT_ALWAYS_CHAR (filename), mode), void *, 0, handle);
+  ACE_OSCALL (::sgidladd (filename, mode), void *, 0, handle);
 #   elif defined (_M_UNIX)
-  ACE_OSCALL
-    (::_dlopen (ACE_TEXT_ALWAYS_CHAR (filename), mode), void *, 0, handle);
+  ACE_OSCALL (::_dlopen (filename, mode), void *, 0, handle);
 #   else
-  ACE_OSCALL
-    (::dlopen (ACE_TEXT_ALWAYS_CHAR (filename), mode), void *, 0, handle);
+  ACE_OSCALL (::dlopen (filename, mode), void *, 0, handle);
 #   endif /* ACE_HAS_SGIDLADD */
 #   if !defined (ACE_HAS_AUTOMATIC_INIT_FINI)
   if (handle != 0)
@@ -213,15 +198,11 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
   // Get the correct OS type.
 #if defined (ACE_HAS_WINCE)
   const wchar_t *symbolname = sname;
-#elif defined (ACE_USES_WCHAR)
-  // WinCE is WCHAR always; other platforms need a char * symbol name
-  ACE_Wide_To_Ascii w_sname (sname);
-  char *symbolname = w_sname.char_rep ();
 #elif defined (ACE_HAS_CHARPTR_DL)
   char *symbolname = const_cast<char *> (sname);
-#else
+#elif !defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
   const char *symbolname = sname;
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_HAS_CHARPTR_DL */
 
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
 
@@ -241,6 +222,10 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
   ACE_OSCALL_RETURN (::dlsym (handle, symbolname), void *, 0);
 #   endif /* ACE_USES_ASM_SYMBOL_IN_DLSYM */
 
+# elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE)
+
+  ACE_WIN32CALL_RETURN (::GetProcAddress (handle, ACE_TEXT_ALWAYS_CHAR (sname)), void *, 0);
+
 # elif defined (ACE_WIN32)
 
   ACE_WIN32CALL_RETURN (::GetProcAddress (handle, symbolname), void *, 0);
diff --git a/ace/OS_NS_errno.h b/ace/OS_NS_errno.h
index a3fcaabfb7c..3dbef6784ff 100644
--- a/ace/OS_NS_errno.h
+++ b/ace/OS_NS_errno.h
@@ -19,7 +19,7 @@
 
 # include /**/ "ace/pre.h"
 
-# include "ace/config-lite.h"
+# include "ace/config-all.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
@@ -49,41 +49,6 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
-#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-/**
- * @class ACE_CE_Errno
- *
- * Some versions of CE don't support <errno> and some versions'
- * implementations are busted.  So we implement our own.
- * Our implementation takes up one Tls key, however, it does not
- * allocate memory fromt the heap so there's no problem with cleanin
- * up the errno when a thread exit.
- */
-class ACE_Export ACE_CE_Errno
-{
-public:
-  ACE_CE_Errno () {}
-  static void init ();
-  static void fini ();
-  static ACE_CE_Errno *instance ();
-
-  operator int (void) const;
-  int operator= (int);
-
-private:
-  static ACE_CE_Errno *instance_;
-  static DWORD errno_key_;
-};
-
-# define errno (* (ACE_CE_Errno::instance ()))
-#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
-
-#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-#  define ACE_ERRNO_TYPE ACE_CE_Errno
-#else
-#  define ACE_ERRNO_TYPE int
-#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
-
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_errno.inl b/ace/OS_NS_errno.inl
index 63eaaba1c14..0e468d74851 100644
--- a/ace/OS_NS_errno.inl
+++ b/ace/OS_NS_errno.inl
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-#include "ace/config-all.h"    /* Need ACE_TRACE */
-
 ACE_INLINE int
 ACE_OS::last_error (void)
 {
@@ -69,28 +67,3 @@ ACE_OS::set_errno_to_wsa_last_error (void)
   return errno;
 # endif /* defined(ACE_WIN32) */
 }
-
-#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-
-ACE_INLINE ACE_CE_Errno *
-ACE_CE_Errno::instance ()
-{
-  // This should be inlined.
-  return ACE_CE_Errno::instance_;
-}
-
-ACE_INLINE
-ACE_CE_Errno::operator int (void) const
-{
-  return (int) TlsGetValue (ACE_CE_Errno::errno_key_);
-}
-
-ACE_INLINE int
-ACE_CE_Errno::operator= (int x)
-{
-  // error checking?
-  TlsSetValue (ACE_CE_Errno::errno_key_, (void *) x);
-  return x;
-}
-
-#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
diff --git a/ace/OS_NS_fcntl.inl b/ace/OS_NS_fcntl.inl
index 0e541c90575..ca18bb9250b 100644
--- a/ace/OS_NS_fcntl.inl
+++ b/ace/OS_NS_fcntl.inl
@@ -16,3 +16,4 @@ ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg)
   ACE_OSCALL_RETURN (::fcntl (handle, cmd, arg), int, -1);
 # endif /* ACE_LACKS_FCNTL */
 }
+
diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp
index 10208d96a34..a5bcfae03f0 100644
--- a/ace/OS_NS_stdio.cpp
+++ b/ace/OS_NS_stdio.cpp
@@ -77,9 +77,8 @@ void ACE_OS::checkUnicodeFormat (FILE* fp)
       // select correct buffer type.
 
       // At this point, check if the file is Unicode or not.
-      ACE_UINT16 first_two_bytes;
-      size_t numRead =
-        ACE_OS::fread(&first_two_bytes, sizeof (first_two_bytes), 1, fp);
+      WORD first_two_bytes;
+      size_t numRead = ACE_OS::fread(&first_two_bytes, sizeof(WORD), 1, fp);
 
       if (numRead == 1)
         {
@@ -87,11 +86,7 @@ void ACE_OS::checkUnicodeFormat (FILE* fp)
               (first_two_bytes != 0xFEFF))   // not a big endian Unicode file
             {
               // set file pointer back to the beginning
-#if defined (ACE_WIN32)
               ACE_OS::fseek(fp, 0, FILE_BEGIN);
-#else
-              ACE_OS::fseek(fp, 0, SEEK_SET);
-#endif /* ACE_WIN32 */
             }
         }
       // if it is a Unicode file, file pointer will be right next to the first
@@ -428,6 +423,6 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
   ACE_UNUSED_ARG (format);
   ACE_NOTSUP_RETURN (-1);
 
-# endif /* XPG5 || ACE_HAS_DINKUM_STL */
+# endif /* ACE_HAS_VSWPRINTF */
 }
 #endif /* ACE_HAS_WCHAR */
diff --git a/ace/OS_NS_stdio.h b/ace/OS_NS_stdio.h
index e1720e7f582..5ffe25db3ed 100644
--- a/ace/OS_NS_stdio.h
+++ b/ace/OS_NS_stdio.h
@@ -177,12 +177,7 @@ namespace ACE_OS {
   int fgetpos (FILE* fp, fpos_t* pos);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  char *fgets (char *buf, int size, FILE *fp);
-
-# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FGETWS)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *fgets (wchar_t *buf, int size, FILE *fp);
-# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */
+  ACE_TCHAR *fgets (ACE_TCHAR *buf, int size, FILE *fp);
 
   //@{ @name A set of wrappers for file locks.
 
@@ -257,7 +252,7 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   LPSECURITY_ATTRIBUTES default_win32_security_attributes (LPSECURITY_ATTRIBUTES);
   ACE_NAMESPACE_INLINE_FUNCTION
-  LPSECURITY_ATTRIBUTES default_win32_security_attributes_r (LPSECURITY_ATTRIBUTES,
+  LPSECURITY_ATTRIBUTES default_win32_security_attributes_r (LPSECURITY_ATTRIBUTES, 
                                              LPSECURITY_ATTRIBUTES,
                                              SECURITY_DESCRIPTOR*);
 
@@ -299,15 +294,9 @@ namespace ACE_OS {
 # endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int fputs (const char *s,
+  int fputs (const ACE_TCHAR *s,
              FILE *stream);
 
-# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FPUTWS)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int fputs (const wchar_t *s,
-             FILE *stream);
-# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */
-
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t fread (void *ptr,
                 size_t size,
@@ -349,23 +338,13 @@ namespace ACE_OS {
   char *gets (char *str, int n = 0);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  void perror (const char *s);
-
-#if defined (ACE_HAS_WCHAR)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  void perror (const wchar_t *s);
-#endif /* ACE_HAS_WCHAR */
+  void perror (const ACE_TCHAR *s);
 
   extern ACE_Export
   int printf (const char *format, ...);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int puts (const char *s);
-
-#if defined (ACE_HAS_WCHAR)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int puts (const wchar_t *s);
-#endif /* ACE_HAS_WCHAR */
+  int puts (const ACE_TCHAR *s);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int rename (const char *old_name,
diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl
index 0d1459b64f7..d21702850e6 100644
--- a/ace/OS_NS_stdio.inl
+++ b/ace/OS_NS_stdio.inl
@@ -558,7 +558,7 @@ ACE_OS::cuserid (char *user, size_t maxlen)
       const size_t ACE_L_cuserid = 9;  // 8 character user ID + NULL
 #endif  /* _POSIX_SOURCE */
 
-      static char tmp[ACE_L_cuserid] = { '\0' };
+      static ACE_TCHAR tmp[ACE_L_cuserid] = { '\0' };
       max_length = ACE_L_cuserid - 1; // Do not include NULL in length
 
       userid = tmp;
@@ -670,8 +670,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
   ACE_UNUSED_ARG (mode);
   ACE_NOTSUP_RETURN (0);
 # else
-  ACE_OSCALL_RETURN
-    (::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode)), FILE *, 0);
+  ACE_OSCALL_RETURN (::fdopen (handle, mode), FILE *, 0);
 # endif /* ACE_HAS_WINCE */
 }
 
@@ -702,22 +701,17 @@ ACE_OS::fgetpos (FILE* fp, fpos_t* pos)
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetpos (fp, pos), int, -1);
 }
 
-ACE_INLINE char *
-ACE_OS::fgets (char *buf, int size, FILE *fp)
+ACE_INLINE ACE_TCHAR *
+ACE_OS::fgets (ACE_TCHAR *buf, int size, FILE *fp)
 {
   ACE_OS_TRACE ("ACE_OS::fgets");
+#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+  ACE_OSCALL_RETURN (::fgetws (buf, size, fp), wchar_t *, 0);
+#else /* ACE_WIN32 */
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgets (buf, size, fp), char *, 0);
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FGETWS)
-ACE_INLINE wchar_t *
-ACE_OS::fgets (wchar_t *buf, int size, FILE *fp)
-{
-  ACE_OS_TRACE ("ACE_OS::fgets");
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetws (buf, size, fp), wchar_t *, 0);
-}
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */
-
 #if !defined (ACE_WIN32)
 // Win32 implementation of fopen () is in OS_NS_stdio.cpp.
 ACE_INLINE FILE *
@@ -743,21 +737,16 @@ ACE_OS::fopen (const wchar_t *filename, const ACE_TCHAR *mode)
 #endif /* ACE_WIN32 */
 
 ACE_INLINE int
-ACE_OS::fputs (const char *s, FILE *stream)
+ACE_OS::fputs (const ACE_TCHAR *s, FILE *stream)
 {
   ACE_OS_TRACE ("ACE_OS::fputs");
+#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+  ACE_OSCALL_RETURN (::fputws (s, stream), int, -1);
+#else /* ACE_WIN32 */
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputs (s, stream), int, -1);
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FPUTWS)
-ACE_INLINE int
-ACE_OS::fputs (const wchar_t *s, FILE *stream)
-{
-  ACE_OS_TRACE ("ACE_OS::fputs");
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputws (s, stream), int, -1);
-}
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */
-
 ACE_INLINE size_t
 ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp)
 {
@@ -772,11 +761,7 @@ ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream)
 #if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   ACE_OSCALL_RETURN (::_wfreopen (filename, mode, stream), FILE *, 0);
 #else
-  ACE_OSCALL_RETURN
-    (ACE_STD_NAMESPACE::freopen (ACE_TEXT_ALWAYS_CHAR (filename),
-                                 ACE_TEXT_ALWAYS_CHAR (mode),
-                                 stream),
-     FILE *, 0);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::freopen (filename, mode, stream), FILE *, 0);
 #endif /* ACE_WIN32 && ACE_USES_WCHAR */
 }
 
@@ -839,55 +824,29 @@ ACE_OS::gets (char *str)
 #endif /* 0 */
 
 ACE_INLINE void
-ACE_OS::perror (const char *s)
+ACE_OS::perror (const ACE_TCHAR *s)
 {
   ACE_OS_TRACE ("ACE_OS::perror");
 #if defined (ACE_HAS_WINCE)
   // @@ WINCE: How should this be handled
   ACE_UNUSED_ARG (s);
-#else
-  ::perror (s);
-#endif /* ACE_HAS_WINCE */
-}
-
-#if defined (ACE_HAS_WCHAR)
-ACE_INLINE void
-ACE_OS::perror (const wchar_t *s)
-{
-  ACE_OS_TRACE ("ACE_OS::perror");
-#if defined (ACE_HAS_WINCE)
-  // @@ WINCE: How should this be handled
-  ACE_UNUSED_ARG (s);
-#elif defined (ACE_WIN32)
+#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   ::_wperror (s);
 #else
-  ACE_Wide_To_Ascii n_s (s);
-  ::perror (n_s.char_rep ());
+  ::perror (s);
 #endif /* ACE_HAS_WINCE */
 }
-#endif /* ACE_HAS_WCHAR */
-
-ACE_INLINE int
-ACE_OS::puts (const char *s)
-{
-  ACE_OS_TRACE ("ACE_OS::puts");
-  ACE_OSCALL_RETURN (::puts (s), int, -1);
-}
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
-ACE_OS::puts (const wchar_t *s)
+ACE_OS::puts (const ACE_TCHAR *s)
 {
   ACE_OS_TRACE ("ACE_OS::puts");
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   ACE_OSCALL_RETURN (::_putws (s), int, -1);
 #else /* ACE_WIN32 */
-  // There's no putws()...
-  ACE_Wide_To_Ascii n_s (s);
-  ACE_OSCALL_RETURN (::puts (n_s.char_rep ()), int, -1);
-#endif /* ACE_WIN32 */
+  ACE_OSCALL_RETURN (::puts (s), int, -1);
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_OS::rename (const char *old_name,
@@ -900,10 +859,8 @@ ACE_OS::rename (const char *old_name,
   ACE_UNUSED_ARG (flags);
   ACE_NOTSUP_RETURN (-1);
 # elif defined (ACE_HAS_WINCE)
-  // Win CE is always wide-char.
   ACE_UNUSED_ARG (flags);
-  if (0 != MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name),
-                     ACE_TEXT_CHAR_TO_TCHAR (new_name)))
+  if (MoveFile (old_name, new_name) != 0)
     ACE_FAIL_RETURN (-1);
   return 0;
 # elif defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1)
@@ -1037,21 +994,12 @@ ACE_OS::vsprintf (char *buffer, const char *format, va_list argptr)
 ACE_INLINE int
 ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
 {
-# if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || \
-     (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \
-     (defined (ACE_HAS_DINKUM_STL))
-
-  // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a
-  // maxlen argument. Since this method doesn't supply one, pass in
-  // a length that works (ULONG_MAX doesn't). If this isn't ok, use
-  // ACE_OS::snprintf().
-  return vswprintf (buffer, 4096, format, argptr);
-
-# elif defined (ACE_WIN32)
-  // Windows has vswprintf, but the signature is from the older ISO C
-  // standard. Also see ACE_OS::snprintf() for more info on this.
-
-  return vswprintf (buffer, format, argptr);
+# if defined (ACE_HAS_VSWPRINTF)
+#  if defined (ACE_HAS_DINKUM_STL)
+  return ACE_STD_NAMESPACE::vswprintf (buffer, ULONG_MAX, format, argptr);
+#else
+  return ::vswprintf (buffer, format, argptr);
+#  endif /* ACE_HAS_DINKUM_STL */
 
 # else
   ACE_UNUSED_ARG (buffer);
@@ -1059,7 +1007,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
   ACE_UNUSED_ARG (argptr);
   ACE_NOTSUP_RETURN (-1);
 
-# endif /* XPG5 || ACE_HAS_DINKUM_STL */
+# endif /* ACE_HAS_VSWPRINTF */
 }
 #endif /* ACE_HAS_WCHAR */
 
diff --git a/ace/OS_NS_stdlib.cpp b/ace/OS_NS_stdlib.cpp
index 882057e6380..db9b6ac980c 100644
--- a/ace/OS_NS_stdlib.cpp
+++ b/ace/OS_NS_stdlib.cpp
@@ -259,21 +259,21 @@ ACE_OS::realloc (void *ptr, size_t nbytes)
   return ACE_REALLOC_FUNC (ACE_MALLOC_T (ptr), nbytes);
 }
 
-#if defined (ACE_LACKS_REALPATH) && !defined (ACE_HAS_WINCE)
-char *
-ACE_OS::realpath (const char *file_name,
-		  char *resolved_name)
+#if defined (ACE_LACKS_REALPATH)
+ACE_TCHAR *
+ACE_OS::realpath (const ACE_TCHAR *file_name,
+		  ACE_TCHAR *resolved_name)
 {
   ACE_OS_TRACE ("ACE_OS::realpath");
   
-  if (file_name == 0)
+  if(file_name == 0)
     {
       // Single Unix Specification V3:
       //   Return an error if parameter is a null pointer.
       errno = EINVAL;
       return 0;
     }
-
+  
   if (*file_name == '\0')
     {
       // Single Unix Specification V3:
@@ -282,151 +282,151 @@ ACE_OS::realpath (const char *file_name,
       errno = ENOENT;
       return 0;
     }
-
+  
   char* rpath;
-
+  
   if (resolved_name == 0)
     {
       // Single Unix Specification V3:
       //   Return an error if parameter is a null pointer.
-      //
+      //   
       // To match glibc realpath() and Win32 _fullpath() behavior,
       // allocate room for the return value if resolved_name is
       // a null pointer.
       rpath = static_cast<char*>(ACE_OS::malloc (PATH_MAX));
       if (rpath == 0)
-        {
-          errno = ENOMEM;
-          return 0;
-        }
+	{
+	  errno = ENOMEM;
+	  return 0;
+	}
     }
   else
     {
       rpath = resolved_name;
     }
-
+  
   char* dest;
-
+  
   if (*file_name != '/')
     {
       // file_name is relative path so CWD needs to be added
       if (ACE_OS::getcwd (rpath, PATH_MAX) == 0)
-        {
-          if (resolved_name == 0)
-            ACE_OS::free (rpath);
-          return 0;
-        }
+	{
+	  if (resolved_name == 0)
+	    ACE_OS::free (rpath);
+	  return 0;
+	}
       dest = ACE_OS::strchr (rpath, '\0');
     }
   else
     {
       dest = rpath;
     }
-
+  
   char expand_buf[PATH_MAX]; // Extra buffer needed to expand symbolic links
   int nlinks = 0;
-
+  
   while (*file_name)
-    {
+  {
       *dest++ = '/';
-
+      
       // Skip multiple separators
       while (*file_name == '/')
-        ++file_name;
-
+	++file_name;
+      
       char* start = dest;
-
+      
       // Process one path component
       while (*file_name && *file_name != '/')
-        {
-          *dest++ = *file_name++;
-          if (dest - rpath > PATH_MAX)
-            {
-              errno = ENAMETOOLONG;
-              if (resolved_name == 0)
-                ACE_OS::free (rpath);
-              return 0;
-            }
-        }
-
+	{
+	  *dest++ = *file_name++;
+	  if (dest - rpath > PATH_MAX)
+          {
+	      errno = ENAMETOOLONG;
+	      if (resolved_name == 0)
+		ACE_OS::free (rpath);
+	      return 0;
+	    }
+	}
+      
       if (start == dest) // Are we done?
-        {
-          if (dest - rpath > 1)
-            --dest; // Remove trailing separator if not at root
-          break;
-        }
+	{
+	  if (dest - rpath > 1)
+	    --dest; // Remove trailing separator if not at root
+	  break;
+	}
       else if (dest - start == 1 && *start == '.')
-        {
-          dest -= 2; // Remove "./"
-        }
+	{
+	  dest -= 2; // Remove "./"
+	}
       else if (dest - start == 2 && *start == '.' && *(start +1) == '.')
-        {
-          dest -= 3; // Remove "../"
-          if (dest > rpath) // Remove the last path component if not at root
-            while (*--dest != '/')
-              ;
-        }
+	{
+	  dest -= 3; // Remove "../"
+	  if (dest > rpath) // Remove the last path component if not at root
+	    while (*--dest != '/')
+	      ;
+	}
       else
-        {
-          ACE_stat st;
-
-          *dest = '\0';
-          if (ACE_OS::lstat(rpath, &st) < 0)
-            {
-              if (resolved_name == 0)
-              ACE_OS::free (rpath);
-                return 0;
-            }
-
+	{
+	  ACE_stat st;
+	  
+	  *dest = '\0';
+	  if (ACE_OS::lstat(rpath, &st) < 0)
+	    {
+	      if (resolved_name == 0)
+		ACE_OS::free (rpath);
+	      return 0;
+	    }
+	  
 	  // Check if current path is a link
 	  if (S_ISLNK (st.st_mode))
 	    {
 	      if (++nlinks > MAXSYMLINKS)
-          {
-            errno = ELOOP;
-            if (resolved_name == 0)
-              ACE_OS::free (rpath);
-            return 0;
-          }
-
+		{
+		  errno = ELOOP;
+		  if (resolved_name == 0)
+		    ACE_OS::free (rpath);
+		  return 0;
+		}
+	      
 	      char link_buf[PATH_MAX];
-
+	      
 	      int link_len = ACE_OS::readlink (rpath, link_buf, PATH_MAX);
 	      int tail_len = ACE_OS::strlen (file_name) + 1;
-
+	      
 	      // Check if there is room to expand link?
 	      if (link_len + tail_len > PATH_MAX)
-          {
-            errno = ENAMETOOLONG;
-            if (resolved_name == 0)
-              ACE_OS::free (rpath);
-            return 0;
-          }
-
+		{
+		  errno = ENAMETOOLONG;
+		  if (resolved_name == 0)
+		    ACE_OS::free (rpath);
+		  return 0;
+		}
+	      
 	      // Move tail and prefix it with expanded link
 	      ACE_OS::memmove (expand_buf + link_len, file_name, tail_len);
 	      ACE_OS::memcpy (expand_buf, link_buf, link_len);
-
+	      
 	      if (*link_buf == '/') // Absolute link?
-          {
-            dest = rpath;
-          }
+		{
+		  dest = rpath;
+		}
 	      else // Relative link, remove expanded link component
-          {
-            --dest;
-            while (*--dest != '/')
-              ;
-          }
+		{
+		  --dest;
+		  while (*--dest != '/')
+		    ;
+		}
 	      file_name = expand_buf; // Source path is now in expand_buf
 	    }
+	}
     }
-  }
-
+  
   *dest = '\0';
-
+  
   return rpath;
 }
-#endif /* ACE_LACKS_REALPATH && !ACE_HAS_WINCE */
+#endif /* ACE_LACKS_REALPATH */
 
 #if defined (ACE_LACKS_STRTOL)
 long
diff --git a/ace/OS_NS_stdlib.h b/ace/OS_NS_stdlib.h
index 85b4f468e49..161f39ed902 100644
--- a/ace/OS_NS_stdlib.h
+++ b/ace/OS_NS_stdlib.h
@@ -97,13 +97,13 @@ namespace ACE_OS {
                  size_t size,
                  ACE_COMPARE_FUNC);
 
-  extern ACE_Export
+  extern ACE_Export 
   void *calloc (size_t elements, size_t sizeof_elements);
 
-  extern ACE_Export
+  extern ACE_Export 
   void exit (int status = 0);
 
-  extern ACE_Export
+  extern ACE_Export 
   void free (void *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -115,7 +115,7 @@ namespace ACE_OS {
 #   endif /* ACE_HAS_WCHAR && ACE_WIN32 */
 
   // not in spec
-  extern ACE_Export
+  extern ACE_Export 
   ACE_TCHAR *getenvstrings (void);
 
   // itoa not in spec
@@ -131,41 +131,32 @@ namespace ACE_OS {
 
 #if !defined (ACE_HAS_ITOA)
   /// Emulated itoa - Converts an integer to a string.
-  extern ACE_Export
+  extern ACE_Export 
   char *itoa_emulation (int value, char *string, int radix);
 #endif /* !ACE_HAS_ITOA */
 
 #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_ITOW)
   /// Emulated itow - Converts an integer to a string.
-  extern ACE_Export
+  extern ACE_Export 
   wchar_t *itow_emulation (int value, wchar_t *string, int radix);
 #endif /* ACE_HAS_WCHAR && ACE_LACKS_ITOW */
 
-  extern ACE_Export
+  extern ACE_Export 
   void *malloc (size_t);
 
 #if !defined (ACE_LACKS_MKSTEMP)
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_HANDLE mkstemp (char *t);
-
-#  if defined (ACE_HAS_WCHAR)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_HANDLE mkstemp (wchar_t *t);
-#  endif /* ACE_HAS_WCHAR */
+#else
+  extern ACE_Export 
 #endif /* !ACE_LACKS_MKSTEMP */
+  ACE_HANDLE mkstemp (ACE_TCHAR *t);
 
 #if !defined (ACE_LACKS_MKTEMP)
   ACE_NAMESPACE_INLINE_FUNCTION
-  char *mktemp (char *t);
-
-#  if defined (ACE_HAS_WCHAR)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *mktemp (wchar_t *t);
-#  endif /* ACE_HAS_WCHAR */
 #else
-  extern ACE_Export
-  ACE_TCHAR *mktemp (ACE_TCHAR *t);
+  extern ACE_Export 
 #endif /* !ACE_LACKS_MSTEMP */
+  ACE_TCHAR *mktemp (ACE_TCHAR *t);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int putenv (const char *string);
@@ -191,23 +182,16 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   int rand_r (ACE_RANDR_TYPE &seed);
 
-  extern ACE_Export
+  extern ACE_Export 
   void *realloc (void *, size_t);
 
-#if !defined (ACE_HAS_WINCE)
-#  if !defined (ACE_LACKS_REALPATH)
-  ACE_NAMESPACE_INLINE_FUNCTION
-#  else
-  extern ACE_Export
-#  endif /* !ACE_LACKS_REALPATH */
-  char *realpath (const char *file_name, char *resolved_name);
-
-#  if defined (ACE_HAS_WCHAR)
+#if !defined (ACE_LACKS_REALPATH)
   ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *realpath (const wchar_t *file_name, wchar_t *resolved_name);
-#  endif /* ACE_HAS_WCHAR */
-#endif /* ACE_HAS_WINCE */
-
+#else
+  extern ACE_Export 
+#endif /* !ACE_LACKS_REALPATH */
+  ACE_TCHAR *realpath (const ACE_TCHAR *file_name, ACE_TCHAR *resolved_name);
+  
   // exit_hook and set_exit_hook not in spec
   /// Function that is called by <ACE_OS::exit>, if non-null.
   extern ACE_Export ACE_EXIT_HOOK exit_hook_;
@@ -246,7 +230,7 @@ namespace ACE_OS {
 #endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOL */
 
 #if defined (ACE_LACKS_STRTOL)
-  extern ACE_Export
+  extern ACE_Export 
   long strtol_emulation (const char *nptr, char **endptr, int base);
 #endif /* ACE_LACKS_STRTOL */
 
@@ -261,7 +245,7 @@ namespace ACE_OS {
 #endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */
 
 #if defined (ACE_LACKS_STRTOUL)
-  extern ACE_Export
+  extern ACE_Export 
   unsigned long strtoul_emulation (const char *nptr,
                                    char **endptr,
                                    int base);
diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl
index 0f067ccbe5b..b0d115fbc3d 100644
--- a/ace/OS_NS_stdlib.inl
+++ b/ace/OS_NS_stdlib.inl
@@ -1,7 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-#include "ace/config-all.h"           /* Need ACE_TRACE */
 #include "ace/Object_Manager_Base.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Global_Macros.h"
@@ -176,52 +175,24 @@ ACE_OS::itoa (int value, wchar_t *string, int radix)
 
 #if !defined (ACE_LACKS_MKSTEMP)
 ACE_INLINE ACE_HANDLE
-ACE_OS::mkstemp (char *s)
+ACE_OS::mkstemp (ACE_TCHAR *s)
 {
   return ::mkstemp (s);
 }
-
-#  if defined (ACE_HAS_WCHAR)
-ACE_INLINE ACE_HANDLE
-ACE_OS::mkstemp (wchar_t *s)
-{
-  ACE_Wide_To_Ascii narrow_s (s);
-  return ::mkstemp (narrow_s.char_rep ());
-}
-#  endif /* ACE_HAS_WCHAR */
 #endif /* !ACE_LACKS_MKSTEMP */
 
 #if !defined (ACE_LACKS_MKTEMP)
-ACE_INLINE char *
-ACE_OS::mktemp (char *s)
+ACE_INLINE ACE_TCHAR *
+ACE_OS::mktemp (ACE_TCHAR *s)
 {
-# if defined (ACE_WIN32)
+# if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+  return ::_wmktemp (s);
+# elif defined (ACE_WIN32)
   return ::_mktemp (s);
 # else /* ACE_WIN32 */
   return ::mktemp (s);
 # endif /* ACE_WIN32 */
 }
-
-#  if defined (ACE_HAS_WCHAR)
-ACE_INLINE wchar_t *
-ACE_OS::mktemp (wchar_t *s)
-{
-#    if defined (ACE_WIN32)
-  return ::_wmktemp (s);
-#    else
-  // For narrow-char filesystems, we must convert the wide-char input to
-  // a narrow-char string for mktemp(), then convert the name back to
-  // wide-char for the caller.
-  ACE_Wide_To_Ascii narrow_s (s);
-  if (::mktemp (narrow_s.char_rep ()) == 0)
-    return 0;
-  ACE_Ascii_To_Wide wide_s (narrow_s.char_rep ());
-  ACE_OS::strcpy (s, wide_s.wchar_rep ());
-  return s;
-#    endif
-}
-#  endif /* ACE_HAS_WCHAR */
-
 #endif /* !ACE_LACKS_MKTEMP */
 
 #if defined(INTEGRITY)
@@ -333,41 +304,20 @@ ACE_OS::rand_r (ACE_RANDR_TYPE& seed)
 
 #endif /* !ACE_WIN32 */
 
-#if !defined (ACE_HAS_WINCE)
-#  if !defined (ACE_LACKS_REALPATH)
-ACE_INLINE char *
-ACE_OS::realpath (const char *file_name,
-		  char *resolved_name)
+#if !defined (ACE_LACKS_REALPATH)
+ACE_INLINE ACE_TCHAR *
+ACE_OS::realpath (const ACE_TCHAR *file_name,
+		  ACE_TCHAR *resolved_name)
 {
-#    if defined (ACE_WIN32)
+# if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+  return ::_wfullpath (resolved_name, file_name, PATH_MAX);
+# elif defined (ACE_WIN32)
   return ::_fullpath (resolved_name, file_name, PATH_MAX);
-#    else /* ACE_WIN32 */
+# else /* ACE_WIN32 */
   return ::realpath (file_name, resolved_name);
-#    endif /* ! ACE_WIN32 */
+# endif /* ! ACE_WIN32 */
 }
-#  endif /* !ACE_LACKS_REALPATH */
-
-#  if defined (ACE_HAS_WCHAR)
-ACE_INLINE wchar_t *
-ACE_OS::realpath (const wchar_t *file_name,
-		  wchar_t *resolved_name)
-{
-#    if defined (ACE_WIN32)
-  return ::_wfullpath (resolved_name, file_name, PATH_MAX);
-#    else /* ACE_WIN32 */
-  ACE_Wide_To_Ascii n_file_name (file_name);
-  char n_resolved[PATH_MAX];
-  if (0 != ACE_OS::realpath (n_file_name.char_rep (), n_resolved))
-    {
-      ACE_Ascii_To_Wide w_resolved (n_resolved);
-      ACE_OS::strcpy (resolved_name, w_resolved.wchar_rep ());
-      return resolved_name;
-    }
-  return 0;
-#    endif /* ! ACE_WIN32 */
-}
-#  endif /* ACE_HAS_WCHAR */
-#endif /* ACE_HAS_WINCE */
+#endif /* !ACE_LACKS_REALPATH */
 
 ACE_INLINE ACE_EXIT_HOOK
 ACE_OS::set_exit_hook (ACE_EXIT_HOOK exit_hook)
@@ -399,21 +349,11 @@ ACE_OS::strenvdup (const ACE_TCHAR *str)
   ACE_UNUSED_ARG (str);
   ACE_NOTSUP_RETURN (0);
 #else
-  if (str[0] == ACE_LIB_TEXT ('$'))
-    {
-#  if defined (ACE_WIN32)
-      // Always use the ACE_TCHAR for Windows.
-      ACE_TCHAR *temp = 0;
-      if ((temp = ACE_OS::getenv (&str[1])) != 0)
-        return ACE_OS::strdup (temp);
-#  else
-      // Use char * for environment on non-Windows.
-      char *temp = 0;
-      if ((temp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&str[1]))) != 0)
-        return ACE_OS::strdup (ACE_TEXT_CHAR_TO_TCHAR (temp));
-#  endif /* ACE_WIN32 */
-      return ACE_OS::strdup (str);
-    }
+  ACE_TCHAR *temp = 0;
+
+  if (str[0] == ACE_LIB_TEXT ('$')
+      && (temp = ACE_OS::getenv (&str[1])) != 0)
+    return ACE_OS::strdup (temp);
   else
     return ACE_OS::strdup (str);
 #endif /* ACE_HAS_WINCE */
@@ -483,6 +423,6 @@ ACE_OS::system (const ACE_TCHAR *s)
 #elif defined(ACE_TANDEM_T1248_PTHREADS)
   ACE_OSCALL_RETURN (::spt_system (s), int, -1);
 #else
-  ACE_OSCALL_RETURN (::system (ACE_TEXT_ALWAYS_CHAR (s)), int, -1);
+  ACE_OSCALL_RETURN (::system (s), int, -1);
 #endif /* !CHORUS */
 }
diff --git a/ace/OS_NS_string.cpp b/ace/OS_NS_string.cpp
index 02226349e5e..8a98bd5c1d9 100644
--- a/ace/OS_NS_string.cpp
+++ b/ace/OS_NS_string.cpp
@@ -2,12 +2,13 @@
 
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdlib.h"
-#include "ace/ACE.h"
+
 
 ACE_RCSID (ace,
            OS_NS_string,
            "$Id$")
 
+
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_string.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
@@ -152,23 +153,6 @@ ACE_OS::strecpy (wchar_t *s, const wchar_t *t)
 }
 #endif /* ACE_HAS_WCHAR */
 
-char *
-ACE_OS::strerror (int errnum)
-{
-  if (ACE::is_sock_error (errnum))
-    {
-      const ACE_TCHAR *errortext = ACE::sock_error (errnum);
-      static char ret_errortext[128];
-      ACE_OS::strncpy (ret_errortext, ACE_TEXT_ALWAYS_CHAR(errortext), sizeof(ret_errortext));
-      return ret_errortext;
-    }
-#if defined (ACE_LACKS_STRERROR)
-  return ACE_OS::strerror_emulation (errnum);
-#else /* ACE_LACKS_STRERROR */
-  return ::strerror (errnum);
-#endif /* ACE_LACKS_STRERROR */
-}
-
 #if defined (ACE_LACKS_STRERROR)
 /**
  * Just returns "Unknown Error" all the time.
diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h
index 1bcdee2c6a5..0848570ab34 100644
--- a/ace/OS_NS_string.h
+++ b/ace/OS_NS_string.h
@@ -19,7 +19,7 @@
 
 # include /**/ "ace/pre.h"
 
-# include "ace/config-lite.h"
+# include "ace/config-all.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
@@ -183,7 +183,7 @@ namespace ACE_OS {
 #endif /* ACE_HAS_WCHAR */
 
   /// Returns a system error message.
-  extern ACE_Export
+  ACE_NAMESPACE_INLINE_FUNCTION
   char *strerror (int errnum);
 
 #if defined (ACE_LACKS_STRERROR)
@@ -456,13 +456,13 @@ namespace ACE_OS {
   /// Emulated strtok_r.
   extern ACE_Export
   char *strtok_r_emulation (char *s, const char *tokens, char **lasts);
-#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
 
-# if defined (ACE_HAS_WCHAR) && defined(ACE_LACKS_WCSTOK)
+# if defined (ACE_HAS_WCHAR)
   /// Emulated strtok_r (wchar_t version).
   extern ACE_Export
   wchar_t *strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts);
-# endif  // ACE_HAS_WCHAR && ACE_LACKS_WCSTOK
+# endif  // ACE_HAS_WCHAR
+#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
 
 } /* namespace ACE_OS */
 
diff --git a/ace/OS_NS_string.inl b/ace/OS_NS_string.inl
index cb3ee4ec3c6..13168942e68 100644
--- a/ace/OS_NS_string.inl
+++ b/ace/OS_NS_string.inl
@@ -166,6 +166,16 @@ ACE_OS::strcspn (const wchar_t *s, const wchar_t *reject)
 }
 #endif /* ACE_HAS_WCHAR */
 
+ACE_INLINE char *
+ACE_OS::strerror (int errnum)
+{
+#if defined (ACE_LACKS_STRERROR)
+  return ACE_OS::strerror_emulation (errnum);
+#else /* ACE_LACKS_STRERROR */
+  return ::strerror (errnum);
+#endif /* ACE_LACKS_STRERROR */
+}
+
 ACE_INLINE size_t
 ACE_OS::strlen (const char *s)
 {
diff --git a/ace/OS_NS_strings.cpp b/ace/OS_NS_strings.cpp
index 67ca3a809b8..21d57924e0e 100644
--- a/ace/OS_NS_strings.cpp
+++ b/ace/OS_NS_strings.cpp
@@ -21,8 +21,8 @@ ACE_OS::strcasecmp_emulation (const char *s, const char *t)
   const char *scan2 = t;
 
   while (*scan1 != 0
-         && ACE_OS::ace_tolower (*scan1)
-            == ACE_OS::ace_tolower (*scan2))
+         && ACE_OS::to_lower (*scan1)
+            == ACE_OS::to_lower (*scan2))
     {
       ++scan1;
       ++scan2;
@@ -39,7 +39,7 @@ ACE_OS::strcasecmp_emulation (const char *s, const char *t)
   else if (*scan2 == '\0')
     return 1;
   else
-    return ACE_OS::ace_tolower (*scan1) - ACE_OS::ace_tolower (*scan2);
+    return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2);
 }
 #endif /* ACE_LACKS_STRCASECMP */
 
@@ -55,8 +55,8 @@ ACE_OS::strncasecmp_emulation (const char *s,
 
   while (count++ < len
          && *scan1 != 0
-         && ACE_OS::ace_tolower (*scan1)
-            == ACE_OS::ace_tolower (*scan2))
+         && ACE_OS::to_lower (*scan1)
+            == ACE_OS::to_lower (*scan2))
     {
       ++scan1;
       ++scan2;
@@ -76,6 +76,6 @@ ACE_OS::strncasecmp_emulation (const char *s,
   else if (*scan2 == '\0')
     return 1;
   else
-    return ACE_OS::ace_tolower (*scan1) - ACE_OS::ace_tolower (*scan2);
+    return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2);
 }
 #endif /* ACE_LACKS_STRCASECMP */
diff --git a/ace/OS_NS_stropts.cpp b/ace/OS_NS_stropts.cpp
index f8fe0b4ad7a..72696cb7b72 100644
--- a/ace/OS_NS_stropts.cpp
+++ b/ace/OS_NS_stropts.cpp
@@ -46,7 +46,7 @@ ACE_OS::ioctl (ACE_HANDLE socket,
 # endif /* ACE_HAS_WINSOCK2 */
 }
 
-#if !defined (ACE_HAS_WINCE)
+
 int
 ACE_OS::ioctl (ACE_HANDLE socket,
                unsigned long io_control_code,
@@ -190,4 +190,4 @@ ACE_OS::ioctl (ACE_HANDLE socket,
   ACE_NOTSUP_RETURN (-1);
 # endif /* ACE_HAS_WINSOCK2 */
 }
-#endif /* ACE_HAS_WINCE */
+
diff --git a/ace/OS_NS_stropts.h b/ace/OS_NS_stropts.h
index 9b1f6fc2f56..69685193150 100644
--- a/ace/OS_NS_stropts.h
+++ b/ace/OS_NS_stropts.h
@@ -25,10 +25,6 @@
 #  pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-# ifndef ACE_IOCTL_TYPE_ARG2
-# define ACE_IOCTL_TYPE_ARG2 int
-# endif
-
 #include "ace/os_include/os_stropts.h"
 #include "ace/os_include/os_stdio.h"
 #include "ace/ACE_export.h"
@@ -109,9 +105,10 @@ namespace ACE_OS {
   /// UNIX-style <ioctl>.
   ACE_NAMESPACE_INLINE_FUNCTION
   int ioctl (ACE_HANDLE handle,
-             ACE_IOCTL_TYPE_ARG2 cmd,
+             int cmd,
              void * = 0);
 
+#if !defined (ACE_HAS_WINCE)
   /// QoS-enabled <ioctl>.
   extern ACE_Export 
   int ioctl (ACE_HANDLE socket,
@@ -124,7 +121,6 @@ namespace ACE_OS {
              ACE_OVERLAPPED *overlapped,
              ACE_OVERLAPPED_COMPLETION_FUNC func);
 
-#if !defined (ACE_HAS_WINCE)
   /// QoS-enabled <ioctl> when the I/O control code is either
   /// SIO_SET_QOS or SIO_GET_QOS.
   extern ACE_Export 
@@ -136,7 +132,7 @@ namespace ACE_OS {
              unsigned long buffer = 0,
              ACE_OVERLAPPED *overlapped = 0,
              ACE_OVERLAPPED_COMPLETION_FUNC func = 0);
-#endif  /* ACE_HAS_WINCE */
+#endif  // ACE_HAS_WINCE
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int isastream (ACE_HANDLE handle);
diff --git a/ace/OS_NS_stropts.inl b/ace/OS_NS_stropts.inl
index 6b963ec6e63..1e33d9d59d9 100644
--- a/ace/OS_NS_stropts.inl
+++ b/ace/OS_NS_stropts.inl
@@ -103,7 +103,7 @@ ACE_OS::fdetach (const char *file)
 
 ACE_INLINE int
 ACE_OS::ioctl (ACE_HANDLE handle,
-               ACE_IOCTL_TYPE_ARG2 cmd,
+               int cmd,
                void *val)
 {
   ACE_OS_TRACE ("ACE_OS::ioctl");
diff --git a/ace/OS_NS_sys_mman.h b/ace/OS_NS_sys_mman.h
index 1ce8939525f..bf0462afa26 100644
--- a/ace/OS_NS_sys_mman.h
+++ b/ace/OS_NS_sys_mman.h
@@ -27,7 +27,6 @@
 
 #include "ace/Global_Macros.h"
 #include "ace/os_include/sys/os_types.h"
-#include "ace/os_include/sys/os_mman.h"
 #include "ace/ACE_export.h"
 
 #if defined (ACE_EXPORT_MACRO)
diff --git a/ace/OS_NS_sys_mman.inl b/ace/OS_NS_sys_mman.inl
index 9592d4c4dfa..1e3006e259a 100644
--- a/ace/OS_NS_sys_mman.inl
+++ b/ace/OS_NS_sys_mman.inl
@@ -6,6 +6,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_macros.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/os_include/sys/os_mman.h"
 
 #if defined (__Lynx__)
 #  include "ace/OS_NS_sys_stat.h"
@@ -22,7 +23,13 @@ ACE_INLINE int
 ACE_OS::madvise (caddr_t addr, size_t len, int map_advice)
 {
   ACE_OS_TRACE ("ACE_OS::madvise");
-#if !defined (ACE_LACKS_MADVISE)
+#if defined (ACE_WIN32)
+  ACE_UNUSED_ARG (addr);
+  ACE_UNUSED_ARG (len);
+  ACE_UNUSED_ARG (map_advice);
+
+  ACE_NOTSUP_RETURN (-1);
+#elif !defined (ACE_LACKS_MADVISE)
   ACE_OSCALL_RETURN (::madvise (addr, len, map_advice), int, -1);
 #else
   ACE_UNUSED_ARG (addr);
diff --git a/ace/OS_NS_sys_resource.h b/ace/OS_NS_sys_resource.h
index 7486dd2a1c7..7841f7d9c52 100644
--- a/ace/OS_NS_sys_resource.h
+++ b/ace/OS_NS_sys_resource.h
@@ -46,7 +46,7 @@ namespace ACE_OS {
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int setrlimit (int resource,
-                 const struct rlimit *rl);
+                 ACE_SETRLIMIT_TYPE *rl);
 
 } /* namespace ACE_OS */
 
diff --git a/ace/OS_NS_sys_resource.inl b/ace/OS_NS_sys_resource.inl
index ea6fc92849d..fbc5ce8e3a0 100644
--- a/ace/OS_NS_sys_resource.inl
+++ b/ace/OS_NS_sys_resource.inl
@@ -59,7 +59,7 @@ ACE_OS::getrusage (int who, struct rusage *ru)
 }
 
 ACE_INLINE int
-ACE_OS::setrlimit (int resource, const struct rlimit *rl)
+ACE_OS::setrlimit (int resource, ACE_SETRLIMIT_TYPE *rl)
 {
   ACE_OS_TRACE ("ACE_OS::setrlimit");
 
@@ -70,23 +70,10 @@ ACE_OS::setrlimit (int resource, const struct rlimit *rl)
   ACE_NOTSUP_RETURN (-1);
 #else
 # if defined (ACE_HAS_RLIMIT_RESOURCE_ENUM)
-#  if defined (ACE_HAS_NONCONST_SETRLIMIT)
-  ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource,
-                                  const_cast<struct rlimit *>(rl)
-                                  ), int, -1);
+  ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, rl), int, -1);
 # else
-  ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource,
-                                  resource,
-                                  ), int, -1);
-#  endif /* ACE_HAS_NONCONST_SETRLIMIT */				  
-# else /* ACE_HAS_RLIMIT_RESOURCE_ENUM */
-#  if defined (ACE_HAS_NONCONST_SETRLIMIT)
-  ACE_OSCALL_RETURN (::setrlimit (resource, const_cast<struct rlimit *>(rl)
-                                  ), int, -1);
-#  else
   ACE_OSCALL_RETURN (::setrlimit (resource, rl), int, -1);
-#  endif /* ACE_HAS_NONCONST_SETRLIMIT */
-# endif /* ACE_HAS_RLIMIT_RESOURCE_ENUM */  
+# endif /* ACE_HAS_RLIMIT_RESOURCE_ENUM */
 #endif /* ACE_LACKS_RLIMIT */
 }
 
diff --git a/ace/OS_NS_sys_select.inl b/ace/OS_NS_sys_select.inl
index b4b3efa117a..6c9f17d557b 100644
--- a/ace/OS_NS_sys_select.inl
+++ b/ace/OS_NS_sys_select.inl
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 // $Id$
 
-#include "ace/OS_NS_errno.h"
-#include "ace/OS_NS_macros.h"
+#include "ace/os_include/os_errno.h"
 #include "ace/Time_Value.h"
+#include "ace/OS_NS_macros.h"
 
 // It would be really cool to add another version of select that would
 // function like the one we're defending against below!
diff --git a/ace/OS_NS_sys_socket.cpp b/ace/OS_NS_sys_socket.cpp
index 1eb0500ad5f..0cfdbbc19da 100644
--- a/ace/OS_NS_sys_socket.cpp
+++ b/ace/OS_NS_sys_socket.cpp
@@ -59,6 +59,7 @@ ACE_OS::connect (ACE_HANDLE handle,
                           addrlen);
 # endif /* ACE_HAS_WINSOCK2 */
 }
+#endif  // ACE_HAS_WINCE
 
 ACE_HANDLE
 ACE_OS::join_leaf (ACE_HANDLE socket,
@@ -94,7 +95,6 @@ ACE_OS::join_leaf (ACE_HANDLE socket,
   ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE);
 # endif /* ACE_HAS_WINSOCK2 */
 }
-#endif  // ACE_HAS_WINCE
 
 int
 ACE_OS::socket_init (int version_high, int version_low)
diff --git a/ace/OS_NS_sys_socket.inl b/ace/OS_NS_sys_socket.inl
index 3d3f9fbd199..59930fb6319 100644
--- a/ace/OS_NS_sys_socket.inl
+++ b/ace/OS_NS_sys_socket.inl
@@ -531,13 +531,11 @@ ACE_OS::sendmsg (ACE_HANDLE handle,
     }
   else
     return (ssize_t) bytes_sent;
-# elif defined (ACE_HAS_NONCONST_SENDMSG)
-  ACE_SOCKCALL_RETURN (::sendmsg (handle, 
-				  const_cast<struct msghdr *>(msg), 
-				  flags), int, -1);
+# elif defined (ACE_PSOS)
+  ACE_SOCKCALL_RETURN (::sendmsg (handle, (struct msghdr *) msg, flags), int, -1);
 # else
-  ACE_SOCKCALL_RETURN (::sendmsg (handle, msg, flags), int, -1);
-# endif
+  ACE_SOCKCALL_RETURN (::sendmsg (handle, (ACE_SENDMSG_TYPE *) msg, flags), int, -1);
+# endif /* ACE_PSOS */
 #else
   ACE_UNUSED_ARG (flags);
   ACE_UNUSED_ARG (msg);
diff --git a/ace/OS_NS_sys_stat.h b/ace/OS_NS_sys_stat.h
index f954938b816..6f82c1930d7 100644
--- a/ace/OS_NS_sys_stat.h
+++ b/ace/OS_NS_sys_stat.h
@@ -34,7 +34,7 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__) && !defined(__IBMCPP__)
+# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__)
       typedef struct _stat ACE_stat;
 # else
       typedef struct stat ACE_stat;
@@ -63,15 +63,9 @@ namespace ACE_OS {
              ACE_stat *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int lstat (const char *,
+  int lstat (const ACE_TCHAR *,
              ACE_stat *);
 
-#if defined (ACE_HAS_WCHAR)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int lstat (const wchar_t *,
-             ACE_stat *);
-#endif /* ACE_HAS_WCHAR */
-
   ACE_NAMESPACE_INLINE_FUNCTION
   int mkdir (const char *path,
              mode_t mode = ACE_DEFAULT_DIR_PERMS);
diff --git a/ace/OS_NS_sys_stat.inl b/ace/OS_NS_sys_stat.inl
index b96e5e3b1fb..8f17ae48465 100644
--- a/ace/OS_NS_sys_stat.inl
+++ b/ace/OS_NS_sys_stat.inl
@@ -4,7 +4,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_errno.h"
-#include "ace/OS_NS_macros.h"
 
 ACE_INLINE ACE_HANDLE
 ACE_OS::creat (const ACE_TCHAR *filename, mode_t mode)
@@ -25,7 +24,7 @@ ACE_OS::creat (const ACE_TCHAR *filename, mode_t mode)
   ACE_UNUSED_ARG (mode);
   ACE_NOTSUP_RETURN (-1);
 #else
-  ACE_OSCALL_RETURN (::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode),
+  ACE_OSCALL_RETURN (::creat (filename, mode),
                      ACE_HANDLE, ACE_INVALID_HANDLE);
 #endif /* ACE_WIN32 */
 }
@@ -138,7 +137,7 @@ ACE_OS::filesize (const ACE_TCHAR *filename)
 }
 
 ACE_INLINE int
-ACE_OS::lstat (const char *file, ACE_stat *stp)
+ACE_OS::lstat (const ACE_TCHAR *file, ACE_stat *stp)
 {
   ACE_OS_TRACE ("ACE_OS::lstat");
 # if defined (ACE_LACKS_LSTAT)
@@ -152,19 +151,6 @@ ACE_OS::lstat (const char *file, ACE_stat *stp)
 # endif /* ACE_LACKS_LSTAT */
 }
 
-#if defined (ACE_HAS_WCHAR)
-ACE_INLINE int
-ACE_OS::lstat (const wchar_t *file, ACE_stat *stp)
-{
-  ACE_OS_TRACE ("ACE_OS::lstat");
-# if defined (ACE_LACKS_LSTAT)
-  return ACE_OS::stat (file, stp);
-# else
-  return ACE_OS::lstat (ACE_Wide_To_Ascii (file).char_rep (), stp);
-# endif /* ACE_LACKS_LSTAT */
-}
-#endif /* ACE_HAS_WCHAR */
-
 ACE_INLINE int
 ACE_OS::mkdir (const char *path, mode_t mode)
 {
@@ -215,7 +201,7 @@ ACE_OS::mkdir (const char *path, mode_t mode)
   ACE_OSCALL_RETURN (::_mkdir ((char *) path), int, -1);
 #elif defined (ACE_HAS_WINCE)
   ACE_UNUSED_ARG (mode);
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0),
+  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (path, 0),
                                           ace_result_),
                         int, -1);
 #elif defined (ACE_WIN32)
@@ -255,7 +241,7 @@ ACE_OS::mkfifo (const ACE_TCHAR *file, mode_t mode)
   ACE_UNUSED_ARG (mode);
   ACE_NOTSUP_RETURN (-1);
 #else
-  ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_ALWAYS_CHAR (file), mode), int, -1);
+  ACE_OSCALL_RETURN (::mkfifo (file, mode), int, -1);
 #endif /* ACE_LACKS_MKFIFO */
 }
 
@@ -276,7 +262,7 @@ ACE_OS::stat (const char *file, ACE_stat *stp)
 
   HANDLE fhandle;
 
-  fhandle = ::FindFirstFile (ACE_TEXT_CHAR_TO_TCHAR (file), &fdata);
+  fhandle = ::FindFirstFile (file, &fdata);
   if (fhandle == INVALID_HANDLE_VALUE)
     {
       ACE_OS::set_errno_to_last_error ();
@@ -299,11 +285,7 @@ ACE_OS::stat (const char *file, ACE_stat *stp)
    // wrapper for _xstat().
   ACE_OSCALL_RETURN (::_xstat (_STAT_VER, file, stp), int, -1);
 #elif defined (ACE_WIN32)
-# if defined(__IBMCPP__)
-  ACE_OSCALL_RETURN (::_stat (file,  stp), int, -1);
-#else
   ACE_OSCALL_RETURN (::_stat (file, (struct _stat *) stp), int, -1);
-#endif /* __IBMCPP__ */
 #else /* VXWORKS */
   ACE_OSCALL_RETURN (::stat (file, stp), int, -1);
 #endif /* VXWORKS */
diff --git a/ace/OS_NS_sys_uio.cpp b/ace/OS_NS_sys_uio.cpp
index 7c52d91bab7..5936e84eaec 100644
--- a/ace/OS_NS_sys_uio.cpp
+++ b/ace/OS_NS_sys_uio.cpp
@@ -20,7 +20,7 @@ ACE_RCSID(ace, OS_NS_sys_uio, "$Id$")
 
 ssize_t
 ACE_OS::readv_emulation (ACE_HANDLE handle,
-                         const iovec *iov,
+                         ACE_READV_TYPE *iov,
                          int n)
 {
   ACE_OS_TRACE ("ACE_OS::readv_emulation");
@@ -81,7 +81,7 @@ ACE_OS::readv_emulation (ACE_HANDLE handle,
 // thread-safe.
 
 ssize_t
-ACE_OS::writev_emulation (ACE_HANDLE handle, const iovec *iov, int n)
+ACE_OS::writev_emulation (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n)
 {
   ACE_OS_TRACE ("ACE_OS::writev_emulation");
 
diff --git a/ace/OS_NS_sys_uio.h b/ace/OS_NS_sys_uio.h
index 2978b95501f..0450563f5f1 100644
--- a/ace/OS_NS_sys_uio.h
+++ b/ace/OS_NS_sys_uio.h
@@ -37,13 +37,13 @@ namespace ACE_OS {
 
   ACE_NAMESPACE_INLINE_FUNCTION
   ssize_t readv (ACE_HANDLE handle,
-                 const iovec *iov,
+                 iovec *iov,
                  int iovlen);
 
 #if defined (ACE_LACKS_READV)
   extern ACE_Export
   ssize_t readv_emulation (ACE_HANDLE handle,
-                           const iovec *iov,
+                           ACE_READV_TYPE *iov,
                            int iovcnt);
 #endif /* ACE_LACKS_READV */
 
@@ -57,7 +57,7 @@ namespace ACE_OS {
 #if defined (ACE_LACKS_WRITEV)
   extern ACE_Export
   ssize_t writev_emulation (ACE_HANDLE handle,
-                            const iovec *iov,
+                            ACE_WRITEV_TYPE *iov,
                             int iovcnt);
 #endif /* ACE_LACKS_WRITEV */
 
diff --git a/ace/OS_NS_sys_uio.inl b/ace/OS_NS_sys_uio.inl
index c216e9d0a8f..2b944d4684b 100644
--- a/ace/OS_NS_sys_uio.inl
+++ b/ace/OS_NS_sys_uio.inl
@@ -6,7 +6,7 @@
 
 ACE_INLINE ssize_t
 ACE_OS::readv (ACE_HANDLE handle,
-               const iovec *iov,
+               iovec *iov,
                int iovlen)
 {
   ACE_OS_TRACE ("ACE_OS::readv");
@@ -15,15 +15,7 @@ ACE_OS::readv (ACE_HANDLE handle,
                      ssize_t,
                      -1);
 #else /* ACE_LACKS_READV */
-#if defined (ACE_HAS_NONCONST_READV)
-  ACE_OSCALL_RETURN (::readv (handle, 
-                              const_cast<iovec *>(iov), 
-                              iovlen), ssize_t, -1);
-#else
-  ACE_OSCALL_RETURN (::readv (handle, 
-                              iov,
-                              iovlen), ssize_t, -1);
-#endif /* ACE_HAS_NONCONST_READV */
+  ACE_OSCALL_RETURN (::readv (handle, iov, iovlen), ssize_t, -1);
 #endif /* ACE_LACKS_READV */
 }
 
@@ -35,17 +27,11 @@ ACE_OS::writev (ACE_HANDLE handle,
   ACE_OS_TRACE ("ACE_OS::writev");
 #if defined (ACE_LACKS_WRITEV)
   ACE_OSCALL_RETURN (ACE_OS::writev_emulation (handle,
-                                               iov,
+                                               (ACE_WRITEV_TYPE *) iov,
                                                iovcnt), ssize_t, -1);
 #else /* ACE_LACKS_WRITEV */
-#if defined (ACE_HAS_NONCONST_WRITEV)
   ACE_OSCALL_RETURN (::writev (handle,
-                               const_cast<iovec *>(iov),
+                               (ACE_WRITEV_TYPE *) iov,
                                iovcnt), ssize_t, -1);
-#else
-  ACE_OSCALL_RETURN (::writev (handle,
-                               iov,
-                               iovcnt), ssize_t, -1);
-#endif /* ACE_HAS_NONCONST_WRITEV */
 #endif /* ACE_LACKS_WRITEV */
 }
diff --git a/ace/OS_NS_time.cpp b/ace/OS_NS_time.cpp
index cf4fb7076a4..7563d9002ce 100644
--- a/ace/OS_NS_time.cpp
+++ b/ace/OS_NS_time.cpp
@@ -9,34 +9,26 @@ ACE_RCSID(ace, OS_NS_time, "$Id$")
 # include "ace/OS_NS_time.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
-#if defined (ACE_LACKS_NATIVE_STRPTIME)
-# include "ace/os_include/os_ctype.h"
-#endif /* ACE_LACKS_NATIVE_STRPTIME */
-
 #include "ace/OS_NS_Thread.h"
 #include "ace/Object_Manager_Base.h"
 
-#if defined (ACE_HAS_WINCE)
-#  include "ace/OS_NS_stdio.h"     /* Need ACE_OS::sprintf() */
-const wchar_t *ACE_OS::day_of_week_name[7] =
-                                     {ACE_LIB_TEXT ("Sun"),
-                                      ACE_LIB_TEXT ("Mon"),
-                                      ACE_LIB_TEXT ("Tue"),
-                                      ACE_LIB_TEXT ("Wed"),
-                                      ACE_LIB_TEXT ("Thu"),
-                                      ACE_LIB_TEXT ("Fri"),
-                                      ACE_LIB_TEXT ("Sat")};
-
-const wchar_t *ACE_OS::month_name[12] =
-                                {ACE_LIB_TEXT ("Jan"), ACE_LIB_TEXT ("Feb"),
-                                 ACE_LIB_TEXT ("Mar"), ACE_LIB_TEXT ("Apr"),
-                                 ACE_LIB_TEXT ("May"), ACE_LIB_TEXT ("Jun"),
-                                 ACE_LIB_TEXT ("Jul"), ACE_LIB_TEXT ("Aug"),
-                                 ACE_LIB_TEXT ("Sep"), ACE_LIB_TEXT ("Oct"),
-                                 ACE_LIB_TEXT ("Nov"), ACE_LIB_TEXT ("Dec") };
+// hmmm, should this be only for ACE_MT_SAFE? dhinton
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+# if defined (ACE_HAS_WINCE)
+const wchar_t *ACE_OS::day_of_week_name[] = {ACE_LIB_TEXT ("Sun"), ACE_LIB_TEXT ("Mon"),
+                                             ACE_LIB_TEXT ("Tue"), ACE_LIB_TEXT ("Wed"),
+                                             ACE_LIB_TEXT ("Thu"), ACE_LIB_TEXT ("Fri"),
+                                             ACE_LIB_TEXT ("Sat")};
+const wchar_t *ACE_OS::month_name[] = {ACE_LIB_TEXT ("Jan"), ACE_LIB_TEXT ("Feb"),
+                                       ACE_LIB_TEXT ("Mar"), ACE_LIB_TEXT ("Apr"),
+                                       ACE_LIB_TEXT ("May"), ACE_LIB_TEXT ("Jun"),
+                                       ACE_LIB_TEXT ("Jul"), ACE_LIB_TEXT ("Aug"),
+                                       ACE_LIB_TEXT ("Sep"), ACE_LIB_TEXT ("Oct"),
+                                       ACE_LIB_TEXT ("Nov"), ACE_LIB_TEXT ("Dec") };
 
 static const ACE_TCHAR *ACE_OS_CTIME_R_FMTSTR = ACE_LIB_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n");
-#endif /* ACE_HAS_WINCE */
+# endif /* ACE_HAS_WINCE */
+#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
 # if defined (ACE_PSOS)
 
diff --git a/ace/OS_NS_time.h b/ace/OS_NS_time.h
index 8cb05fa4cda..10efa75c8d5 100644
--- a/ace/OS_NS_time.h
+++ b/ace/OS_NS_time.h
@@ -25,7 +25,6 @@
 #  pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/OS_NS_errno.h"
 #include "ace/Basic_Types.h"
 #include "ace/os_include/os_time.h"
 #include "ace/ACE_export.h"
@@ -106,6 +105,10 @@ private:
 #endif /* ACE_PSOS_HAS_TIME */
 
 #if defined (ACE_HAS_WINCE)
+  /// Supporting data for ctime and ctime_r functions on WinCE.
+  const wchar_t *day_of_week_name[7];
+  const wchar_t *month_name[12];
+
 // WinCE doesn't have most of the standard C library time functions. It
 // also doesn't define struct tm. SYSTEMTIME has pretty much the same
 // info though, so we can map it when needed. Define struct tm here and
@@ -134,35 +137,48 @@ struct tm {
  */
 inline long ace_timezone()
 {
-#if defined (ACE_HAS_WINCE)
+#if !defined (VXWORKS) && !defined (ACE_PSOS) && !defined (CHORUS)
+# if defined (ACE_HAS_WINCE)
   TIME_ZONE_INFORMATION tz;
   GetTimeZoneInformation (&tz);
   return tz.Bias * 60;
-#elif defined (ACE_WIN32) && !defined (ACE_HAS_DINKUM_STL)
+# elif defined (ACE_WIN32) && !defined (ACE_HAS_DINKUM_STL)
   return _timezone;  // For Win32.
-#elif defined (ACE_WIN32) && defined (ACE_HAS_DINKUM_STL)
+# elif defined (ACE_WIN32) && defined (ACE_HAS_DINKUM_STL)
   time_t tod = time(0);   // get current time
   time_t t1 = mktime(gmtime(&tod));   // convert without timezone
   time_t t2 = mktime(localtime(&tod));   // convert with timezone
   return difftime(t1, t2); // compute difference in seconds
-#elif defined (ACE_HAS_TIMEZONE)
-  // The XPG/POSIX specification requires that tzset() be called to
-  // set the global variable <timezone>.
-  ::tzset();
-  return timezone;
-#elif defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY)
+# elif defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY) \
+	&& !defined (__linux__)  \
+	&& !defined (__FreeBSD__) \
+	&& !defined (__NetBSD__)
   // The XPG/POSIX specification does not require gettimeofday to
   // set the timezone struct (it leaves the behavior of passing a
-  // non-null struct undefined). 
+  // non-null struct undefined).  We know gettimeofday() on Linux
+  // *BSD systems does not set the timezone, so we avoid using it
+  // and use the global variable <timezone> instead. 
+  //
+  // @note As of this writing, OpenBSD does not provide the global
+  // variable timezone.
+  //
+  // @todo It would be better if we had a feature test macro that
+  // could be used instead of a list of operating systems.
   long result = 0;
   struct timeval time;
   struct timezone zone;
   ACE_UNUSED_ARG (result);
   ACE_OSCALL (::gettimeofday (&time, &zone), int, -1, result);
   return zone.tz_minuteswest * 60;
-#else  
+# else  /* ACE_HAS_TIMEZONE_GETTIMEOFDAY */
+  // The XPG/POSIX specification requires that tzset() be called to
+  // set the global variable <timezone>.
+  ::tzset();
+  return timezone;
+# endif /* ACE_HAS_TIMEZONE_GETTIMEOFDAY */
+#else
   ACE_NOTSUP_RETURN (0);
-#endif
+#endif /* !ACE_HAS_WINCE && !VXWORKS && !ACE_PSOS */
 }
 
 
@@ -214,12 +230,6 @@ typedef ACE_UINT64 ACE_hrtime_t;
 
 namespace ACE_OS {
 
-# if defined (ACE_HAS_WINCE)
-  /// Supporting data for ctime and ctime_r functions on WinCE.
-  const wchar_t *day_of_week_name[];
-  const wchar_t *month_name[];
-# endif /* ACE_HAS_WINCE */
-
 # if defined (CHORUS) && !defined (CHORUS_4)
   // We must format this code as follows to avoid confusing OSE.
   enum ACE_HRTimer_Op
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index ac13858669c..294f802bbfe 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -91,26 +91,10 @@ ACE_OS::ctime (const time_t *t)
   return ACE_OS::ctime_r (t,
                           buf,
                           ctime_buf_size);
-#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+#elif defined (ACE_USES_WCHAR)
   ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0);
 #else
-#  if defined (ACE_USES_WCHAR)   /* Not Win32, else it would do the above */
-  char *narrow_time;
-  ACE_OSCALL (::ctime (t), char *, 0, narrow_time);
-  if (narrow_time == 0)
-    return 0;
-  // ACE_Ascii_To_Wide::convert allocates (via new []) a wchar_t[]. If
-  // we've done this before, free the previous one. Yes, this leaves a
-  // small memory leak (26 characters) but there's no way around this
-  // that I know of. (Steve Huston, 12-Feb-2003).
-  static wchar_t *wide_time = 0;
-  if (wide_time != 0)
-    delete [] wide_time;
-  wide_time = ACE_Ascii_To_Wide::convert (narrow_time);
-  return wide_time;
-#  else
   ACE_OSCALL_RETURN (::ctime (t), char *, 0);
-#  endif /* ACE_USES_WCHAR */
 # endif /* ACE_HAS_BROKEN_CTIME */
 }
 
@@ -121,15 +105,6 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
   ACE_OS_TRACE ("ACE_OS::ctime_r");
 
 #if defined (ACE_HAS_REENTRANT_FUNCTIONS)
-
-  char *bufp = 0;
-#   if defined (ACE_USES_WCHAR)
-  char narrow_buf[ctime_buf_size];
-  bufp = narrow_buf;
-#   else
-  bufp = buf;
-#   endif /* ACE_USES_WCHAR */
-
 #   if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
   if (buflen < ctime_buf_size)
     {
@@ -137,31 +112,20 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
       return 0;
     }
 #      if defined (DIGITAL_UNIX)
-  ACE_OSCALL (::_Pctime_r (t, bufp), ACE_TCHAR *, 0, bufp);
+  ACE_OSCALL_RETURN (::_Pctime_r (t, buf), ACE_TCHAR *, 0);
 #      else /* DIGITAL_UNIX */
-  ACE_OSCALL (::ctime_r (t, bufp), char *, 0, bufp);
+  ACE_OSCALL_RETURN (::ctime_r (t, buf), ACE_TCHAR *, 0);
 #      endif /* DIGITAL_UNIX */
+  return buf;
 #   else /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */
 
 #      if defined (ACE_CTIME_R_RETURNS_INT)
-  bufp = ::ctime_r (t, bufp, buflen) == -1 ? 0 : bufp;
+  return (::ctime_r (t, buf, buflen) == -1 ? 0 : buf);
 #      else /* ACE_CTIME_R_RETURNS_INT */
-  bufp = ::ctime_r (t, bufp, buflen);
+  ACE_OSCALL_RETURN (::ctime_r (t, buf, buflen), ACE_TCHAR *, 0);
 #      endif /* ACE_CTIME_R_RETURNS_INT */
 
 #   endif /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */
-
-  if (bufp == 0)
-    return 0;
-
-#   if defined (ACE_USES_WCHAR)
-  ACE_Ascii_To_Wide wide_buf (bufp);
-  ACE_OS_String::strcpy (buf, wide_buf.wchar_rep ());
-  return buf;
-#   else
-  return bufp;
-#   endif /* ACE_USES_WCHAR */
-
 #else /* ACE_HAS_REENTRANT_FUNCTIONS */
 #   if defined(ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME)
   ACE_OS::strsncpy (buf, "ctime-return", buflen);
diff --git a/ace/OS_NS_unistd.cpp b/ace/OS_NS_unistd.cpp
index 370ff5f4510..c472f5d7cca 100644
--- a/ace/OS_NS_unistd.cpp
+++ b/ace/OS_NS_unistd.cpp
@@ -16,7 +16,14 @@ ACE_RCSID(ace, OS_NS_unistd, "$Id$")
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_Thread.h"
 #include "ace/Object_Manager_Base.h"
-#include "ace/os_include/sys/os_pstat.h"
+
+// This is here for ACE_OS::num_processors_online(). On HP-UX, it
+// needs sys/param.h (above) and sys/pstat.h. The implementation of the
+// num_processors_online() method also uses 'defined (__hpux)' to decide
+// whether or not to try the syscall.
+#if defined (__hpux)
+#  include /**/ <sys/pstat.h>
+#endif /* __hpux **/
 
 #if defined (ACE_NEEDS_FTRUNCATE)
 extern "C" int
@@ -48,30 +55,14 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv,
 
   for (int i = 0; argv[i] != 0; i++)
     {
+      ACE_TCHAR *temp = 0;
+
 #if !defined (ACE_LACKS_ENV)
       // Account for environment variables.
-      if (substitute_env_args && argv[i][0] == ACE_LIB_TEXT ('$'))
-        {
-#  if defined (ACE_WIN32) || !defined (ACE_HAS_WCHAR)
-          ACE_TCHAR *temp = 0;
-          // Win32 is the only platform with a wide-char ACE_OS::getenv().
-          if ((temp = ACE_OS::getenv (&argv[i][1])) != 0)
-            buf_len += ACE_OS::strlen (temp);
-          else
-            buf_len += ACE_OS::strlen (argv[i]);
-#  else
-          // This is an ACE_HAS_WCHAR platform and not ACE_WIN32.
-          // Convert the env variable name for getenv(), then add
-          // the length of the returned char *string. Later, when we
-          // actually use the returned env variable value, convert it
-          // as well.
-          char *ctemp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&argv[i][1]));
-          if (ctemp == 0)
-            buf_len += ACE_OS::strlen (argv[i]);
-          else
-            buf_len += ACE_OS::strlen (ctemp);
-#  endif /* ACE_WIN32 || !ACE_HAS_WCHAR */
-        }
+      if (substitute_env_args
+          && (argv[i][0] == '$'
+              && (temp = ACE_OS::getenv (&argv[i][1])) != 0))
+        buf_len += ACE_OS::strlen (temp);
       else
 #endif /* ACE_LACKS_ENV */
         buf_len += ACE_OS::strlen (argv[i]);
@@ -94,29 +85,14 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv,
 
   for (j = 0; argv[j] != 0; j++)
     {
+      ACE_TCHAR *temp = 0;
 
 #if !defined (ACE_LACKS_ENV)
       // Account for environment variables.
-      if (substitute_env_args && argv[j][0] == ACE_LIB_TEXT ('$'))
-        {
-#  if defined (ACE_WIN32) || !defined (ACE_HAS_WCHAR)
-          // Win32 is the only platform with a wide-char ACE_OS::getenv().
-          ACE_TCHAR *temp = ACE_OS::getenv (&argv[j][1]);
-          if (temp != 0)
-            end = ACE_OS::strecpy (end, temp);
-          else
-            end = ACE_OS::strecpy (end, argv[j]);
-#  else
-          // This is an ACE_HAS_WCHAR platform and not ACE_WIN32.
-          // Convert the env variable name for getenv(), then convert
-          // the returned char *string back to wchar_t.
-          char *ctemp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&argv[j][1]));
-          if (ctemp == 0)
-            end = ACE_OS::strecpy (end, argv[j]);
-          else
-            end = ACE_OS::strecpy (end, ACE_TEXT_CHAR_TO_TCHAR (ctemp));
-#  endif /* ACE_WIN32 || !ACE_HAS_WCHAR */
-        }
+      if (substitute_env_args
+      && (argv[j][0] == '$'
+              && (temp = ACE_OS::getenv (&argv[j][1])) != 0))
+        end = ACE_OS::strecpy (end, temp);
       else
 #endif /* ACE_LACKS_ENV */
         end = ACE_OS::strecpy (end, argv[j]);
@@ -253,13 +229,6 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
 # else
       pid_t result = ACE_OS::fork ();
 
-#   if defined (ACE_USES_WCHAR)
-      // Wide-char builds need to convert the command-line args to
-      // narrow char strings for execv().
-      char **cargv;
-      int arg_count;
-#   endif /* ACE_HAS_WCHAR */
-
       switch (result)
         {
         case -1:
@@ -267,22 +236,6 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
           return -1;
         case 0:
           // Child process.
-#   if defined (ACE_USES_WCHAR)
-          for (arg_count = 0; argv[arg_count] != 0; ++arg_count)
-            ;
-          ++arg_count;    // Need a 0-pointer end-of-array marker
-          ACE_NEW_NORETURN (cargv, char*[arg_count]);
-          if (cargv == 0)
-            ACE_OS::exit (errno);
-          --arg_count;    // Back to 0-indexed
-          cargv[arg_count] = 0;
-          while (--arg_count >= 0)
-            cargv[arg_count] = ACE_Wide_To_Ascii::convert (argv[arg_count]);
-          // Don't worry about freeing the cargv or the strings it points to.
-          // Either the process will be replaced, or we'll exit.
-          if (ACE_OS::execv (cargv[0], cargv) == -1)
-            ACE_OS::exit (errno);
-#   else
           if (ACE_OS::execv (argv[0], argv) == -1)
             {
               // The OS layer should not print stuff out
@@ -292,8 +245,6 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
               // If the execv fails, this child needs to exit.
               ACE_OS::exit (errno);
             }
-#   endif /* ACE_HAS_WCHAR */
-
         default:
           // Server process.  The fork succeeded.
           return result;
@@ -312,7 +263,7 @@ ACE_OS::num_processors (void)
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
   return sys_info.dwNumberOfProcessors;
-#elif defined (linux) || defined (sun) || defined (DIGITAL_UNIX) || defined (CYGWIN32)
+#elif defined (linux) || defined (sun)
   return ::sysconf (_SC_NPROCESSORS_CONF);
 #else
   ACE_NOTSUP_RETURN (-1);
@@ -330,7 +281,7 @@ ACE_OS::num_processors_online (void)
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
   return sys_info.dwNumberOfProcessors;
-#elif defined (linux) || defined (sun) || defined (DIGITAL_UNIX) || defined (CYGWIN32)
+#elif defined (linux) || defined (sun)
   return ::sysconf (_SC_NPROCESSORS_ONLN);
 #elif defined (__hpux)
   struct pst_dynamic psd;
diff --git a/ace/OS_NS_unistd.h b/ace/OS_NS_unistd.h
index bc75ef75be8..54200f5e648 100644
--- a/ace/OS_NS_unistd.h
+++ b/ace/OS_NS_unistd.h
@@ -74,12 +74,7 @@ namespace ACE_OS {
 #endif /* ACE_LACKS_CHDIR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int rmdir (const char *path);
-
-#if defined (ACE_HAS_WCHAR)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int rmdir (const wchar_t *path);
-#endif /* ACE_HAS_WCHAR */
+  int rmdir (const ACE_TCHAR * path);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int close (ACE_HANDLE handle);
@@ -139,12 +134,7 @@ namespace ACE_OS {
                  off_t);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  char *getcwd (char *, size_t);
-
-#if defined (ACE_HAS_WCHAR)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *getcwd (wchar_t *, size_t);
-#endif /* ACE_HAS_WCHAR */
+  ACE_TCHAR *getcwd (ACE_TCHAR *, size_t);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   gid_t getgid (void);
diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl
index 549ea9530e8..c1e2b1535c7 100644
--- a/ace/OS_NS_unistd.inl
+++ b/ace/OS_NS_unistd.inl
@@ -118,8 +118,9 @@ ACE_OS::chdir (const char *path)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::change_dir ((char *) path), result),
                      int, -1);
 
-#elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  ACE_OSCALL_RETURN (::_chdir (const_cast<char *> (path)), int, -1);
+// This #elif seems weird... is Visual Age on NT not setting ACE_WIN32?
+#elif !defined (ACE_WIN32) && !defined (AIX) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
+  ACE_OSCALL_RETURN (::_chdir (path), int, -1);
 
 #elif defined (ACE_HAS_WINCE)
   ACE_UNUSED_ARG (path);
@@ -145,7 +146,7 @@ ACE_OS::chdir (const wchar_t *path)
 #endif /* ACE_LACKS_CHDIR */
 
 ACE_INLINE int
-ACE_OS::rmdir (const char *path)
+ACE_OS::rmdir (const ACE_TCHAR * path)
 {
 #if defined (ACE_PSOS_LACKS_PHILE)
   ACE_UNUSED_ARG (path);
@@ -189,31 +190,16 @@ ACE_OS::rmdir (const char *path)
 #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
   ACE_OSCALL_RETURN (::_rmdir ((char *) path), int, -1);
 #elif defined (ACE_HAS_WINCE)
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR (path)),
+  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (path, NULL),
                                           ace_result_),
                         int, -1);
+#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+  ACE_OSCALL_RETURN (::_wrmdir (path), int, -1);
 #else
   ACE_OSCALL_RETURN (::rmdir (path), int, -1);
 #endif /* ACE_HAS_PACE */
 }
 
-#if defined (ACE_HAS_WCHAR)
-ACE_INLINE int
-ACE_OS::rmdir (const wchar_t *path)
-{
-#if defined (ACE_HAS_WINCE)
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (path),
-                                          ace_result_),
-                        int, -1);
-#elif defined (ACE_WIN32)
-  ACE_OSCALL_RETURN (::_wrmdir (path), int, -1);
-#else
-  ACE_Wide_To_Ascii n_path (path);
-  return ACE_OS::rmdir (n_path.char_rep ());
-#endif /* ACE_HAS_WINCE */
-}
-#endif /* ACE_HAS_WCHAR */
-
 // @todo: which 4 and why???  dhinton
 // NOTE: The following four function definitions must appear before
 // ACE_OS::sema_init ().
@@ -415,8 +401,8 @@ ACE_OS::ftruncate (ACE_HANDLE handle, off_t offset)
 #endif /* ACE_WIN32 */
 }
 
-ACE_INLINE char *
-ACE_OS::getcwd (char *buf, size_t size)
+ACE_INLINE ACE_TCHAR *
+ACE_OS::getcwd (ACE_TCHAR *buf, size_t size)
 {
   ACE_OS_TRACE ("ACE_OS::getcwd");
 #if defined (ACE_PSOS_LACKS_PHILE)
@@ -508,35 +494,16 @@ ACE_OS::getcwd (char *buf, size_t size)
   ACE_UNUSED_ARG (size);
   ACE_NOTSUP_RETURN (0);
 #elif defined (ACE_WIN32)
+#  if defined (ACE_USES_WCHAR)
+  return ::_wgetcwd (buf, static_cast<int> (size));
+#  else
   return ::getcwd (buf, static_cast<int> (size));
+#  endif /* ACE_USES_WCHAR */
 #else
   ACE_OSCALL_RETURN (::getcwd (buf, size), char *, 0);
 #endif /* ACE_PSOS_LACKS_PHILE */
 }
 
-#if defined (ACE_HAS_WCHAR)
-ACE_INLINE wchar_t *
-ACE_OS::getcwd (wchar_t *buf, size_t size)
-{
-#  if defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (buf);
-  ACE_UNUSED_ARG (size);
-  ACE_NOTSUP_RETURN (0);
-#  elif defined (ACE_WIN32)
-  return ::_wgetcwd (buf, ACE_static_cast (int, size));
-#  else
-  char *narrow_buf = new char[size];
-  char *result = 0;
-  result = ACE_OS::getcwd (narrow_buf, size);
-  ACE_Ascii_To_Wide wide_buf (result);
-  delete [] narrow_buf;
-  if (result != 0)
-    ACE_OS::strsncpy (buf, wide_buf.wchar_rep (), size);
-  return result == 0 ? 0 : buf;
-#  endif /* ACE_WIN32 */
-}
-#endif /* ACE_HAS_WCHAR */
-
 ACE_INLINE gid_t
 ACE_OS::getgid (void)
 {
@@ -562,6 +529,8 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
   ACE_UNUSED_ARG (argv);
   ACE_UNUSED_ARG (optstring);
   ACE_NOTSUP_RETURN (-1);
+# elif defined (ACE_LACKS_GETOPT_PROTO)
+  ACE_OSCALL_RETURN (::getopt (argc, (char**) argv, optstring), int, -1);
 # else
   ACE_OSCALL_RETURN (::getopt (argc, argv, optstring), int, -1);
 # endif /* VXWORKS */
@@ -1226,8 +1195,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename,
     }
   /* NOTREACHED */
 #elif !defined (ACE_LACKS_TRUNCATE)
-  ACE_OSCALL_RETURN
-    (::truncate (ACE_TEXT_ALWAYS_CHAR (filename), offset), int, -1);
+  ACE_OSCALL_RETURN (::truncate (filename, offset), int, -1);
 #else
   ACE_UNUSED_ARG (filename);
   ACE_UNUSED_ARG (offset);
@@ -1287,7 +1255,7 @@ ACE_OS::unlink (const char *path)
                      int, -1);
 # elif defined (ACE_HAS_WINCE)
   // @@ The problem is, DeleteFile is not actually equals to unlink. ;(
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_CHAR_TO_TCHAR (path)), ace_result_),
+  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (path), ace_result_),
                         int, -1);
 # elif defined (ACE_LACKS_UNLINK)
   ACE_UNUSED_ARG (path);
diff --git a/ace/OS_NS_wchar.cpp b/ace/OS_NS_wchar.cpp
index 7150d7f3627..03c480e9ea1 100644
--- a/ace/OS_NS_wchar.cpp
+++ b/ace/OS_NS_wchar.cpp
@@ -129,8 +129,8 @@ ACE_OS::wcsicmp_emulation (const wchar_t *s, const wchar_t *t)
   const wchar_t *scan2 = t;
 
   while (*scan1 != 0
-         && ACE_OS::ace_towlower (*scan1)
-            == ACE_OS::ace_towlower (*scan2))
+         && ACE_OS::to_lower (*scan1)
+            == ACE_OS::to_lower (*scan2))
     {
       ++scan1;
       ++scan2;
@@ -147,7 +147,7 @@ ACE_OS::wcsicmp_emulation (const wchar_t *s, const wchar_t *t)
   else if (*scan2 == '\0')
     return 1;
   else
-    return ACE_OS::ace_tolower (*scan1) - ACE_OS::ace_towlower (*scan2);
+    return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2);
 }
 #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSICMP */
 
@@ -253,8 +253,8 @@ ACE_OS::wcsnicmp_emulation (const wchar_t *s,
 
   while (count++ < len
          && *scan1 != 0
-         && ACE_OS::ace_towlower (*scan1)
-            == ACE_OS::ace_towlower (*scan2))
+         && ACE_OS::to_lower (*scan1)
+            == ACE_OS::to_lower (*scan2))
     {
       ++scan1;
       ++scan2;
@@ -274,7 +274,7 @@ ACE_OS::wcsnicmp_emulation (const wchar_t *s,
   else if (*scan2 == '\0')
     return 1;
   else
-    return ACE_OS::ace_towlower (*scan1) - ACE_OS::ace_towlower (*scan2);
+    return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2);
 }
 #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNICMP */
 
diff --git a/ace/OS_main.h b/ace/OS_main.h
index 87e932a4dd9..4a80cb624d7 100644
--- a/ace/OS_main.h
+++ b/ace/OS_main.h
@@ -36,20 +36,7 @@
 # if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
 #   define ACE_TMAIN wmain
 # else
-#   if defined (ACE_USES_WCHAR)    /* Not Win32, but uses wchar */
-      // Replace main() with a version that converts the char** argv to
-      // ACE_TCHAR and calls the ACE_TMAIN entrypoint.
-#     include "ace/Argv_Type_Converter.h"
-#     define ACE_TMAIN \
-        ace_main_i (int, ACE_TCHAR *[]); /* forward declaration */ \
-        int main (int argc, char *argv[]) { \
-          ACE_Argv_Type_Converter wide_argv (argc, argv); \
-          return ace_main_i (argc, wide_argv.get_TCHAR_argv ()); \
-        } \
-        int ace_main_i
-#   else
-#     define ACE_TMAIN main
-#   endif /* ACE_USES_WCHAR */
+#   define ACE_TMAIN main
 # endif
 
 # if defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index c911792a188..a1dcfdb729b 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -16,7 +16,6 @@
 #include "ace/Signal.h"
 #include "ace/Framework_Component.h"
 #include "ace/Atomic_Op.h"
-#include "ace/OS_NS_sys_time.h"
 
 #if !defined (__ACE_INLINE__)
 # include "ace/Object_Manager.inl"
@@ -604,7 +603,7 @@ ACE_Object_Manager::fini (void)
   // No mutex here.  Only the main thread should destroy the singleton
   // ACE_Object_Manager instance.
 
-  // Indicate that this ACE_Object_Manager instance is being
+  // First, indicate that this ACE_Object_Manager instance is being
   // shut down.
   object_manager_state_ = OBJ_MAN_SHUTTING_DOWN;
 
diff --git a/ace/Object_Manager_Base.cpp b/ace/Object_Manager_Base.cpp
index 6a2b512ef67..32d2e1f5482 100644
--- a/ace/Object_Manager_Base.cpp
+++ b/ace/Object_Manager_Base.cpp
@@ -408,7 +408,7 @@ ACE_OS_Object_Manager::print_error_message (u_int line_number,
 #if !defined (ACE_HAS_WINCE)
   fprintf (stderr, "ace/OS.cpp, line %u: %s ",
            line_number,
-           ACE_TEXT_ALWAYS_CHAR (message));
+           message);
   perror ("failed");
 #else
   // @@ Need to use the following information.
diff --git a/ace/Object_Manager_Base.h b/ace/Object_Manager_Base.h
index dc09e8daeb5..5619b3af323 100644
--- a/ace/Object_Manager_Base.h
+++ b/ace/Object_Manager_Base.h
@@ -18,7 +18,7 @@
 #define ACE_OBJECT_MANAGER_BASE_H
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp
index 10558ce4fa7..d601ed0763e 100644
--- a/ace/POSIX_Asynch_IO.cpp
+++ b/ace/POSIX_Asynch_IO.cpp
@@ -421,7 +421,7 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
      bytes_to_write = len;
 
   if (bytes_to_write == 0)
-    ACE_ERROR_RETURN
+    ACE_ERROR_RETURN 
       ((LM_ERROR,
         ACE_LIB_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:")
         ACE_LIB_TEXT ("Attempt to write 0 bytes\n")),
@@ -536,7 +536,7 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block,
      bytes_to_read=space;
 
   if ( bytes_to_read == 0 )
-    ACE_ERROR_RETURN
+    ACE_ERROR_RETURN 
       ((LM_ERROR,
         ACE_LIB_TEXT ("ACE_POSIX_Asynch_Read_File::read:")
         ACE_LIB_TEXT ("Attempt to read 0 bytes or no space in the message block\n")),
@@ -667,7 +667,7 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block,
      bytes_to_write = len;
 
   if (bytes_to_write == 0)
-    ACE_ERROR_RETURN
+    ACE_ERROR_RETURN 
       ((LM_ERROR,
         ACE_LIB_TEXT ("ACE_POSIX_Asynch_Write_File::write:")
         ACE_LIB_TEXT ("Attempt to write 0 bytes\n")),
@@ -1529,14 +1529,14 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result,
     }
 
   // set non blocking mode
-  if (ACE::set_flags (handle, ACE_NONBLOCK) != 0)
+  if (ACE_Flag_Manip::set_flags (handle, ACE_NONBLOCK) != 0)
     {
       result->set_error (errno);
 
       ACE_ERROR_RETURN
         ((LM_ERROR,
           ACE_LIB_TEXT("ACE_POSIX_Asynch_Connect::connect_i, %p\n")
-          ACE_LIB_TEXT("ACE::set_flags failed")),
+          ACE_LIB_TEXT("ACE_Flag_Manip::set_flags failed")),
          -1);
     }
 
@@ -2512,15 +2512,15 @@ ACE_POSIX_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
   ACE_POSIX_Proactor *proactor = this->posix_proactor ();
   ACE_NEW_RETURN (result,
                   ACE_POSIX_Asynch_Read_Dgram_Result (*this->handler_,
-                                                      this->handle_,
-                                                      message_block,
-                                                      space,
-                                                      flags,
-                                                      protocol_family,
-                                                      act,
-                                                      proactor->get_handle (),
-                                                      priority,
-                                                      signal_number),
+						      this->handle_,
+						      message_block,
+						      space,
+						      flags,
+						      protocol_family,
+						      act,
+						      proactor->get_handle (),
+						      priority,
+						      signal_number),
                   -1);
 
   int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::READ);
@@ -2554,7 +2554,7 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
 {
   size_t len = message_block->length ();
   if (len == 0)
-    ACE_ERROR_RETURN
+    ACE_ERROR_RETURN 
       ((LM_ERROR,
         ACE_LIB_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:")
         ACE_LIB_TEXT ("Attempt to write 0 bytes\n")),
@@ -2564,14 +2564,14 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
   ACE_POSIX_Proactor *proactor = this->posix_proactor ();
   ACE_NEW_RETURN (result,
                   ACE_POSIX_Asynch_Write_Dgram_Result (*this->handler_,
-                                                       this->handle_,
-                                                       message_block,
-                                                       len,
-                                                       flags,
-                                                       act,
-                                                       proactor->get_handle (),
-                                                       priority,
-                                                       signal_number),
+						       this->handle_,
+						       message_block,
+						       len,
+						       flags,
+						       act,
+						       proactor->get_handle (),
+						       priority,
+						       signal_number),
                   -1);
 
   int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::WRITE);
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index 2c31ead9383..72004069c8e 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -57,11 +57,11 @@ public:
 
 // *********************************************************************
 ACE_POSIX_Proactor::ACE_POSIX_Proactor (void)
-  :  os_id_ (ACE_OS_UNDEFINED)
+  :  os_id_ (OS_UNDEFINED)
 {
 #if defined(sun)
 
-  os_id_ = ACE_OS_SUN; // set family
+  os_id_ = OS_SUN; // set family
 
   char Buf [32];
 
@@ -70,23 +70,23 @@ ACE_POSIX_Proactor::ACE_POSIX_Proactor (void)
   ACE_OS::sysinfo (SI_RELEASE , Buf, sizeof(Buf)-1);
 
   if (ACE_OS::strcasecmp (Buf , "5.6") == 0)
-    os_id_ = ACE_OS_SUN_56;
+    os_id_ = OS_SUN_56;
   else if (ACE_OS::strcasecmp (Buf , "5.7") == 0)
-    os_id_ = ACE_OS_SUN_57;
+    os_id_ = OS_SUN_57;
   else if (ACE_OS::strcasecmp (Buf , "5.8") == 0)
-    os_id_ = ACE_OS_SUN_58;
+    os_id_ = OS_SUN_58;
 
 #elif defined(HPUX)
 
-  os_id_ = ACE_OS_HPUX;   // set family
+  os_id_ = OS_HPUX;   // set family
 
 #elif defined(__sgi)
 
-  os_id_ = ACE_OS_IRIX;   // set family
+  os_id_ = OS_IRIX;   // set family
 
 #elif defined(__OpenBSD)
 
-  os_id_ = ACE_OS_OPENBSD; // set family
+  os_id_ = OS_OPENBSD; // set family
 
   // do the same
 
@@ -650,7 +650,7 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr
   this->pipe_.open ();
 
   // Set write side in NONBLOCK mode
-  ACE::set_flags (this->pipe_.write_handle (), ACE_NONBLOCK);
+  ACE_Flag_Manip::set_flags (this->pipe_.write_handle (), ACE_NONBLOCK);
 
   // Let AIOCB_Proactor know about our handle
   posix_aiocb_proactor_->set_notify_handle (this->pipe_.read_handle ());
@@ -1878,7 +1878,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout)
   int error_status = 0;
   size_t transfer_count = 0;
 
-  if (sig_info.si_code == SI_ASYNCIO || this->os_id_ == ACE_OS_SUN_56)
+  if (sig_info.si_code == SI_ASYNCIO || this->os_id_ == OS_SUN_56)
     {
       flg_aio = 1;  // AIO signal received
       // define index to start
@@ -1892,7 +1892,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout)
       // there is one I/O to process, and it's correctly specified in the
       // siginfo received. There are, however, some special situations
       // where this isn't true...
-      if (os_id_ == ACE_OS_SUN_56) // Solaris 6
+      if (os_id_ == OS_SUN_56) // Solaris 6
         {
           // 1. Solaris 6 always loses any RT signal,
           //    if it has more SIGQUEMAX=32 pending signals
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index e8e0897e3d4..a86c5be69cb 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -47,8 +47,8 @@
  * AIOCBs are stored and completion status of the corresponding
  * operations are queried on them. The other one is based on
  * POSIX Real Time signals. This class abstracts out the common
- * code needed for both the strategies. <ACE_POSIX_AIOCB_Proactor> and
- * <ACE_POSIX_SIG_Proactor> specialize this class for each strategy.
+ * code needed for both the strategies. <ACE_AIOCB_Proactor> and
+ * <ACE_SIG_Proactor> specialize this class for each strategy.
  */
 class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl
 {
@@ -74,21 +74,21 @@ public:
 
   enum SystemType  // open for future extention
   {
-    ACE_OS_UNDEFINED= 0x0000,
-    ACE_OS_WIN      = 0x0100,          // for future
-    ACE_OS_WIN_NT   = ACE_OS_WIN | 0x0001,
-    ACE_OS_WIN_2000 = ACE_OS_WIN | 0x0002,
-    ACE_OS_SUN      = 0x0200,          // Sun Solaris family
-    ACE_OS_SUN_55   = ACE_OS_SUN | 0x0001,
-    ACE_OS_SUN_56   = ACE_OS_SUN | 0x0002,
-    ACE_OS_SUN_57   = ACE_OS_SUN | 0x0004,
-    ACE_OS_SUN_58   = ACE_OS_SUN | 0x0008,
-    ACE_OS_HPUX     = 0x0400,          // HPUX family
-    ACE_OS_HPUX_11  = ACE_OS_HPUX | 0x0001,
-    ACE_OS_LINUX    = 0x0800,          // Linux family
-    ACE_OS_FREEBSD  = 0x1000,          // FreeBSD family
-    ACE_OS_IRIX     = 0x2000,          // SGI IRIX family
-    ACE_OS_OPENBSD  = 0x4000           // OpenBSD familty
+    OS_UNDEFINED= 0x0000,
+    OS_WIN      = 0x0100,          // for future
+    OS_WIN_NT   = OS_WIN | 0x0001,
+    OS_WIN_2000 = OS_WIN | 0x0002,
+    OS_SUN      = 0x0200,          // Sun Solaris family
+    OS_SUN_55   = OS_SUN | 0x0001,
+    OS_SUN_56   = OS_SUN | 0x0002,
+    OS_SUN_57   = OS_SUN | 0x0004,
+    OS_SUN_58   = OS_SUN | 0x0008,
+    OS_HPUX     = 0x0400,          // HPUX family
+    OS_HPUX_11  = OS_HPUX | 0x0001,
+    OS_LINUX    = 0x0800,          // Linux family
+    OS_FREEBSD  = 0x1000,          // FreeBSD family
+    OS_IRIX     = 0x2000,          // SGI IRIX family
+    OS_OPENBSD  = 0x4000           // OpenBSD familty
   };
 
   enum Opcode {
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index 50ad4221b79..7f0ef736814 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -6,12 +6,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_socket.h"
 
-#if defined (ACE_HAS_STREAM_PIPES) || defined (__QNX__)
-#  include "ace/OS_NS_unistd.h"
-#endif  // ACE_HAS_STREAM_PIPES || __QNX__
-
-#include "ace/os_include/netinet/os_tcp.h"
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Pipe.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Priority_Reactor.cpp b/ace/Priority_Reactor.cpp
index 8a996fdf79e..e52aabd626f 100644
--- a/ace/Priority_Reactor.cpp
+++ b/ace/Priority_Reactor.cpp
@@ -17,7 +17,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Priority_Reactor)
 // Initialize ACE_Select_Reactor.
 
 #define npriorities \
-        ACE_Event_Handler::HI_PRIORITY-ACE_Event_Handler::LO_PRIORITY+1
+	ACE_Event_Handler::HI_PRIORITY-ACE_Event_Handler::LO_PRIORITY+1
 
 void
 ACE_Priority_Reactor::init_bucket (void)
@@ -71,11 +71,24 @@ ACE_Priority_Reactor::~ACE_Priority_Reactor (void)
   delete tuple_allocator_;
 }
 
-void
-ACE_Priority_Reactor::build_bucket (ACE_Handle_Set &dispatch_mask,
-                                    int &min_priority,
-                                    int &max_priority)
+int
+ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles,
+                                       int& number_dispatched,
+                                       int mask,
+                                       ACE_Handle_Set& dispatch_mask,
+                                       ACE_Handle_Set& ready_mask,
+                                       ACE_EH_PTMF callback)
 {
+  ACE_TRACE ("ACE_Priority_Reactor::dispatch_io_set");
+
+  if (number_of_active_handles == 0)
+    return 0;
+
+  // The range for which there exists any Event_Tuple is computed on
+  // the ordering loop, minimizing iterations on the dispatching loop.
+  int min_priority = ACE_Event_Handler::HI_PRIORITY;
+  int max_priority = ACE_Event_Handler::LO_PRIORITY;
+
   ACE_Handle_Set_Iterator handle_iter (dispatch_mask);
 
   for (ACE_HANDLE handle;
@@ -100,66 +113,30 @@ ACE_Priority_Reactor::build_bucket (ACE_Handle_Set &dispatch_mask,
         max_priority = prio;
     }
 
-}
-
-int
-ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles,
-                                       int& number_dispatched,
-                                       int mask,
-                                       ACE_Handle_Set& dispatch_mask,
-                                       ACE_Handle_Set& ready_mask,
-                                       ACE_EH_PTMF callback)
-{
-  ACE_TRACE ("ACE_Priority_Reactor::dispatch_io_set");
-
-  if (number_of_active_handles == 0)
-    return 0;
-
-  // The range for which there exists any Event_Tuple is computed on
-  // the ordering loop, minimizing iterations on the dispatching loop.
-  int min_priority =
-    ACE_Event_Handler::HI_PRIORITY;
-  int max_priority =
-    ACE_Event_Handler::LO_PRIORITY;
-
-  (void) this->build_bucket (dispatch_mask,
-                             min_priority,
-                             max_priority);
-
   for (int i = max_priority; i >= min_priority; --i)
     {
+      // Remove all the entries from the wrappers
       while (!bucket_[i]->is_empty ()
-             && number_dispatched < number_of_active_handles)
+             && number_dispatched < number_of_active_handles
+             && this->state_changed_ == 0)
         {
-
           ACE_Event_Tuple et;
-
           bucket_[i]->dequeue_head (et);
-
           this->notify_handle (et.handle_,
                                mask,
                                ready_mask,
                                et.event_handler_,
                                callback);
           number_dispatched++;
-
-          // clear the bit from that dispatch mask,
-          // so when we need to restart the iteration (rebuilding the iterator...)
-          // we will not dispatch the already dipatched handlers
-          this->clear_dispatch_mask (et.handle_,
-                                     mask);
-
-          if (this->state_changed_)
-            {
-              this->state_changed_ = false; // so it will not rebuild it ...
-            }
         }
-
       // Even if we are aborting the loop due to this->state_changed
       // or another error we still want to cleanup the buckets.
       bucket_[i]->reset ();
     }
 
+  if (number_dispatched > 0 && this->state_changed_)
+    return -1;
+
   return 0;
 }
 
diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h
index e9f2809d583..9a10b354138 100644
--- a/ace/Priority_Reactor.h
+++ b/ace/Priority_Reactor.h
@@ -71,11 +71,6 @@ private:
   /// A small helper to initialize the bucket.
   void init_bucket (void);
 
-  /// Build the bucket from the given dispatch_mask
-  void build_bucket (ACE_Handle_Set& dispatch_mask,
-                     int &min_priority,
-                     int &max_priority);
-
   /// There is a queue per-priority, which simply holds the
   /// Event_Handlers until we know who goes first.
   typedef ACE_Unbounded_Queue<ACE_Event_Tuple> QUEUE;
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 65f426a9f2b..942cae1f2fc 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/config-lite.h"
 #include "ace/Proactor.h"
 #if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
 
@@ -1191,9 +1190,10 @@ ACE_Proactor::run_event_loop (void)
 }
 
 int
-ACE_Proactor::run_event_loop (ACE_Time_Value &)
+ACE_Proactor::run_event_loop (ACE_Time_Value &tv)
 {
   // not implemented
+  ACE_UNUSED_ARG (tv);
   return -1;
 }
 
diff --git a/ace/Process.cpp b/ace/Process.cpp
index bfecc19732c..e7c784a6c6b 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -22,7 +22,7 @@ ACE_RCSID (ace, Process, "$Id$")
 // This function acts as a signal handler for SIGCHLD. We don't really want
 // to do anything with the signal - it's just needed to interrupt a sleep.
 // See wait() for more info.
-#if !defined (ACE_WIN32) && !defined(ACE_LACKS_UNIX_SIGNALS)
+#if !defined (ACE_WIN32)
 static void
 sigchld_nop (int, siginfo_t *, ucontext_t *)
 {
@@ -198,66 +198,6 @@ ACE_Process::spawn (ACE_Process_Options &options)
     }
 
   return this->child_id_;
-#elif defined(ACE_OPENVMS)
-  if (ACE_BIT_ENABLED (options.creation_flags (),
-                       ACE_Process_Options::NO_EXEC))
-    ACE_NOTSUP_RETURN (ACE_INVALID_PID);
-
-  int saved_stdin = ACE_STDIN;
-  int saved_stdout = ACE_STDOUT;
-  int saved_stderr = ACE_STDERR;
-  // Save STD file descriptors and redirect
-  if (options.get_stdin () != ACE_INVALID_HANDLE) {
-    if ((saved_stdin = ACE_OS::dup (ACE_STDIN)) == -1 && errno != EBADF)
-      ACE_OS::exit (errno);
-    if (ACE_OS::dup2 (options.get_stdin (), ACE_STDIN) == -1)
-      ACE_OS::exit (errno);
-  }
-  if (options.get_stdout () != ACE_INVALID_HANDLE) {
-    if ((saved_stdout = ACE_OS::dup (ACE_STDOUT)) == -1 && errno != EBADF)
-      ACE_OS::exit (errno);
-    if (ACE_OS::dup2 (options.get_stdout (), ACE_STDOUT) == -1)
-      ACE_OS::exit (errno);
-  }
-  if (options.get_stderr () != ACE_INVALID_HANDLE) {
-    if ((saved_stderr = ACE_OS::dup (ACE_STDERR)) == -1 && errno != EBADF)
-      ACE_OS::exit (errno);
-    if (ACE_OS::dup2 (options.get_stderr (), ACE_STDERR) == -1)
-      ACE_OS::exit (errno);
-  }
-
-  if (options.working_directory () != 0)
-    ACE_NOTSUP_RETURN (ACE_INVALID_PID);
-
-  this->child_id_ = vfork();
-  if (this->child_id_ == 0) {
-      ACE_OS::execvp (options.process_name (),
-                options.command_line_argv ());
-      // something went wrong
-      this->child_id_ = ACE_INVALID_PID;
-  }
-
-  // restore STD file descriptors (if necessary)
-  if (options.get_stdin () != ACE_INVALID_HANDLE) {
-    if (saved_stdin == -1)
-      ACE_OS::close (ACE_STDIN);
-    else
-      ACE_OS::dup2 (saved_stdin, ACE_STDIN);
-  }
-  if (options.get_stdout () != ACE_INVALID_HANDLE) {
-    if (saved_stdout == -1)
-      ACE_OS::close (ACE_STDOUT);
-    else
-      ACE_OS::dup2 (saved_stdout, ACE_STDOUT);
-  }
-  if (options.get_stderr () != ACE_INVALID_HANDLE) {
-    if (saved_stderr == -1)
-      ACE_OS::close (ACE_STDERR);
-    else
-      ACE_OS::dup2 (saved_stderr, ACE_STDERR);
-  }
-
-  return this->child_id_;
 #else /* ACE_WIN32 */
   // Fork the new process.
   this->child_id_ = ACE::fork (options.process_name (),
@@ -344,56 +284,31 @@ ACE_Process::spawn (ACE_Process_Options &options)
         // Child process executes the command.
         int result = 0;
 
-        // Wide-char builds not on Windows need narrow-char strings for
-        // exec() and environment variables. Don't need to worry about
-        // releasing any of the converted string memory since this
-        // process will either exec() or exit() shortly.
-# if defined (ACE_USES_WCHAR)
-        ACE_Wide_To_Ascii n_procname (options.process_name ());
-        const char *procname = n_procname.char_rep ();
-
-        wchar_t * const *wargv = options.command_line_argv ();
-        size_t vcount, i;
-        for (vcount = 0; wargv[vcount] != 0; ++vcount)
-          ;
-        char **procargv = new char *[vcount + 1];  // Need 0 at the end
-        procargv[vcount] = 0;
-        for (i = 0; i < vcount; ++i)
-          procargv[i] = ACE_Wide_To_Ascii::convert (wargv[i]);
-
-        wargv = options.env_argv ();
-        for (vcount = 0; wargv[vcount] != 0; ++vcount)
-          ;
-        char **procenv = new char *[vcount + 1];  // Need 0 at the end
-        procenv[vcount] = 0;
-        for (i = 0; i < vcount; ++i)
-          procenv[i] = ACE_Wide_To_Ascii::convert (wargv[i]);
-# else
-        const char *procname = options.process_name ();
-        char *const *procargv = options.command_line_argv ();
-        char *const *procenv = options.env_argv ();
-# endif /* ACE_USES_WCHAR */
-
         if (options.inherit_environment ())
           {
             // Add the new environment variables to the environment
             // context of the context before doing an <execvp>.
-            for (size_t i = 0; procenv[i] != 0; i++)
-              if (ACE_OS::putenv (procenv[i]) != 0)
+            for (char *const *user_env = options.env_argv ();
+                 *user_env != 0;
+                 user_env++)
+              if (ACE_OS::putenv (*user_env) != 0)
                 return ACE_INVALID_PID;
 
             // Now the forked process has both inherited variables and
             // the user's supplied variables.
-            result = ACE_OS::execvp (procname, procargv);
+            result = ACE_OS::execvp (options.process_name (),
+                                     options.command_line_argv ());
           }
         else
           {
-# if defined (ghs)
+#if defined (ghs)
             // GreenHills 1.8.8 (for VxWorks 5.3.x) can't compile this
             // code.  Processes aren't supported on VxWorks anyways.
             ACE_NOTSUP_RETURN (ACE_INVALID_PID);
-# else
-            result = ACE_OS::execve (procname, procargv, procenv);
+#else
+            result = ACE_OS::execve (options.process_name (),
+                                     options.command_line_argv (),
+                                     options.env_argv ());
 # endif /* ghs */
           }
         if (result == -1)
@@ -473,45 +388,7 @@ ACE_Process::wait (const ACE_Time_Value &tv,
       ACE_OS::set_errno_to_last_error ();
       return -1;
     }
-#elif defined(ACE_LACKS_UNIX_SIGNALS)
-  if (tv == ACE_Time_Value::zero)
-    {
-      pid_t retv =
-        ACE_OS::waitpid (this->child_id_,
-                         &this->exit_code_,
-                         WNOHANG);
-      if (status != 0)
-        *status = this->exit_code_;
-
-      return retv;
-    }
-
-  if (tv == ACE_Time_Value::max_time)
-    return this->wait (status);
-
-  pid_t pid = 0;
-  ACE_Time_Value sleeptm (1);    // 1 msec
-  if (sleeptm > tv)              // if sleeptime > waittime
-      sleeptm = tv;
-  ACE_Time_Value tmo (tv);       // Need one we can change
-  for (ACE_Countdown_Time time_left (&tmo); tmo > ACE_Time_Value::zero ; time_left.update ())
-    {
-      pid = ACE_OS::waitpid (this->getpid (),
-                             &this->exit_code_,
-                             WNOHANG);
-      if (status != 0)
-        *status = this->exit_code_;
-
-      if (pid > 0 || pid == ACE_INVALID_PID)
-        break;          // Got a child or an error - all done
-
-      // pid 0, nothing is ready yet, so wait.
-      // Do a (very) short sleep (only this thread sleeps).
-      ACE_OS::sleep (sleeptm);
-    }
-
-  return pid;
-#else /* !ACE_WIN32 && !ACE_LACKS_UNIX_SIGNALS */
+#else /* ACE_WIN32 */
   if (tv == ACE_Time_Value::zero)
     {
       pid_t retv =
diff --git a/ace/Process.inl b/ace/Process.inl
index 7b561b5c59d..cf0c17b6f60 100644
--- a/ace/Process.inl
+++ b/ace/Process.inl
@@ -247,7 +247,7 @@ ACE_INLINE int
 ACE_Process_Options::setreugid (const ACE_TCHAR* user)
 {
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
-  struct passwd *ent = ACE_OS::getpwnam (ACE_TEXT_ALWAYS_CHAR (user));
+  struct passwd *ent = ACE_OS::getpwnam (user);
 
   if (ent != 0)
     {
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index 4aa30ef5c5d..c51ec494015 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -40,7 +40,7 @@ ACE_Process_Manager::cleanup (void *, void *)
 // This function acts as a signal handler for SIGCHLD. We don't really want
 // to do anything with the signal - it's just needed to interrupt a sleep.
 // See wait() for more info.
-#if !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SIGNALS)
+#if !defined (ACE_WIN32)
 static void
 sigchld_nop (int, siginfo_t *, ucontext_t *)
 {
@@ -190,9 +190,6 @@ ACE_Process_Manager::resize (size_t size)
 {
   ACE_TRACE ("ACE_Process_Manager::resize");
 
-  if (size <= this->max_process_table_size_)
-    return 0;
-
   ACE_Process_Descriptor *temp;
 
   ACE_NEW_RETURN (temp,
@@ -224,7 +221,7 @@ ACE_Process_Manager::open (size_t size,
   if (r)
     {
       this->reactor (r);
-#if !defined (ACE_WIN32) && !defined (ACE_PSOS) && !defined (ACE_LACKS_UNIX_SIGNALS)
+#if !defined (ACE_WIN32) && !defined (ACE_PSOS)
       // Register signal handler object.
       if (r->register_handler (SIGCHLD, this) == -1)
         return -1;
@@ -267,7 +264,7 @@ ACE_Process_Manager::close (void)
 {
   ACE_TRACE ("ACE_Process_Manager::close");
 
-#if !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SIGNALS)
+#if !defined (ACE_WIN32)
   if (this->reactor ())
     {
       this->reactor ()->remove_handler (SIGCHLD, (ACE_Sig_Action *) 0);
@@ -379,7 +376,9 @@ ACE_Process_Manager::handle_signal (int,
     }
 #else /* !ACE_WIN32 */
   ACE_UNUSED_ARG (si);
-  return reactor ()->notify (this, ACE_Event_Handler::READ_MASK);
+  return reactor ()->notify
+    (this,
+     ACE_Event_Handler::READ_MASK);
 #endif /* !ACE_WIN32 */
 }
 
@@ -441,7 +440,8 @@ ACE_Process_Manager::spawn (ACE_Process *process,
   pid_t pid = process->spawn (options);
 
   // Only include the pid in the parent's table.
-  if (pid == ACE_INVALID_PID || pid == 0)
+  if (pid == ACE_INVALID_PID
+      || pid == 0)
     return pid;
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
@@ -492,35 +492,33 @@ ACE_Process_Manager::append_proc (ACE_Process *proc)
 {
   ACE_TRACE ("ACE_Process_Manager::append_proc");
 
-  // Try to resize the array to twice its existing size (or the DEFAULT_SIZE,
-  // if there are no array entries) if we run out of space...
-  if (this->current_count_ >= this->max_process_table_size_)
+  // Try to resize the array to twice its existing size if we run out
+  // of space...
+  if (this->current_count_ >= this->max_process_table_size_
+      && this->resize (this->max_process_table_size_ * 2) == -1)
+    return -1;
+  else
     {
-      size_t new_size = this->max_process_table_size_ * 2;
-      if (new_size == 0)
-        new_size = ACE_Process_Manager::DEFAULT_SIZE;
-      if (this->resize (new_size) == -1)
-        return -1;
-    }
-
-  ACE_Process_Descriptor &proc_desc =
-    this->process_table_[this->current_count_];
+      ACE_Process_Descriptor &proc_desc =
+        this->process_table_[this->current_count_];
 
-  proc_desc.process_ = proc;
-  proc_desc.exit_notify_ = 0;
+      proc_desc.process_ = proc;
+      proc_desc.exit_notify_ = 0;
 
 #if defined (ACE_WIN32)
-  // If we have a Reactor, then we're supposed to reap Processes
-  // automagically.  Get a handle to this new Process and tell the
-  // Reactor we're interested in <handling_input> on it.
-
-  ACE_Reactor *r = this->reactor ();
-  if (r != 0)
-    r->register_handler (this, proc->gethandle ());
+      // If we have a Reactor, then we're supposed to reap Processes
+      // automagically.  Get a handle to this new Process and tell the
+      // Reactor we're interested in <handling_input> on it.
+
+      ACE_Reactor *r = this->reactor ();
+      if (r != 0)
+        r->register_handler (this,
+                             proc->gethandle ());
 #endif /* ACE_WIN32 */
 
-  this->current_count_++;
-  return 0;
+      this->current_count_++;
+      return 0;
+    }
 }
 
 // Insert a process into the pool (checks for duplicates and doesn't
@@ -840,23 +838,6 @@ ACE_Process_Manager::wait (pid_t pid,
         }
       else
         {
-# if defined (ACE_LACKS_UNIX_SIGNALS)
-          pid = 0;
-          ACE_Time_Value sleeptm (1);    // 1 msec
-          if (sleeptm > timeout)         // if sleeptime > waittime
-            sleeptm = timeout;
-          ACE_Time_Value tmo (timeout);  // Need one we can change
-          for (ACE_Countdown_Time time_left (&tmo); tmo > ACE_Time_Value::zero ; time_left.update ())
-            {
-              pid = ACE_OS::waitpid (-1, status, WNOHANG);
-              if (pid > 0 || pid == ACE_INVALID_PID)
-                break;          // Got a child or an error - all done
-
-              // pid 0, nothing is ready yet, so wait.
-              // Do a (very) short sleep (only this thread sleeps).
-              ACE_OS::sleep (sleeptm);
-            }
-# else
           // Force generation of SIGCHLD, even though we don't want to
           // catch it - just need it to interrupt the sleep below.
           // If this object has a reactor set, assume it was given at
@@ -893,7 +874,6 @@ ACE_Process_Manager::wait (pid_t pid,
             {
               old_action.register_action (SIGCHLD);
             }
-# endif /* !ACE_LACKS_UNIX_SIGNALS */
         }
 #endif /* !defined (ACE_WIN32) */
     }
diff --git a/ace/Process_Mutex.cpp b/ace/Process_Mutex.cpp
index 1cf0aaa1902..7d762c9e6c4 100644
--- a/ace/Process_Mutex.cpp
+++ b/ace/Process_Mutex.cpp
@@ -38,7 +38,8 @@ ACE_Process_Mutex::unique_name (void)
 
 ACE_Process_Mutex::ACE_Process_Mutex (const char *name, void *arg, mode_t mode)
 #if defined (_ACE_USE_SV_SEM)
-  : lock_ (name ? name : ACE_TEXT_ALWAYS_CHAR (this->unique_name ()),
+  : lock_ (name ?
+             ACE_TEXT_CHAR_TO_TCHAR (name) : this->unique_name (),
            ACE_SV_Semaphore_Complex::ACE_CREATE,
            1,
            1,
@@ -62,8 +63,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name,
                                       mode_t mode)
 #if defined (_ACE_USE_SV_SEM)
   : lock_ (name ?
-             ACE_Wide_To_Ascii (name).char_rep () :
-             ACE_TEXT_ALWAYS_CHAR (this->unique_name ()),
+             ACE_TEXT_WCHAR_TO_TCHAR (name) : this->unique_name (),
            ACE_SV_Semaphore_Complex::ACE_CREATE,
            1,
            1,
diff --git a/ace/Process_Semaphore.cpp b/ace/Process_Semaphore.cpp
index 0e78f9b7ea5..88355398384 100644
--- a/ace/Process_Semaphore.cpp
+++ b/ace/Process_Semaphore.cpp
@@ -30,9 +30,7 @@ ACE_Process_Semaphore::ACE_Process_Semaphore (u_int count,
 #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS)
   : lock_ (count, USYNC_PROCESS, name, arg, max)
 #else
-  : lock_ (ACE_TEXT_ALWAYS_CHAR (name),
-           ACE_SV_Semaphore_Complex::ACE_CREATE,
-           count)
+  : lock_ (name, ACE_SV_Semaphore_Complex::ACE_CREATE, count)
 #endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */
 {
   arg = arg;
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
index b02952fbeb7..8f33bb1a863 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
@@ -18,11 +18,7 @@
 #define IMR_MULTIADDR imr_multiaddr
 #endif /* ! defined (IMR_MULTIADDR) */
 
-
-ACE_RCSID (QoS,
-           SOCK_Dgram_Mcast_QoS,
-           "$Id$")
-
+ACE_RCSID(ace, SOCK_Dgram_Mcast_QoS, "$Id $")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Mcast_QoS)
 
@@ -104,7 +100,8 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
       ACE_INET_Addr *if_addrs = 0;
       size_t if_cnt;
 
-      if (ACE::get_ip_interfaces (if_cnt, if_addrs) != 0)
+      if (ACE_Sock_Connect::get_ip_interfaces (if_cnt,
+                                               if_addrs) != 0)
         return -1;
 
       size_t nr_subscribed = 0;
@@ -216,24 +213,24 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr,
       // Check if the mcast_addr passed into this method is the
       // same as the QoS session address.
       if (mcast_addr == qos_session->dest_addr ())
-        {
-          // Subscribe to the QoS session.
-          if (this->qos_manager_.join_qos_session (qos_session) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_LIB_TEXT ("Unable to join QoS Session\n")),
-                              -1);
-        }
+      	{
+	  // Subscribe to the QoS session.
+	  if (this->qos_manager_.join_qos_session (qos_session) == -1)
+	    ACE_ERROR_RETURN ((LM_ERROR,
+			       ACE_LIB_TEXT ("Unable to join QoS Session\n")),
+			      -1);
+	}
       else
-        {
-          if (this->close () != 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_LIB_TEXT ("Unable to close socket\n")));
+	{
+	  if (this->close () != 0)
+	    ACE_ERROR ((LM_ERROR,
+			ACE_LIB_TEXT ("Unable to close socket\n")));
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_LIB_TEXT ("Dest Addr in the QoS Session does")
                                ACE_LIB_TEXT (" not match the address passed into")
                                ACE_LIB_TEXT (" subscribe\n")),
                               -1);
-        }
+	}
 
       ip_mreq ret_mreq;
       this->make_multicast_ifaddr (&ret_mreq, mcast_addr, net_if);
@@ -248,9 +245,13 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr,
         return -1;
 
       else
-        if (qos_params.socket_qos () != 0)
-          qos_session->qos (*(qos_params.socket_qos ()));
+	if (qos_params.socket_qos () != 0)
+	  qos_session->qos (*(qos_params.socket_qos ()));
 
       return 0;
     }
 }
+
+
+
+
diff --git a/ace/QtReactor.cpp b/ace/QtReactor.cpp
index 164d5f317b1..1406a3dbbae 100644
--- a/ace/QtReactor.cpp
+++ b/ace/QtReactor.cpp
@@ -1,6 +1,8 @@
 //$Id$
 #include "ace/QtReactor.h"
 #if defined (ACE_HAS_QT)
+#include <qeventloop.h>
+
 ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
 
 // Must be called with lock held
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 3c903ee8efd..52f37cbd799 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -98,20 +98,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (const ACE_RB_T
               *(iter.item ()));
 }
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (
-    void *location,
-    ACE_Allocator *alloc
-)
-{
-  if (location != this)
-    {
-      this->root_ = 0;
-      this->current_size_ = 0;
-    }
-
-  this->allocator_ = alloc;
-}
 // Destructor.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index e2ba71cee94..f5e6dc84b12 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -208,7 +208,6 @@ public:
   /// Constructor.
   ACE_RB_Tree (ACE_Allocator *alloc = 0);
 
-
   /// Copy constructor.
   ACE_RB_Tree (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt);
 
@@ -362,10 +361,10 @@ public:
   size_t current_size (void) const;
 
   /// Assignment operator.
-  void operator= (const ACE_RB_Tree<EXT_ID,
-                  INT_ID,
-                  COMPARE_KEYS,
-                  ACE_LOCK> &rbt);
+  void operator= (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt);
+
+  /// Less than comparison function for keys, using comparison functor.
+  virtual int lessthan (const EXT_ID &k1, const EXT_ID &k2);
 
   /**
    * Returns a reference to the underlying <ACE_LOCK>.  This makes it
@@ -441,14 +440,6 @@ public:
   void clear (void);
 
 protected:
-  /// Reinitialize constructor.
-  /**
-   * This constructor is used to provide a valid vtable and allocator
-   * if the tree is reconstructed from shared memory.  Constructor
-   * used by the derived class that has an allocator
-   */
-  ACE_RB_Tree (void *location,
-               ACE_Allocator *alloc);
 
   // = Protected methods. These should only be called with locks held.
 
@@ -558,9 +549,6 @@ protected:
   /// provide definitions for various EXT_ID and INT_ID types.
   void dump_node_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> &node) const;
 
-  /// Less than comparison function for keys, using comparison functor.
-  int lessthan (const EXT_ID &k1, const EXT_ID &k2);
-
 private:
 
   // = Private members.
diff --git a/ace/README b/ace/README
index 0e1394d90c0..28b08493a1b 100644
--- a/ace/README
+++ b/ace/README
@@ -133,6 +133,8 @@ ACE_THREAD_MANAGER_USES_SAFE_SPAWN      Disable the "check before lock" feature
                                         macro avoids a potential race condition
                                         on platforms with aggressive read/write
                                         reordering.
+ACE_HAS_GNUG_PRE_2_8                    Compiling with g++ prior to
+                                        version 2.8.0.
 ACE_HAS_PRIOCNTL                        OS has priocntl (2).
 ACE_HAS_RECURSIVE_MUTEXES               Mutexes are inherently recursive
                                         (e.g., Win32)
@@ -241,6 +243,14 @@ ACE_HAS_BROKEN_POSIX_TIME               Platform defines struct
 ACE_HAS_BROKEN_RANDR                    OS/compiler's header files are
                                         inconsistent with libC
                                         definition of rand_r().
+ACE_HAS_BROKEN_READV()                  OS/Compiler's header files are
+                                        not consistent with readv()
+                                        definition.
+ACE_HAS_BROKEN_SENDMSG                  OS/compiler omits the const
+                                        from the sendmsg() prototype.
+ACE_HAS_BROKEN_SETRLIMIT                OS/compiler omits the const
+                                        from the rlimit parameter in
+                                        the setrlimit() prototype.
 ACE_HAS_BROKEN_T_ERROR                  Compiler/platform has the wrong
                                         prototype for t_error(), i.e.,
                                         t_error(char *) rather than
@@ -251,6 +261,9 @@ ACE_HAS_BROKEN_TIMESPEC_MEMBERS         platform define struct
                                         tv_nsec.  This is highly
                                         non-portable.  Currently only
                                         FreeBSD 2.1.x uses it.
+ACE_HAS_BROKEN_WRITEV                   OS/compiler omits the const
+                                        from the iovec parameter in
+                                        the writev() prototype.
 ACE_HAS_BSTRING                         Platform has <bstring.h>
                                         (which contains bzero()
                                         prototype)
@@ -318,7 +331,7 @@ ACE_HAS_GETPAGESIZE                     Platform supports
                                         except on Win32)
 ACE_HAS_GETRUSAGE                       Platform supports the
                                         getrusage() system call.
-ACE_HAS_GETRUSAGE_PROTOTYPE             Platform has a getrusage ()
+ACE_HAS_GETRUSAGE_PROTO                 Platform has a getrusage ()
                                         prototype in sys/resource.h
                                         that differs from the one in
                                         ace/OS.i.
@@ -347,9 +360,9 @@ ACE_HAS_INLINED_OSCALLS                 Inline all the static class OS
                                         overhead
 ACE_HAS_IP_MULTICAST                    Platform supports IP multicast
 ACE_HAS_IPV6                            Platform supports IPv6.
-ACE_USES_IPV4_IPV6_MIGRATION            Enable IPv6 support in ACE on
-                                        platforms that don't have IPv6
-                                        turned on by default.
+ACE_USES_IPV4_IPV6_MIGRATION		Enable IPv6 support in ACE on
+					platforms that don't have IPv6
+					turned on by default.
 ACE_HAS_IRIX62_THREADS                  Platform supports the very odd
                                         IRIX 6.2 threads...
 ACE_HAS_NONSTATIC_OBJECT_MANAGER        Causes the ACE_Object_Manager
@@ -381,31 +394,21 @@ ACE_HAS_MSG                             Platform supports recvmsg and
 ACE_HAS_MT_SAFE_MKTIME                  Platform supports MT safe
                                         mktime() call (do any of
                                         them?)
-ACE_HAS_MUTEX_TIMEOUTS                  Compiler supports timed mutex
+ACE_HAS_MUTEX_TIMEOUTS			Compiler supports timed mutex
                                         acquisitions
                                         (e.g. pthread_mutex_timedlock()).
-ACE_HAS_NEW_NOTHROW                     Compiler offers new (nothrow).
+ACE_HAS_NEW_NOTHROW			Compiler offers new (nothrow).
 ACE_HAS_NONCONST_GETBY                  Platform uses non-const char *
                                         in calls to gethostbyaddr,
                                         gethostbyname, getservbyname
 ACE_HAS_NONCONST_MSGSND                 Platform has a non-const
                                         parameter to msgsend() (e.g.,
                                         SCO).
-ACE_HAS_NONCONST_READV			Platform omits const qualifier from
-					iovec parameter in readv() prototype.
 ACE_HAS_NONCONST_SELECT_TIMEVAL         Platform's select() uses
                                         non-const timeval* (only found
                                         on Linux right now)
-ACE_HAS_NONCONST_SENDMSG		Platform omits const qualifier
-					from msghdr parameter in sendmsg()
-					prototype.
-ACE_HAS_NONCONST_SETRLIMIT              Platform omits const qualifier
-					from rlimit parameter in setrlimit()
-					prototype.
 ACE_HAS_NONCONST_SWAB                   Platform's swab function has non
                                         const src argument
-ACE_HAS_NONCONST_WRITEV                 Platform omits const qualifier from
-					iovec parameter in writev() prototype.
 ACE_HAS_OLD_MALLOC                      Compiler/platform uses old
                                         malloc()/free() prototypes
                                         (ugh)
@@ -532,6 +535,8 @@ ACE_HAS_SIZET_SOCKET_LEN                OS/compiler uses size_t *
 ACE_HAS_SOCKADDR_MSG_NAME               Platform requires (struct
                                         sockaddr *) for msg_name field
                                         of struct msghdr.
+ACE_HAS_SOCKIO_H                        Compiler/platform provides the
+                                        sockio.h file
 ACE_HAS_SOCKLEN_T                       Platform provides socklen_t
                                         type, such as Linux with
                                         glibc2.
@@ -577,6 +582,8 @@ ACE_HAS_SVR4_TLI                        Compiler/platform supports
                                         isn't used if ACE_HAS_XTI is set.
 ACE_HAS_SYSCALL_GETRUSAGE               HP/UX has an undefined syscall
                                         for GETRUSAGE...
+ACE_HAS_SYSCALL_H                       Compiler/platform contains the
+                                        <sys/syscall.h> file.
 ACE_HAS_SYSENT_H                        Platform provides <sysent.h>
                                         header
 ACE_HAS_SYSINFO                         Platform supports system
@@ -588,16 +595,8 @@ ACE_HAS_SYS_ERRLIST                     Platform/compiler supports
                                         _sys_errlist symbol
 ACE_HAS_SYS_FILIO_H                     Platform provides
                                         <sys/filio.h> header
-ACE_HAS_SYS_LOADAVG_H                   Compiler/platform contains the
-                                        <sys/loadavg.h> file.
-ACE_HAS_SYS_PSTAT_H                     Compiler/platform contains the
-                                        <sys/pstat.h> file.
 ACE_HAS_SYS_SIGLIST                     Compiler/platform supports
                                         _sys_siglist array
-ACE_HAS_SYS_SOCKIO_H                    Compiler/platform provides the
-                                        sockio.h file
-ACE_HAS_SYS_SYSCALL_H                   Compiler/platform contains the
-                                        <sys/syscall.h> file.
 ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA   Compiler's template
                                         instantiation mechanism
                                         supports the use of "#pragma
@@ -632,8 +631,6 @@ ACE_HAS_THR_C_DEST                      The pthread_keycreate()
 ACE_HAS_THR_C_FUNC                      The pthread_create() routine
                                         *must* take extern C
                                         functions.
-ACE_HAS_TIMEZONE			Platform/compiler supports
-					global "timezone" variable.
 ACE_HAS_TIMEZONE_GETTIMEOFDAY           Platform/compiler supports
                                         timezone * as second parameter
                                         to gettimeofday()
@@ -669,8 +666,8 @@ ACE_HAS_VERBOSE_NOTSUP                  Prints out console message in
                                         tracking down origin of
                                         ACE_NOTSUP.
 ACE_HAS_VOIDPTR_GETTIMEOFDAY            Platform/compiler supports
-                                        void * as second parameter
-                                        to gettimeofday
+					void * as second parameter
+					to gettimeofday
 ACE_HAS_VOIDPTR_MMAP                    Platform requires void * for
                                         mmap().
 ACE_HAS_VOIDPTR_SOCKOPT                 OS/compiler uses void * arg 4
@@ -757,7 +754,7 @@ ACE_LACKS_FLOATING_POINT                Platform does not support
 ACE_LACKS_FORK                          Platform lacks the fork()
                                         system call (e.g., Win32,
                                         VxWorks, Chorus)
-ACE_LACKS_GETOPT_PROTOTYPE              Platform lacks the getopt()
+ACE_LACKS_GETOPT_PROTO                  Platform lacks the getopt()
                                         prototype (e.g., LynxOS)
 ACE_LACKS_GETPGID                       Platform lacks getpgid() call
                                         (e.g., Win32, Chorus, and
@@ -767,9 +764,6 @@ ACE_LACKS_GETSERVBYNAME                 Platforms lacks
                                         and Chorus).
 ACE_LACKS_INET_ATON                     Platform lacks the inet_aton()
                                         function.
-ACE_LACKS_INET_ATON_PROTOTYPE           Platform/compiler lacks the
-                                        inet_aton() prototype (e.g.,
-                                        LynxOS)
 ACE_LACKS_IOSTREAMS_TOTALLY             Iostreams are not supported
                                         adequately on the given platform.
 ACE_LACKS_IOSTREAM_FX                   iostream header does not
@@ -791,12 +785,6 @@ ACE_LACKS_MEMORY_H                      Platform lacks memory.h (e.g.,
 ACE_LACKS_MKFIFO                        Platform lacks mkfifo() e.g.,
                                         VxWorks, Chorus, pSoS, and WinNT.
 ACE_LACKS_MKTEMP                        ACE has no mktemp()
-ACE_LACKS_MKTEMP_PROTOTYPE              Platform/compiler lacks the
-                                        mktemp() prototype (e.g.,
-                                        LynxOS)
-ACE_LACKS_MKSTEMP_PROTOTYPE             Platform/compiler lacks the
-                                        mkstemp() prototype (e.g.,
-                                        LynxOS)
 ACE_LACKS_MMAP                          The platform doesn't have
                                         mmap(2) (e.g., SCO UNIX).
 ACE_LACKS_MODE_MASKS                    Platform/compiler doesn't have
@@ -828,6 +816,8 @@ ACE_LACKS_NEW_H                         OS doesn't have, or we don't want to
                                         use, new.h.
 ACE_LACKS_NULL_PTHREAD_STATUS           OS requires non-null status pointer
                                         for ::pthread_join ().
+ACE_LACKS_PARAM_H                       Platform lacks <sys/param.h>
+                                        (e.g., MVS)
 ACE_LACKS_PERFECT_MULTICAST_FILTERING   Platform lacks IGMPv3 "perfect" filtering
                                         of multicast dgrams at the socket level.
                                         If == 1, ACE_SOCK_Dgram_Mcast will bind
@@ -843,9 +833,6 @@ ACE_LACKS_PTHREAD_SIGMASK               Platform lacks pthread_sigmask ().
 ACE_LACKS_PTHREAD_THR_SIGSETMASK        Platform lacks
                                         pthread_thr_sigsetmask (e.g.,
                                         MVS, HP/UX, and OSF/1 3.2)
-ACE_LACKS_PUTENV_PROTOTYPE              Platform/compiler lacks the
-                                        putenv() prototype (e.g.,
-                                        LynxOS)
 ACE_LACKS_PWD_REENTRANT_FUNCTIONS       Platform lacks getpwnam_r()
                                         methods (e.g., SGI 6.2).
 ACE_LACKS_SID                           Platform lacks setsid
@@ -868,8 +855,7 @@ ACE_LACKS_READDIR_R                     Platform uses ACE_HAS_DIRENT
                                         but does not have readdir_r
                                         ().
 ACE_LACKS_REALPATH                      Platform/compiler lacks
-                                        realpath () function (e.g.,
-                                        LynxOS)
+                                        realpath () function.
 ACE_LACKS_RECVMSG                       Platform lacks recvmsg()
                                         (e.g., Linux)
 ACE_LACKS_RWLOCK_T                      Platform lacks readers/writer
@@ -909,10 +895,8 @@ ACE_LACKS_SYS_NERR                      Platforms/compiler lacks the
                                         VxWorks and MVS).
 ACE_LACKS_SYSTIME_H                     <time.h> doesn't automatically
                                         #include /**/ <sys/time.h>
-ACE_LACKS_SYS_MSG_H                     Platform lacks sys/msg.h
+ACE_LACKS_SYS_MSG_H                    Platform lacks sys/msg.h
                                         (e.g., Chorus and VxWorks)
-ACE_LACKS_SYS_PARAM_H                   Platform lacks <sys/param.h>
-                                        (e.g., MVS)
 ACE_LACKS_SENDMSG                       Platform lacks sendmsg()
                                         (e.g., Linux)
 ACE_LACKS_SI_ADDR                       Platform lacks the si_addr
@@ -933,12 +917,6 @@ ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES  Compiler doesn't support
 ACE_LACKS_STRCASECMP                    Compiler/platform lacks
                                         strcasecmp() (e.g., DG/UX,
                                         UNIXWARE, VXWORKS)
-ACE_LACKS_STRCASECMP_PROTOTYPE          Platform/compiler lacks the
-                                        strcasecmp() prototype (e.g.,
-                                        LynxOS)
-ACE_LACKS_STRNCASECMP_PROTOTYPE         Platform/compiler lacks the
-                                        strncasecmp() prototype (e.g.,
-                                        LynxOS)
 ACE_LACKS_STRRECVFD                     Platform doesn't define struct
                                         strrecvfd.
 ACE_LACKS_SYSCALL                       Platform doesn't have
@@ -998,7 +976,7 @@ ACE_LEGACY_MODE                         When defined, it will enable some code t
 ACE_NEEDS_DEV_IO_CONVERSION             Necessary with some compilers
                                         to pass ACE_TTY_IO as
                                         parameter to DEV_Connector.
-ACE_NEEDS_FUNC_DEFINITIONS              Compiler requires a definition
+ACE_NEEDS_FUNC_DEFINITIONS           Compiler requires a definition
                                         for a "hidden" function, e.g.,
                                         a private, unimplemented copy
                                         constructor or assignment
@@ -1033,15 +1011,15 @@ ACE_WSTRING_HAS_USHORT_SUPPORT          If a platform has wchar_t as a separate
                                         macro enables one. (mostly used my ACE Name Space).
 
 ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK
-                                        Under QNX/RTP the objects preallocated
-                                        in ACE_OS_Object_Manager cannot be
-                                        destroyed after a fork() call.
-                                        Since these objects are only destroyed
-                                        at application shutdown we take the
-                                        simpler approach of not destroying
-                                        them at all.
-                                        Both QNX/RTP and LynxOS suffer from
-                                        this problem.
+					Under QNX/RTP the objects preallocated
+					in ACE_OS_Object_Manager cannot be
+					destroyed after a fork() call.
+					Since these objects are only destroyed
+					at application shutdown we take the
+					simpler approach of not destroying
+					them at all.
+					Both QNX/RTP and LynxOS suffer from
+					this problem.
 
 ACE_LACKS_MEMBER_TEMPLATES              Compiler does not support
                                         member template feature.
@@ -1663,20 +1641,20 @@ ACE_QTREACTOR_CLEAR_PENDING_EVENTS:
 ----------------------------
   Used in:
     ace/QtReactor.cpp:
-    QtReactor by default does not clear qt events pending for
-    activated socket. Clearing costs much, at least 2 hash accesses
-    in ACE, and 2 another in Qt. It is also better to not clear
-    pending events as some side effects are unknown. However,
-    when events are not clear, then some user applications may be
-    confused by handle_input/output/exception called without any
-    data eg. in ACE_Acceptor::make_svc_handler. This swithc is
-    intended to quickly fix user application which does not
+    QtReactor by default does not clear qt events pending for 
+    activated socket. Clearing costs much, at least 2 hash accesses 
+    in ACE, and 2 another in Qt. It is also better to not clear 
+    pending events as some side effects are unknown. However, 
+    when events are not clear, then some user applications may be 
+    confused by handle_input/output/exception called without any 
+    data eg. in ACE_Acceptor::make_svc_handler. This swithc is 
+    intended to quickly fix user application which does not 
     follow some reactor rules.
  Linux:
-   It seems linux::qt does not queue pending events. Do not define
+   It seems linux::qt does not queue pending events. Do not define 
    this switch.
  Windows:
-   Windows::qt queues pending events. If user application has handle_*
-   methods which cannot be called without data, then turn on this switch
-   to quickly fix the bug. However, one should seriously fix the
+   Windows::qt queues pending events. If user application has handle_* 
+   methods which cannot be called without data, then turn on this switch 
+   to quickly fix the bug. However, one should seriously fix the 
    application then.
diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp
index c6645957729..0921d83ea0c 100644
--- a/ace/Read_Buffer.cpp
+++ b/ace/Read_Buffer.cpp
@@ -2,8 +2,6 @@
 
 #include "ace/Read_Buffer.h"
 
-#include "ace/config-all.h"
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Read_Buffer.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Reverse_Lock_T.inl b/ace/Reverse_Lock_T.inl
index 191e3623549..79d9c47c788 100644
--- a/ace/Reverse_Lock_T.inl
+++ b/ace/Reverse_Lock_T.inl
@@ -1,7 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/config-all.h"
 #include "ace/OS_NS_errno.h"
 
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index 151c29b3ce0..87a7f34f1fb 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -366,7 +366,7 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
   else if (protocol_family == PF_UNSPEC)
     {
 #if defined (ACE_HAS_IPV6)
-      protocol_family = ACE::ipv6_enabled () ? PF_INET6 : PF_INET;
+      protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET;
 #else
       protocol_family = PF_INET;
 #endif /* ACE_HAS_IPV6 */
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index fe4598ea2d3..50c5f571f5b 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -124,8 +124,8 @@ ACE_SOCK_Dgram::shared_open (const ACE_Addr &local,
           )
         {
           if (ACE::bind_port (this->get_handle (),
-                              INADDR_ANY,
-                              protocol_family) == -1)
+			      INADDR_ANY,
+			      protocol_family) == -1)
             error = 1;
         }
     }
@@ -179,7 +179,7 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local,
   else if (protocol_family == PF_UNSPEC)
     {
 #if defined (ACE_HAS_IPV6)
-      protocol_family = ACE::ipv6_enabled () ? PF_INET6 : PF_INET;
+      protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET;
 #else
       protocol_family = PF_INET;
 #endif /* ACE_HAS_IPV6 */
diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp
index cbad8c3344c..67e6507ab23 100644
--- a/ace/SOCK_Dgram_Bcast.cpp
+++ b/ace/SOCK_Dgram_Bcast.cpp
@@ -142,7 +142,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
   //Get host ip address
   if (host_name)
     {
-      hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR (host_name));
+      hostent *hp = ACE_OS::gethostbyname (host_name);
 
       if (hp == 0)
         return -1;
@@ -162,7 +162,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
     }
 
 
-#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__)
   for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0;
        n--, ifr++)
 #else
@@ -180,7 +180,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
             ifr = (struct ifreq *)
               ((caddr_t) &ifr->ifr_addr + ifr->ifr_addr.sa_len)) :
           (nbytes -= sizeof (struct ifreq), ifr++)))
-#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) */
+#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) */
     {
 #if defined (__QNX__)
       // Silently skip link interfaces
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index f63bf302777..aa1d96803fa 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -332,7 +332,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
             ACE_INET_Addr *if_addrs = 0;
             size_t if_cnt;
 
-            if (ACE::get_ip_interfaces (if_cnt, if_addrs) != 0)
+            if (ACE_Sock_Connect::get_ip_interfaces (if_cnt, if_addrs) != 0)
               return -1;
 
             size_t nr_subscribed = 0;
@@ -383,7 +383,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
       ACE_INET_Addr *if_addrs = 0;
       size_t if_cnt;
 
-      if (ACE::get_ip_interfaces (if_cnt, if_addrs) != 0)
+      if (ACE_Sock_Connect::get_ip_interfaces (if_cnt, if_addrs) != 0)
         return -1;
 
       size_t nr_subscribed = 0;
@@ -692,7 +692,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
           // is a limitation of the way <get_ip_interfaces> works with
           // old versions of MSVC.  The reliable way of getting the interface
           // list is available only with MSVC 5 and newer.
-          if (ACE::get_ip_interfaces (if_cnt, if_addrs) != 0)
+          if (ACE_Sock_Connect::get_ip_interfaces (if_cnt, if_addrs) != 0)
             return -1;
 
           size_t nr_unsubscribed = 0;
@@ -741,7 +741,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
       // is a limitation of the way <get_ip_interfaces> works with
       // old versions of MSVC.  The reliable way of getting the interface list
       // is available only with MSVC 5 and newer.
-      if (ACE::get_ip_interfaces (if_cnt, if_addrs) != 0)
+      if (ACE_Sock_Connect::get_ip_interfaces (if_cnt, if_addrs) != 0)
         return -1;
 
       size_t nr_unsubscribed = 0;
@@ -975,7 +975,7 @@ ACE_SOCK_Dgram_Mcast::make_multicast_ifaddr (ip_mreq *ret_mreq,
       // Look up the interface by number, not name.
       if_address.ifr_ifno = ACE_OS::atoi (net_if);
 #else
-      ACE_OS::strcpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if));
+      ACE_OS::strcpy (if_address.ifr_name, net_if);
 #endif /* defined (ACE_PSOS) */
 
       if (ACE_OS::ioctl (this->get_handle (),
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index b0724223fae..c4d55ab2314 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -14,6 +14,7 @@
  */
 //=============================================================================
 
+
 #ifndef ACE_SOCK_DGRAM_MCAST_H
 #define ACE_SOCK_DGRAM_MCAST_H
 #include /**/ "ace/pre.h"
@@ -100,7 +101,7 @@ public:
    * comments in source file for environment-specific restrictions).  Default
    * values are always valid values for the compilation environment.
    */
-  enum options
+  enum  options
   {
   // Define whether a specific (multicast) address (in addition to the port#)
   // is bound to the socket.
diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp
index fa45e5d83a0..8744185f52e 100644
--- a/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -503,7 +503,7 @@ ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Addr &local_sap,
   else if (protocol_family == PF_UNSPEC)
     {
 #if defined (ACE_HAS_IPV6)
-      protocol_family = ACE::ipv6_enabled () ? PF_INET6 : PF_INET;
+      protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET;
 #else
       protocol_family = PF_INET;
 #endif /* ACE_HAS_IPV6 */
@@ -540,7 +540,7 @@ ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Multihomed_INET_Addr &local_sap,
   else if (protocol_family == PF_UNSPEC)
     {
 #if defined (ACE_HAS_IPV6)
-      protocol_family = ACE::ipv6_enabled () ? PF_INET6 : PF_INET;
+      protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET;
 #else
       protocol_family = PF_INET;
 #endif /* ACE_HAS_IPV6 */
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp
index deeead76ef3..0cd7dc63a9e 100644
--- a/ace/SPIPE_Acceptor.cpp
+++ b/ace/SPIPE_Acceptor.cpp
@@ -6,10 +6,6 @@
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_NS_sys_time.h"
 
-#if defined (ACE_HAS_STREAM_PIPES)
-#  include "ace/OS_NS_unistd.h"
-#endif  // ACE_HAS_STREAM_PIPES
-
 ACE_RCSID(ace, SPIPE_Acceptor, "$Id$")
 
 ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (void)
@@ -28,7 +24,7 @@ ACE_SPIPE_Acceptor::remove (void)
   int result = this->close ();
 
   // Remove the underlying file.
-  return ACE_OS::unlink (this->local_addr_.get_path_name ()) == -1
+  return ACE_OS::unlink (this->local_addr_.get_path_name ()) == -1 
     || result == -1 ? -1 : 0;
 #else
   this->close ();
@@ -49,7 +45,7 @@ ACE_SPIPE_Acceptor::dump (void) const
 // General purpose routine for performing server ACE_SPIPE creation.
 
 int
-ACE_SPIPE_Acceptor::open (const ACE_SPIPE_Addr &local_sap,
+ACE_SPIPE_Acceptor::open (const ACE_SPIPE_Addr &local_sap, 
                           int reuse_addr,
                           int perms,
                           LPSECURITY_ATTRIBUTES sa,
@@ -103,7 +99,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
   // an instance of the named pipe that is already connected to a
   // client process is reused with a new client process,
   // ::ConnectNamedPipe () would fail.
-
+ 
   ACE_UNUSED_ARG (perms);
   ACE_TRACE ("ACE_SPIPE_Acceptor::create_new_instance");
   int status;
@@ -151,7 +147,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
       ACE_ASSERT (!result);
 
       status = ::GetLastError ();
-      switch (status)
+      switch (status) 
         {
         case ERROR_IO_PENDING:
           break;
@@ -196,7 +192,7 @@ ACE_SPIPE_Acceptor::close (void)
   return result;
 }
 
-ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap,
+ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, 
                                         int reuse_addr,
                                         int perms,
                                         LPSECURITY_ATTRIBUTES sa,
@@ -213,9 +209,9 @@ ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap,
 // General purpose routine for accepting new connections.
 
 int
-ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io,
+ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io, 
                             ACE_SPIPE_Addr *remote_addr,
-                            ACE_Time_Value *timeout,
+                            ACE_Time_Value *timeout, 
                             int restart,
                             int reset_new_handle)
 {
@@ -229,7 +225,7 @@ ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io,
   // ACE_OS::ioctl (). Otherwise, we will wait for the desired number
   // of milli seconds using ACE_OS::poll.
 
-  if (timeout != 0 &&
+  if (timeout != 0 && 
       ACE::handle_timed_accept (this->get_handle (),
                                 timeout,
                                 restart) == -1)
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index b715aa67690..ffc975cc805 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -104,7 +104,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
           if (relative_time <= ACE_Time_Value::zero)
             {
               // Mimick the errno value returned by
-              // ACE::handle_timed_open.
+              // ACE_Handle_Ops::handle_timed_open.
               if (*timeout == ACE_Time_Value::zero)
                 errno = EWOULDBLOCK;
               else
@@ -146,7 +146,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
         }
     }
 #else /* ACE_WIN32 && !ACE_HAS_PHARLAP */
-  handle = ACE::handle_timed_open (timeout,
+  handle = ACE_Handle_Ops::handle_timed_open (timeout,
                                               remote_sap.get_path_name (),
                                               flags, perms, sa);
 #endif /* !ACE_WIN32 || ACE_HAS_PHARLAP || ACE_HAS_WINCE */
diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp
index f4d4ff8b924..c6b1bb99998 100644
--- a/ace/SSL/SSL_SOCK_Stream.cpp
+++ b/ace/SSL/SSL_SOCK_Stream.cpp
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Handle_Set.h"
@@ -51,6 +53,7 @@ ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream (void)
   ACE_TRACE ("ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream");
 
   ::SSL_free (this->ssl_);
+  this->ssl_ = 0;
 
   // @@ Question: should we reference count the Context object or
   // leave that to the application developer? We do not reference
diff --git a/ace/SV_Message.inl b/ace/SV_Message.inl
index 51c035370b8..44cd5e25759 100644
--- a/ace/SV_Message.inl
+++ b/ace/SV_Message.inl
@@ -4,7 +4,6 @@
 // SV_Message.i
 
 #include "ace/Global_Macros.h"
-#include "ace/config-all.h"
 
 ACE_INLINE
 ACE_SV_Message::ACE_SV_Message (long t)
diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp
index e28ba4a923c..f54a843cc96 100644
--- a/ace/SV_Semaphore_Simple.cpp
+++ b/ace/SV_Semaphore_Simple.cpp
@@ -187,25 +187,6 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name,
                 ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
 }
 
-#if defined (ACE_HAS_WCHAR)
-ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name,
-                                                  int flags,
-                                                  int initial_value,
-                                                  u_short nsems,
-                                                  int perms)
-{
-  ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple(wchar_t)");
-  if (this->open (ACE_Wide_To_Ascii (name).char_rep (),
-                  flags,
-                  initial_value,
-                  nsems,
-                  perms) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\n"),
-                ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
-}
-#endif /* ACE_HAS_WCHAR */
-
 ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple");
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index 85ba4c0daa0..d6d28374434 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -67,14 +67,6 @@ public:
                            int initial_value = 1,
                            u_short nsems = 1,
                            int perms = ACE_DEFAULT_FILE_PERMS);
-#if defined (ACE_HAS_WCHAR)
-  ACE_SV_Semaphore_Simple (const wchar_t *name,
-                           int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
-                           int initial_value = 1,
-                           u_short nsems = 1,
-                           int perms = ACE_DEFAULT_FILE_PERMS);
-#endif /* ACE_HAS_WCHAR */
-
   ~ACE_SV_Semaphore_Simple (void);
 
   int open (const char *name,
@@ -83,14 +75,6 @@ public:
             u_short nsems = 1,
             int perms = ACE_DEFAULT_FILE_PERMS);
 
-#if defined (ACE_HAS_WCHAR)
-  int open (const wchar_t *name,
-            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
-            int initial_value = 1,
-            u_short nsems = 1,
-            int perms = ACE_DEFAULT_FILE_PERMS);
-#endif /* ACE_HAS_WCHAR */
-
   /// Open or create one or more SV_Semaphores.  We return 0 if all is
   /// OK, else -1.
   int open (key_t key,
diff --git a/ace/SV_Semaphore_Simple.inl b/ace/SV_Semaphore_Simple.inl
index 85aad8d5b0c..a6490c18ac8 100644
--- a/ace/SV_Semaphore_Simple.inl
+++ b/ace/SV_Semaphore_Simple.inl
@@ -6,25 +6,6 @@
 #include "ace/Global_Macros.h"
 #include "ace/OS_NS_Thread.h"
 
-#if defined (ACE_HAS_WCHAR)
-// Semaphores don't offer wide-char names, so convert the name and forward
-// to the narrow-char open().
-ACE_INLINE int
-ACE_SV_Semaphore_Simple::open (const wchar_t *name,
-                               int flags,
-                               int initial_value,
-                               u_short nsems,
-                               int perms)
-{
-  ACE_TRACE ("ACE_SV_Semaphore_Simple::open (wchar_t)");
-  return this->open (ACE_Wide_To_Ascii (name).char_rep (),
-                     flags,
-                     initial_value,
-                     nsems,
-                     perms);
-}
-#endif /* ACE_HAS_WCHAR */
-
 ACE_INLINE int
 ACE_SV_Semaphore_Simple::control (int cmd,
 				  semun arg,
diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp
index 294417c0511..1fc1e58b5af 100644
--- a/ace/Select_Reactor_Base.cpp
+++ b/ace/Select_Reactor_Base.cpp
@@ -109,7 +109,7 @@ ACE_Select_Reactor_Handler_Repository::open (size_t size)
 
   // Try to increase the number of handles if <size> is greater than
   // the current limit.
-  return ACE::set_handle_limit (static_cast<int> (size), 1);
+  return ACE::set_handle_limit (static_cast<int> (size));
 }
 
 // Initialize a repository of the appropriate <size>.
@@ -308,7 +308,7 @@ ACE_Select_Reactor_Handler_Repository::bind (ACE_HANDLE handle,
       // Note the fact that we've changed the state of the <wait_set_>,
       // which is used by the dispatching loop to determine whether it can
       // keep going or if it needs to reconsult select().
-      // this->select_reactor_.state_changed_ = 1;
+      this->select_reactor_.state_changed_ = 1;
     }
 
   // If new entry, call add_reference() if needed.
@@ -347,7 +347,7 @@ ACE_Select_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
   // Note the fact that we've changed the state of the <wait_set_>,
   // which is used by the dispatching loop to determine whether it can
   // keep going or if it needs to reconsult select().
-  // this->select_reactor_.state_changed_ = 1;
+  this->select_reactor_.state_changed_ = 1;
 
   // If there are no longer any outstanding events on this <handle>
   // then we can totally shut down the Event_Handler.
@@ -398,19 +398,13 @@ ACE_Select_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
           // We've deleted the last entry, so we need to figure out
           // the last valid place in the array that is worth looking
           // at.
-          ACE_HANDLE wait_rd_max =
-            this->select_reactor_.wait_set_.rd_mask_.max_set ();
-          ACE_HANDLE wait_wr_max =
-            this->select_reactor_.wait_set_.wr_mask_.max_set ();
-          ACE_HANDLE wait_ex_max =
-            this->select_reactor_.wait_set_.ex_mask_.max_set ();
-
-          ACE_HANDLE suspend_rd_max =
-            this->select_reactor_.suspend_set_.rd_mask_.max_set ();
-          ACE_HANDLE suspend_wr_max =
-            this->select_reactor_.suspend_set_.wr_mask_.max_set ();
-          ACE_HANDLE suspend_ex_max =
-            this->select_reactor_.suspend_set_.ex_mask_.max_set ();
+          ACE_HANDLE wait_rd_max = this->select_reactor_.wait_set_.rd_mask_.max_set ();
+          ACE_HANDLE wait_wr_max = this->select_reactor_.wait_set_.wr_mask_.max_set ();
+          ACE_HANDLE wait_ex_max = this->select_reactor_.wait_set_.ex_mask_.max_set ();
+
+          ACE_HANDLE suspend_rd_max = this->select_reactor_.suspend_set_.rd_mask_.max_set ();
+          ACE_HANDLE suspend_wr_max = this->select_reactor_.suspend_set_.wr_mask_.max_set ();
+          ACE_HANDLE suspend_ex_max = this->select_reactor_.suspend_set_.ex_mask_.max_set ();
 
           // Compute the maximum of six values.
           this->max_handlep1_ = wait_rd_max;
@@ -957,8 +951,8 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
   // If eh == 0 then another thread is unblocking the
   // <ACE_Select_Reactor> to update the <ACE_Select_Reactor>'s
   // internal structures.  Otherwise, we need to dispatch the
-  // appropriate handle_* method on the <ACE_Event_Handler> pointer
-  // we've been passed.
+  // appropriate handle_* method on the <ACE_Event_Handler>
+  // pointer we've been passed.
   if (buffer.eh_ != 0)
     {
       ACE_Event_Handler *event_handler =
@@ -1103,8 +1097,7 @@ ACE_Select_Reactor_Impl::bit_ops (ACE_HANDLE handle,
     return -1;
 
 #if !defined (ACE_WIN32)
-  ACE_Sig_Guard sb (0,
-                    this->mask_signals_); // Block out all signals until method returns.
+  ACE_Sig_Guard sb; // Block out all signals until method returns.
 #endif /* ACE_WIN32 */
 
   ACE_FDS_PTMF ptmf  = &ACE_Handle_Set::set_bit;
@@ -1127,11 +1120,6 @@ ACE_Select_Reactor_Impl::bit_ops (ACE_HANDLE handle,
       break;
     case ACE_Reactor::CLR_MASK:
       ptmf = &ACE_Handle_Set::clr_bit;
-      // State was changed. we need to reflect that change in the
-      // dispatch_mask I assume that only ACE_Reactor::CLR_MASK should
-      // be treated here  which means we need to clear the handle|mask
-      // from the current dispatch handler
-      this->clear_dispatch_mask (handle, mask);
       /* FALLTHRU */
     case ACE_Reactor::SET_MASK:
       /* FALLTHRU */
@@ -1185,51 +1173,6 @@ ACE_Select_Reactor_Impl::bit_ops (ACE_HANDLE handle,
   return omask;
 }
 
-void
-ACE_Select_Reactor_Impl::clear_dispatch_mask (ACE_HANDLE handle,
-                                              ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_Select_Reactor_Impl::clear_dispatch_mask");
-
-  //  Use handle and mask in order to modify the sets
-  // (wait/suspend/ready/dispatch), that way, the dispatch_io_set loop
-  // will not be interrupt, and there will no reason to rescan the
-  // wait_set and re-calling select function, which is *very*
-  // expensive. It seems that wait/suspend/ready sets are getting
-  // updated in register/remove bind/unbind etc functions.  The only
-  // thing need to be updated is the dispatch_set (also can  be found
-  // in that file code as dispatch_mask).  Because of that, we need
-  // that dispatch_set to be member of the ACE_Select_Reactor_impl in
-  // Select_Reactor_Base.h file  That way we will have access to that
-  // member in that function.
-
-  // We kind of invalidate the iterator in dispatch_io_set because its
-  // an array and index built from the original dispatch-set. Take a
-  // look at dispatch_io_set for more details.
-
-  // We only need to clr_bit, because we are interested in clearing the
-  // handles that was removed, so no dispatching to these handles will
-  // occur.
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK) ||
-      ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    {
-      this->dispatch_set_.rd_mask_.clr_bit (handle);
-    }
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    {
-      this->dispatch_set_.wr_mask_.clr_bit (handle);
-    }
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    {
-      this->dispatch_set_.ex_mask_.clr_bit (handle);
-    }
-
-  // That will make the dispatch_io_set iterator re-start and rescan
-  // the dispatch set.
-  this->state_changed_ = true;
-}
-
-
 int
 ACE_Select_Reactor_Impl::resumable_handler (void)
 {
diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h
index eaa97eb447a..cb8670b2262 100644
--- a/ace/Select_Reactor_Base.h
+++ b/ace/Select_Reactor_Base.h
@@ -201,9 +201,8 @@ public:
    * the reactor itself). Returns the number of notifications purged.
    * Returns -1 on error.
    */
-  virtual int purge_pending_notifications (
-      ACE_Event_Handler *,
-      ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+  virtual int purge_pending_notifications (ACE_Event_Handler *,
+                                           ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
 
   /// Dump the state of an object.
   virtual void dump (void) const;
@@ -431,7 +430,7 @@ public:
   };
 
   /// Constructor.
-  ACE_Select_Reactor_Impl (bool mask_signals = true);
+  ACE_Select_Reactor_Impl (void);
 
   friend class ACE_Select_Reactor_Notify;
   friend class ACE_Select_Reactor_Handler_Repository;
@@ -465,18 +464,9 @@ protected:
   /// suspended. Returns 0 if not, 1 if so.
   virtual int is_suspended_i (ACE_HANDLE handle) = 0;
 
-  /// When register/unregister occur, then we need to re-eval our
-  /// wait/suspend/dispatch set.
-  virtual void clear_dispatch_mask (ACE_HANDLE handle,
-                                    ACE_Reactor_Mask mask);
-
   /// Table that maps <ACE_HANDLEs> to <ACE_Event_Handler *>'s.
   ACE_Select_Reactor_Handler_Repository handler_rep_;
 
-
-  /// Tracks handles that are ready for dispatch from <select>
-  ACE_Select_Reactor_Handle_Set dispatch_set_;
-
   /// Tracks handles that are waited for by <select>.
   ACE_Select_Reactor_Handle_Set wait_set_;
 
@@ -534,15 +524,7 @@ protected:
    * whether we need to make another trip through the
    * <Select_Reactor>'s <wait_for_multiple_events> loop.
    */
-  bool state_changed_;
-
-  /**
-   * If 0 then the Reactor will not mask the signals during the event
-   * dispatching.  This is useful for applications that do not
-   * register any signal handlers and want to reduce the overhead
-   * introduce by the kernel level locks required to change the mask.
-   */
-  bool mask_signals_;
+  int state_changed_;
 
   /// Controls/access whether the notify handler should renew the
   /// Select_Reactor's token or not.
diff --git a/ace/Select_Reactor_Base.inl b/ace/Select_Reactor_Base.inl
index 5cb2b0749cc..73c4b7faa21 100644
--- a/ace/Select_Reactor_Base.inl
+++ b/ace/Select_Reactor_Base.inl
@@ -38,7 +38,7 @@ ACE_Event_Tuple::ACE_Event_Tuple (void)
 
 ACE_INLINE
 ACE_Event_Tuple::ACE_Event_Tuple (ACE_Event_Handler* eh,
-                                  ACE_HANDLE h)
+				  ACE_HANDLE h)
 : handle_ (h),
   event_handler_ (eh)
 {
@@ -57,17 +57,16 @@ ACE_Event_Tuple::operator!= (const ACE_Event_Tuple &rhs) const
 }
 
 ACE_INLINE
-ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl (bool ms)
-  : handler_rep_ (*this)
-  , timer_queue_ (0)
-  , delete_timer_queue_ (0)
-  , delete_signal_handler_ (0)
-  , delete_notify_handler_ (0)
-  , requeue_position_ (-1) // Requeue at end of waiters by default.
-  , initialized_ (0)
-  , state_changed_ (0)
-  , mask_signals_ (ms)
-  , supress_renew_ (0)
+ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl ()
+    : handler_rep_ (*this),
+      timer_queue_ (0),
+      delete_timer_queue_ (0),
+      delete_signal_handler_ (0),
+      delete_notify_handler_ (0),
+      requeue_position_ (-1), // Requeue at end of waiters by default.
+      initialized_ (0),
+      state_changed_ (0),
+      supress_renew_ (0)
 {
 }
 
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 8ae95b9ebb9..d47532db04c 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -64,16 +64,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready_i
   (ACE_Select_Reactor_Handle_Set &wait_set)
 {
-  ACE_TRACE ("ACE_Select_Reactor_T::any_ready_i");
-
   int number_ready = this->ready_set_.rd_mask_.num_set ()
     + this->ready_set_.wr_mask_.num_set ()
     + this->ready_set_.ex_mask_.num_set ();
 
-  // number_ready > 0 meaning there are handles in the ready_set
-  // &wait_set != &(this->ready_set_) means that we need to copy
-  // the handles from the ready_set to the wait set because the
-  // wait_set_ doesn't contain all the handles in the ready_set_
   if (number_ready > 0 && &wait_set != &(this->ready_set_))
     {
       wait_set.rd_mask_ = this->ready_set_.rd_mask_;
@@ -542,10 +536,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
    ACE_Reactor_Notify *notify,
    int mask_signals,
    int s_queue)
-    : ACE_Select_Reactor_Impl (mask_signals)
-    , token_ (*this, s_queue)
-    , lock_adapter_ (token_)
-    , deactivated_ (0)
+    : token_ (*this, s_queue),
+      lock_adapter_ (token_),
+      deactivated_ (0),
+      mask_signals_ (mask_signals)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::ACE_Select_Reactor_T");
 
@@ -594,10 +588,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
    ACE_Reactor_Notify *notify,
    int mask_signals,
    int s_queue)
-    : ACE_Select_Reactor_Impl (mask_signals)
-    , token_ (*this, s_queue)
-    , lock_adapter_ (token_)
-    , deactivated_ (0)
+    : token_ (*this, s_queue),
+      lock_adapter_ (token_),
+      deactivated_ (0),
+      mask_signals_ (mask_signals)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::ACE_Select_Reactor_T");
 
@@ -1015,11 +1009,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_i (ACE_HANDLE handle)
       this->suspend_set_.ex_mask_.set_bit (handle);
       this->wait_set_.ex_mask_.clr_bit (handle);
     }
-
-  // Kobi: we need to remove that handle from the
-  // dispatch set as well. We use that function with all the relevant
-  // masks - rd/wr/ex - all the mask. it is completely suspended
-  this->clear_dispatch_mask (handle, ACE_Event_Handler::RWE_MASK);
   return 0;
 }
 
@@ -1184,8 +1173,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_timer_handlers
   (int &number_of_handlers_dispatched)
 {
   number_of_handlers_dispatched += this->timer_queue_->expire ();
-
-  return 0;
+  if (this->state_changed_)
+    return -1;
+  else
+    return 0;
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
@@ -1200,21 +1191,15 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_notification_handlers
   // ACE_Select_Reactor_T's internal tables or the notify pipe is
   // enabled.  We'll handle all these threads and notifications, and
   // then break out to continue the event loop.
-  int n =
-    this->notify_handler_->dispatch_notifications (number_of_active_handles,
-                                                   dispatch_set.rd_mask_);
+
+  int n = this->notify_handler_->dispatch_notifications (number_of_active_handles,
+                                                         dispatch_set.rd_mask_);
   if (n == -1)
     return -1;
   else
     number_of_handlers_dispatched += n;
 
-  // Same as dispatch_timer_handlers
-  // No need to do anything with the state changed. That is because
-  // unbind already handles the case where someone unregister some
-  // kind of handle and unbind it. (::unbind calls the function
-  // state_changed ()  to reflect ant change with that)
-  //   return this->state_changed_ ? -1 : 0;
-  return 0;
+  return this->state_changed_ ? -1 : 0;
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
@@ -1226,35 +1211,26 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_set
    ACE_Handle_Set &ready_mask,
    ACE_EH_PTMF callback)
 {
-  ACE_TRACE ("ACE_Select_Reactor_T::dispatch_io_set");
   ACE_HANDLE handle;
 
   ACE_Handle_Set_Iterator handle_iter (dispatch_mask);
 
-  while ((handle = handle_iter ()) != ACE_INVALID_HANDLE &&
-         number_of_handlers_dispatched < number_of_active_handles)
+  while ((handle = handle_iter ()) != ACE_INVALID_HANDLE
+         && number_of_handlers_dispatched < number_of_active_handles
+         && this->state_changed_ == 0)
     {
+      // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Select_Reactor_T::dispatching\n")));
       ++number_of_handlers_dispatched;
-
       this->notify_handle (handle,
                            mask,
                            ready_mask,
                            this->handler_rep_.find (handle),
                            callback);
-
-      // clear the bit from that dispatch mask,
-      // so when we need to restart the iteration (rebuilding the iterator...)
-      // we will not dispatch the already dipatched handlers
-      this->clear_dispatch_mask (handle, mask);
-
-      if (this->state_changed_)
-        {
-
-          handle_iter.reset_state ();
-          this->state_changed_ = false;
-        }
     }
 
+  if (number_of_handlers_dispatched > 0 && this->state_changed_)
+    return -1;
+
   return 0;
 }
 
@@ -1264,12 +1240,11 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers
    int &number_of_active_handles,
    int &number_of_handlers_dispatched)
 {
-  ACE_TRACE ("ACE_Select_Reactor_T::dispatch_io_handlers");
-
   // Handle output events (this code needs to come first to handle the
   // obscure case of piggy-backed data coming along with the final
   // handshake message of a nonblocking connection).
 
+  // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Select_Reactor_T::dispatch - WRITE\n")));
   if (this->dispatch_io_set (number_of_active_handles,
                              number_of_handlers_dispatched,
                              ACE_Event_Handler::WRITE_MASK,
@@ -1338,7 +1313,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch
       // every iteration (i.e., due to signals), our state starts out
       // unchanged again.
 
-      this->state_changed_ = false;
+      this->state_changed_ = 0;
 
       // Perform the Template Method for dispatching all the handlers.
 
@@ -1451,21 +1426,14 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events_i
 
   ACE_SEH_TRY
     {
-      // We use the data member dispatch_set_ as the current dispatch
-      // set.
-
-      // We need to start from a clean dispatch_set
-      this->dispatch_set_.rd_mask_.reset ();
-      this->dispatch_set_.wr_mask_.reset ();
-      this->dispatch_set_.ex_mask_.reset ();
+      ACE_Select_Reactor_Handle_Set dispatch_set;
 
       int number_of_active_handles =
-        this->wait_for_multiple_events (this->dispatch_set_,
+        this->wait_for_multiple_events (dispatch_set,
                                         max_wait_time);
 
-      result =
-        this->dispatch (number_of_active_handles,
-                        this->dispatch_set_);
+      result = this->dispatch (number_of_active_handles,
+                               dispatch_set);
     }
   ACE_SEH_EXCEPT (this->release_token ())
     {
@@ -1474,6 +1442,8 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events_i
       // <token_> lock correctly.
     }
 
+  this->state_changed_ = 1;
+
   return result;
 }
 
@@ -1534,6 +1504,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
         {
           result = 1;
           this->remove_handler_i (h, ACE_Event_Handler::ALL_EVENTS_MASK);
+          this->state_changed_ = 1;
         }
       rd_mask.clr_bit (h);
 #else /* !ACE_WIN32 && !MVS && !ACE_PSOS */
@@ -1543,6 +1514,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
         {
           result = 1;
           this->remove_handler_i (h, ACE_Event_Handler::ALL_EVENTS_MASK);
+          this->state_changed_ = 1;
         }
 #endif /* ACE_WIN32 || MVS || ACE_PSOS */
     }
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index 9ac26f75e1b..892592ee0aa 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -753,6 +753,14 @@ protected:
   /// events or not.
   sig_atomic_t deactivated_;
 
+  /**
+   * If 0 then the Reactor will not mask the signals during the event
+   * dispatching.  This is useful for applications that do not
+   * register any signal handlers and want to reduce the overhead
+   * introduce by the kernel level locks required to change the mask.
+   */
+  int mask_signals_;
+
 private:
   /// Deny access since member-wise won't work...
   ACE_UNIMPLEMENTED_FUNC (ACE_Select_Reactor_T (const ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &))
diff --git a/ace/Shared_Object.cpp b/ace/Shared_Object.cpp
index 86164c16759..596bdbc3bd9 100644
--- a/ace/Shared_Object.cpp
+++ b/ace/Shared_Object.cpp
@@ -3,7 +3,6 @@
 
 #include "ace/Shared_Object.h"
 #include "ace/Global_Macros.h"
-#include "ace/config-all.h"
 
 /* Provide the abstract base class used to access dynamic linking
    facilities */
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 24c72078cc0..5c156bc3029 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -858,7 +858,6 @@ ACE_MT (template class ACE_TSS_Guard<ACE_Recursive_Thread_Mutex>);
 ACE_MT (template class ACE_Guard<ACE_Recursive_Thread_Mutex>);
 template class ACE_Fixed_Set<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
 template class ACE_Fixed_Set_Iterator<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
-template class ACE_Fixed_Set_Iterator_Base<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 #pragma instantiate ACE_TSS_Guard<ACE_Recursive_Thread_Mutex>
@@ -866,7 +865,6 @@ template class ACE_Fixed_Set_Iterator_Base<ACE_Event_Handler *, ACE_MAX_SIGNAL_H
 #endif /* ACE_MT_SAFE */
 #pragma instantiate ACE_Fixed_Set<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>
 #pragma instantiate ACE_Fixed_Set_Iterator<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>
-#pragma instantiate ACE_Fixed_Set_Iterator_Base<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
diff --git a/ace/Signal.h b/ace/Signal.h
index 3cefd3ce112..9f802aa4ba6 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -232,10 +232,8 @@ class ACE_Export ACE_Sig_Guard
 {
 public:
   // = Initialization and termination methods.
-  /// This is kind of conditional Guard, needed when guard should be
-  /// activated only when a spcific condition met. When condition ==
-  /// true (default), Guard is activated
-  ACE_Sig_Guard (ACE_Sig_Set *mask = 0, bool condition = true);
+  /// Block out signals in <mask>.  Default is to block all signals!
+  ACE_Sig_Guard (ACE_Sig_Set *mask = 0);
 
   /// Restore blocked signals.
   ~ACE_Sig_Guard (void);
@@ -249,9 +247,6 @@ public:
 private:
   /// Original signal mask.
   ACE_Sig_Set omask_;
-
-  /// Guard Condition
-  bool condition_;
 };
 
 /**
diff --git a/ace/Signal.inl b/ace/Signal.inl
index df65d471f1c..e88f62ca4df 100644
--- a/ace/Signal.inl
+++ b/ace/Signal.inl
@@ -228,14 +228,10 @@ ACE_Sig_Action::restore_action (int signum, ACE_Sig_Action &oaction)
 // Block out the signal MASK until the destructor is called.
 
 ACE_INLINE
-ACE_Sig_Guard::ACE_Sig_Guard (ACE_Sig_Set *mask,
-                              bool condition)
+ACE_Sig_Guard::ACE_Sig_Guard (ACE_Sig_Set *mask)
   : omask_ ()
-  , condition_ (condition)
 {
   //ACE_TRACE ("ACE_Sig_Guard::ACE_Sig_Guard");
-  if (!this->condition_)
-    return;
 
 #if defined (ACE_LACKS_UNIX_SIGNALS)
   ACE_UNUSED_ARG (mask);
@@ -274,9 +270,6 @@ ACE_INLINE
 ACE_Sig_Guard::~ACE_Sig_Guard (void)
 {
   //ACE_TRACE ("ACE_Sig_Guard::~ACE_Sig_Guard");
-  if (!this->condition_)
-    return;
-
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
 #if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK)
   ACE_OS::sigprocmask (SIG_SETMASK,
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp
index 91d6cb5b89b..ba7b8900669 100644
--- a/ace/Sock_Connect.cpp
+++ b/ace/Sock_Connect.cpp
@@ -7,11 +7,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 #include "ace/OS_Memory.h"
-
-#if defined (sparc) && ! defined (CHORUS)
-#  include "ace/OS_NS_fcntl.h"
-#endif  // sparc && !CHORUS
-
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
@@ -34,7 +29,6 @@
 extern "C" {
   extern struct in_ifaddr* in_ifaddr;
 }
-#include "ace/OS_NS_stdio.h"
 #endif /* VXWORKS */
 
 #if defined (ACE_HAS_WINCE)
@@ -46,14 +40,8 @@ extern "C" {
 #    include "ace/Object_Manager.h"
 #  endif /* ACE_HAS_THREADS */
 
-namespace ACE
-{
-  // private:
-  //  Used internally so not exported.
-
-  /// Does this box have ipv6 turned on?
-  int ipv6_enabled_ = -1;
-}
+// Whether or not ipv6 is turned on in this box
+int ACE_Sock_Connect::ipv6_enabled_ = -1;
 #endif /* ACE_HAS_IPV6 */
 
 // This is a hack to work around a problem with Visual Age C++ 5 and 6 on AIX.
@@ -69,11 +57,7 @@ namespace ACE
 static ACE_Auto_Array_Ptr<sockaddr> force_compiler_to_include_socket_h;
 #endif /* AIX && __IBMCPP__ >= 500 */
 
-
-ACE_RCSID (ace,
-           Sock_Connect,
-           "$Id$")
-
+ACE_RCSID(ace, Sock_Connect, "$Id$")
 
 #if defined (ACE_WIN32) && \
     (!defined (ACE_HAS_WINSOCK2) \
@@ -273,11 +257,11 @@ get_windows_version()
 // Bind socket to an unused port.
 
 int
-ACE::bind_port (ACE_HANDLE handle,
-                             ACE_UINT32 ip_addr,
+ACE_Sock_Connect::bind_port (ACE_HANDLE handle,
+                             ACE_UINT32 ip_addr, 
                              int address_family)
 {
-  ACE_TRACE ("ACE::bind_port");
+  ACE_TRACE ("ACE_Sock_Connect::bind_port");
 
   ACE_INET_Addr addr;
 
@@ -343,12 +327,12 @@ ACE::bind_port (ACE_HANDLE handle,
 }
 
 int
-ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
+ACE_Sock_Connect::get_bcast_addr (ACE_UINT32 &bcast_addr,
                      const ACE_TCHAR *host_name,
                      ACE_UINT32 host_addr,
                      ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE::get_bcast_addr");
+  ACE_TRACE ("ACE_Sock_Connect::get_bcast_addr");
 
 #if !defined(ACE_WIN32)
   ACE_HANDLE s = handle;
@@ -378,7 +362,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
   if (ACE_OS::ioctl (s, cmd, (char *) &ifc) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_LIB_TEXT ("%p\n"),
-                       ACE_LIB_TEXT ("ACE::get_bcast_addr:")
+                       ACE_LIB_TEXT ("ACE_Sock_Connect::get_bcast_addr:")
                        ACE_LIB_TEXT ("ioctl (get interface configuration)")),
                       -1);
 
@@ -389,7 +373,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
   // Get host ip address if necessary.
   if (host_name)
     {
-      hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR (host_name));
+      hostent *hp = ACE_OS::gethostbyname (host_name);
 
       if (hp == 0)
         return -1;
@@ -419,11 +403,11 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
 #endif /* ! _UNICOS */
     }
 
-#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__)
   for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0;
        n--, ifr++)
 #else
-  // see mk_broadcast@SOCK_Dgram_Bcast.cpp
+	  // see mk_broadcast@SOCK_Dgram_Bcast.cpp
   for (int nbytes = ifc.ifc_len; nbytes >= (int) sizeof (struct ifreq) &&
         ((ifr->ifr_addr.sa_len > sizeof (struct sockaddr)) ?
           (nbytes >= (int) sizeof (ifr->ifr_name) + ifr->ifr_addr.sa_len) : 1);
@@ -432,7 +416,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
             ifr = (struct ifreq *)
               ((caddr_t) &ifr->ifr_addr + ifr->ifr_addr.sa_len)) :
           (nbytes -= sizeof (struct ifreq), ifr++)))
-#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) */
+#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) */
     {
       struct sockaddr_in if_addr;
 
@@ -448,7 +432,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_LIB_TEXT ("%p\n"),
-                      ACE_LIB_TEXT ("ACE::get_bcast_addr:")
+                      ACE_LIB_TEXT ("ACE_Sock_Connect::get_bcast_addr:")
                       ACE_LIB_TEXT ("Not AF_INET")));
           continue;
         }
@@ -460,7 +444,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_LIB_TEXT ("%p\n"),
-                      ACE_LIB_TEXT ("ACE::get_bcast_addr:")
+                      ACE_LIB_TEXT ("ACE_Sock_Connect::get_bcast_addr:")
                       ACE_LIB_TEXT (" ioctl (get interface flags)")));
           continue;
         }
@@ -469,7 +453,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_LIB_TEXT ("%p\n"),
-                      ACE_LIB_TEXT ("ACE::get_bcast_addr:")
+                      ACE_LIB_TEXT ("ACE_Sock_Connect::get_bcast_addr:")
                       ACE_LIB_TEXT ("Network interface is not up")));
           continue;
         }
@@ -484,7 +468,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
                              (char *) &if_req) == -1)
             ACE_ERROR ((LM_ERROR,
                         ACE_LIB_TEXT ("%p\n"),
-                        ACE_LIB_TEXT ("ACE::get_bcast_addr:")
+                        ACE_LIB_TEXT ("ACE_Sock_Connect::get_bcast_addr:")
                         ACE_LIB_TEXT ("ioctl (get broadaddr)")));
           else
             {
@@ -506,7 +490,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
       else
         ACE_ERROR ((LM_ERROR,
                     ACE_LIB_TEXT ("%p\n"),
-                    ACE_LIB_TEXT ("ACE::get_bcast_addr:")
+                    ACE_LIB_TEXT ("ACE_Sock_Connect::get_bcast_addr:")
                     ACE_LIB_TEXT ("Broadcast is not enable for this interface.")));
 
       if (handle == ACE_INVALID_HANDLE)
@@ -531,10 +515,10 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
 // responsible for calling delete [] on parray
 
 int
-ACE::get_ip_interfaces (size_t &count,
-                        ACE_INET_Addr *&addrs)
+ACE_Sock_Connect::get_ip_interfaces (size_t &count,
+                                     ACE_INET_Addr *&addrs)
 {
-  ACE_TRACE ("ACE::get_ip_interfaces");
+  ACE_TRACE ("ACE_Sock_Connect::get_ip_interfaces");
 
   count = 0;
   addrs = 0;
@@ -732,7 +716,7 @@ ACE::get_ip_interfaces (size_t &count,
                     }
                     if (n_interfaces == 0) {
                         ACE_ERROR_RETURN ((LM_ERROR,
-                            ACE_LIB_TEXT ("%p\nACE::get_ip_interfaces - "),
+                            ACE_LIB_TEXT ("%p\nACE_Sock_Connect::get_ip_interfaces - "),
                             ACE_LIB_TEXT ("No adapter found.")),
                             -1);
                     }
@@ -757,28 +741,28 @@ ACE::get_ip_interfaces (size_t &count,
 
         case ERROR_NOT_SUPPORTED: // OS does not support this method
             ACE_ERROR_RETURN ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\nACE::get_ip_interfaces - "),
+                ACE_LIB_TEXT ("%p\nACE_Sock_Connect::get_ip_interfaces - "),
                 ACE_LIB_TEXT ("This version of WinCE does not support GetAdapterInfo.")),
                 -1);
             break;
 
         case ERROR_NO_DATA:  // no adapter installed
             ACE_ERROR_RETURN ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\nACE::get_ip_interfaces - "),
+                ACE_LIB_TEXT ("%p\nACE_Sock_Connect::get_ip_interfaces - "),
                 ACE_LIB_TEXT ("No network adapter installed.")),
                 -1);
             break;
 
         case ERROR_INVALID_PARAMETER:
             ACE_ERROR_RETURN ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\nACE::get_ip_interfaces - "),
+                ACE_LIB_TEXT ("%p\nACE_Sock_Connect::get_ip_interfaces - "),
                 ACE_LIB_TEXT ("Invalid parameter.")),
                 -1);
             break;
 
         default:
             ACE_ERROR_RETURN ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\nACE::get_ip_interfaces - "),
+                ACE_LIB_TEXT ("%p\nACE_Sock_Connect::get_ip_interfaces - "),
                 ACE_LIB_TEXT ("Adapter info access permission denied.")),
                 -1);
             break;
@@ -1026,9 +1010,9 @@ ACE::get_ip_interfaces (size_t &count,
   if (handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_LIB_TEXT ("%p\n"),
-                       ACE_LIB_TEXT ("ACE::get_ip_interfaces:open")),
+                       ACE_LIB_TEXT ("ACE_Sock_Connect::get_ip_interfaces:open")),
                       -1);
-  if (ACE::count_interfaces (handle, num_ifs))
+  if (ACE_Sock_Connect::count_interfaces (handle, num_ifs))
     {
       ACE_OS::close (handle);
       return -1;
@@ -1070,7 +1054,7 @@ ACE::get_ip_interfaces (size_t &count,
       ACE_OS::close (handle);
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_LIB_TEXT ("%p\n"),
-                         ACE_LIB_TEXT ("ACE::get_ip_interfaces:")
+                         ACE_LIB_TEXT ("ACE_Sock_Connect::get_ip_interfaces:")
                          ACE_LIB_TEXT ("ioctl - SIOCGIFCONF failed")),
                         -1);
     }
@@ -1128,7 +1112,7 @@ ACE::get_ip_interfaces (size_t &count,
 #endif /* ! _UNICOS */
         }
 
-#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__)
       pcur++;
 #else
       if (pcur->ifr_addr.sa_len <= sizeof (struct sockaddr))
@@ -1140,7 +1124,7 @@ ACE::get_ip_interfaces (size_t &count,
            pcur = (struct ifreq *)
                (pcur->ifr_addr.sa_len + (caddr_t) &pcur->ifr_addr);
         }
-#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) */
+#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) */
     }
   return 0;
 #elif defined (VXWORKS)
@@ -1202,7 +1186,7 @@ ACE::get_ip_interfaces (size_t &count,
 // list of ifreq structs.
 
 int
-ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
+ACE_Sock_Connect::count_interfaces (ACE_HANDLE handle, size_t &how_many)
 {
 #if defined (sparc) && defined (SIOCGIFNUM)
   int tmp_how_many; // For 64 bit Solaris
@@ -1211,7 +1195,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
                      (caddr_t) &tmp_how_many) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_LIB_TEXT ("%p\n"),
-                       ACE_LIB_TEXT ("ACE::count_interfaces:")
+                       ACE_LIB_TEXT ("ACE_Sock_Connect::count_interfaces:")
                        ACE_LIB_TEXT ("ioctl - SIOCGIFNUM failed")),
                       -1);
   how_many = (size_t) tmp_how_many;
@@ -1275,7 +1259,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
       ACE_OS::free (ifcfg.ifc_req);
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_LIB_TEXT ("%p\n"),
-                         ACE_LIB_TEXT ("ACE::count_interfaces:")
+                         ACE_LIB_TEXT ("ACE_Sock_Connect::count_interfaces:")
                          ACE_LIB_TEXT ("ioctl - SIOCGIFCONF failed")),
                         -1);
     }
@@ -1294,7 +1278,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
         break;
 
       if_count++;
-#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__)
       p_ifs++;
 #else
      if (p_ifs->ifr_addr.sa_len <= sizeof (struct sockaddr))
@@ -1306,7 +1290,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
           p_ifs = (struct ifreq *)
               (p_ifs->ifr_addr.sa_len + (caddr_t) &p_ifs->ifr_addr);
        }
-#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) */
+#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) */
     }
 
   ACE_OS::free (ifcfg.ifc_req);
@@ -1322,7 +1306,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
 // Routine to return a handle from which ioctl() requests can be made.
 
 ACE_HANDLE
-ACE::get_handle (void)
+ACE_Sock_Connect::get_handle (void)
 {
   // Solaris 2.x
   ACE_HANDLE handle = ACE_INVALID_HANDLE;
@@ -1339,33 +1323,33 @@ ACE::get_handle (void)
 
 
 int
-ACE::ipv6_enabled (void)
+ACE_Sock_Connect::ipv6_enabled (void)
 {
 #if defined (ACE_HAS_IPV6)
-  if (ACE::ipv6_enabled_ == -1)
+  if (ACE_Sock_Connect::ipv6_enabled_ == -1)
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
                                 *ACE_Static_Object_Lock::instance (), 0));
 
-      if (ACE::ipv6_enabled_ == -1)
+      if (ACE_Sock_Connect::ipv6_enabled_ == -1)
         {
           // Determine if the kernel has IPv6 support by attempting to
           // create a PF_INET6 socket and see if it fails.
           ACE_HANDLE s = ACE_OS::socket (PF_INET6, SOCK_DGRAM, 0);
           if (s == ACE_INVALID_HANDLE)
             {
-              ACE::ipv6_enabled_ = 0;
+              ACE_Sock_Connect::ipv6_enabled_ = 0;
             }
           else
             {
-              ACE::ipv6_enabled_ = 1;
+              ACE_Sock_Connect::ipv6_enabled_ = 1;
               ACE_OS::closesocket (s);
             }
         }
     }
 
-  return ACE::ipv6_enabled_;
+  return ACE_Sock_Connect::ipv6_enabled_;
 #else
   return 0;
 #endif /* ACE_HAS_IPV6 */
diff --git a/ace/Sock_Connect.h b/ace/Sock_Connect.h
index 532892d64fa..1803636a2e2 100644
--- a/ace/Sock_Connect.h
+++ b/ace/Sock_Connect.h
@@ -28,14 +28,16 @@
 // Forward Declarations
 class ACE_INET_Addr;
 
-namespace ACE
+class ACE_Export ACE_Sock_Connect
 {
+ public:
+
   // = Socket connection establishment calls.
 
   /// Bind a new unused port to @a handle.
-  extern ACE_Export int bind_port (ACE_HANDLE handle,
-                                   ACE_UINT32 ip_addr = INADDR_ANY,
-                                   int address_family = AF_UNSPEC);
+  static int bind_port (ACE_HANDLE handle,
+                        ACE_UINT32 ip_addr = INADDR_ANY,
+                        int address_family = AF_UNSPEC);
 
   /**
    * Get our broadcast address based on our @a host_addr.  If
@@ -45,31 +47,30 @@ namespace ACE
    * socket internally (and free it).  Returns -1 on failure and 0 on
    * success.
    */
-  extern ACE_Export int get_bcast_addr (
-    ACE_UINT32 &bcast_addr,
-    const ACE_TCHAR *hostname = 0,
-    ACE_UINT32 host_addr = 0,
-    ACE_HANDLE handle = ACE_INVALID_HANDLE);
+  static int get_bcast_addr (ACE_UINT32 &bcast_addr,
+                             const ACE_TCHAR *hostname = 0,
+                             ACE_UINT32 host_addr = 0,
+                             ACE_HANDLE handle = ACE_INVALID_HANDLE);
 
   /**
    * Return count and array of all configured IP interfaces on this
    * host, rc = 0 on success (count == number of interfaces else -1).
    * Caller is responsible for calling delete [] on @a addr_array.
    */
-  extern ACE_Export int get_ip_interfaces (size_t &count,
-                                           ACE_INET_Addr *&addr_array);
+  static int get_ip_interfaces (size_t &count,
+                                ACE_INET_Addr *&addr_array);
 
   /**
    * Helper routine for get_ip_interfaces, differs by UNIX platform so
    * put into own subroutine.  perform some ioctls to retrieve ifconf
    * list of ifreq structs.
    */
-  extern ACE_Export int count_interfaces (ACE_HANDLE handle,
+  static int count_interfaces (ACE_HANDLE handle,
                                size_t &how_many);
 
   /// Routine to return a handle from which @c ioctl requests can be
   /// made.  Caller must close the handle.
-  extern ACE_Export ACE_HANDLE get_handle (void);
+  static ACE_HANDLE get_handle (void);
 
   /**
    * Returns 1 if IPv6 is enabled on the current host; 0 if not.
@@ -79,8 +80,14 @@ namespace ACE
    * returning 1 if it succeeds, and 0 if it fails. Caches the result
    * so it only gets checked once.
    */
-  extern ACE_Export int ipv6_enabled (void);
-}
+  static int ipv6_enabled (void);
+
+#if defined (ACE_HAS_IPV6)
+private:
+  /// Does this box have ipv6 turned on?
+  static int ipv6_enabled_;
+#endif /* ACE_HAS_IPV6 */
+};
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/Stream.h b/ace/Stream.h
index fed079368e4..c5fe5787e21 100644
--- a/ace/Stream.h
+++ b/ace/Stream.h
@@ -85,14 +85,10 @@ public:
 
   // = ACE_Stream plumbing operations
 
-  /// Add a new module <mod> right below the Stream head.  The
-  /// <open()> hook methods of the <ACE_Tasks> in this <ACE_Module>
-  /// are invoked to initialize the tasks.
+  /// Add a new module <mod> right below the Stream head.
   virtual int push (ACE_Module<ACE_SYNCH_USE> *mod);
 
   /// Remove the <mod> right below the Stream head and close it down.
-  //  The <close()> hook methods of the <ACE_Tasks> in this <ACE_Module>
-  /// are invoked to cleanup the tasks.
   virtual int pop (int flags = M_DELETE);
 
   /// Return the top module on the stream (right below the stream
diff --git a/ace/Synch_Options.cpp b/ace/Synch_Options.cpp
index d8f4e9bba9a..780c664099f 100644
--- a/ace/Synch_Options.cpp
+++ b/ace/Synch_Options.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Global_Macros.h"
-#include "ace/config-all.h"
 
 ACE_RCSID (ace,
            Synch_Options,
diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp
index dcb1480aa51..da8e6bbba07 100644
--- a/ace/System_Time.cpp
+++ b/ace/System_Time.cpp
@@ -22,7 +22,7 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname)
       ACE_OS::strcpy (this->poolname_,
                       ACE_DEFAULT_BACKING_STORE);
 #else /* ACE_DEFAULT_BACKING_STORE */
-      if (ACE::get_temp_dir (this->poolname_,
+      if (ACE_Lib_Find::get_temp_dir (this->poolname_,
                                       MAXPATHLEN - 17) == -1)
         // -17 for ace-malloc-XXXXXX
         {
@@ -82,14 +82,14 @@ ACE_System_Time::get_master_system_time (ACE_UINT32 &time_out)
       // Try to find it
       void * temp;
       if (this->shmem_->find (ACE_DEFAULT_TIME_SERVER_STR, temp) ==  -1)
-        {
-          // No time entry in shared memory (meaning no Clerk exists)
-          // so return the local time of the host.
-          return this->get_local_system_time (time_out);
-        }
+	{
+	  // No time entry in shared memory (meaning no Clerk exists)
+	  // so return the local time of the host.
+	  return this->get_local_system_time (time_out);
+	}
       else
-        // Extract the delta time.
-        this->delta_time_ = (long *) temp;
+	// Extract the delta time.
+	this->delta_time_ = (long *) temp;
     }
 
   ACE_UINT32 local_time;
@@ -141,3 +141,4 @@ template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_M
 #pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
 #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp
index af29cdca943..0a8daf74dd7 100644
--- a/ace/TP_Reactor.cpp
+++ b/ace/TP_Reactor.cpp
@@ -516,6 +516,7 @@ ACE_TP_Reactor::handle_socket_events (int &event_count,
 int
 ACE_TP_Reactor::get_event_for_dispatching (ACE_Time_Value *max_wait_time)
 {
+
   // If the reactor handler state has changed, clear any remembered
   // ready bits and re-scan from the master wait_set.
   if (this->state_changed_)
@@ -523,8 +524,7 @@ ACE_TP_Reactor::get_event_for_dispatching (ACE_Time_Value *max_wait_time)
       this->ready_set_.rd_mask_.reset ();
       this->ready_set_.wr_mask_.reset ();
       this->ready_set_.ex_mask_.reset ();
-
-      this->state_changed_ = false;
+      this->state_changed_ = 0;
     }
   else
     {
diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h
index 75a05e93fab..5833e809652 100644
--- a/ace/TP_Reactor.h
+++ b/ace/TP_Reactor.h
@@ -287,11 +287,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-  // = Internal methods that do the actual work.
 
-  /// Template method from the base class.
-  virtual void clear_dispatch_mask (ACE_HANDLE handle,
-                                    ACE_Reactor_Mask mask);
+  // = Internal methods that do the actual work.
 
   /// Dispatch just 1 signal, timer, notification handlers
   int dispatch_i (ACE_Time_Value *max_wait_time,
diff --git a/ace/TP_Reactor.inl b/ace/TP_Reactor.inl
index 08c17a7e65e..a3a9de3d1de 100644
--- a/ace/TP_Reactor.inl
+++ b/ace/TP_Reactor.inl
@@ -100,12 +100,3 @@ ACE_TP_Reactor::clear_handle_read_set (ACE_HANDLE handle)
   this->ready_set_.ex_mask_.clr_bit (handle);
   this->ready_set_.rd_mask_.clr_bit (handle);
 }
-
-ACE_INLINE void
-ACE_TP_Reactor::clear_dispatch_mask (ACE_HANDLE ,
-                                     ACE_Reactor_Mask )
-{
-  this->ready_set_.rd_mask_.reset ();
-  this->ready_set_.wr_mask_.reset ();
-  this->ready_set_.ex_mask_.reset ();
-}
diff --git a/ace/TSS_T.cpp b/ace/TSS_T.cpp
index fc25332dd1f..ac474228bda 100644
--- a/ace/TSS_T.cpp
+++ b/ace/TSS_T.cpp
@@ -29,15 +29,10 @@ ACE_ALLOC_HOOK_DEFINE(ACE_TSS)
 template <class TYPE>
 ACE_TSS<TYPE>::~ACE_TSS (void)
 {
-#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))
-  if (this->once_ != 0)
-  {
-    ACE_OS::thr_key_detach (this->key_, this);
-  }
-#else // defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))
-  // We own it, we need to delete it.
-  delete type_;
-#endif // defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))
+  // We can't call <ACE_OS::thr_keyfree> until *all* of the threads
+  // that are using that key have done an <ACE_OS::thr_key_detach>.
+  // Otherwise, we'll end up with "dangling TSS pointers."
+  ACE_OS::thr_key_detach (this);
 }
 
 template <class TYPE> TYPE *
diff --git a/ace/Task.cpp b/ace/Task.cpp
index a7fa0894b26..a5a51d0da93 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -202,12 +202,12 @@ ACE_Task_Base::svc_run (void *args)
   // Call the Task's svc() hook method.
   int svc_status = t->svc ();
   ACE_THR_FUNC_RETURN status;
-#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400)) || (defined (ACE_WIN32) && defined(__IBMCPP__))
+#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400))
   // Some compilers complain about reinterpret_cast from int to unsigned long...
   status = static_cast<ACE_THR_FUNC_RETURN> (svc_status);
 #else
   status = reinterpret_cast<ACE_THR_FUNC_RETURN> (svc_status);
-#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1400 || __IBMCPP__ */
+#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1400 */
 
 // If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke
 #if 1
diff --git a/ace/Task.h b/ace/Task.h
index 5b2580cfa9b..eea6e6f8f8e 100644
--- a/ace/Task.h
+++ b/ace/Task.h
@@ -77,8 +77,8 @@ public:
   // These methods should be overridden by subclasses if you'd like to
   // provide <Task>-specific initialization and termination behavior.
 
-  /// Hook called to initialize a task and prepare it for execution.
-  /// <args> can be used to pass arbitrary information into <open>.
+  /// Hook called to open a Task.  <args> can be used to pass arbitrary
+  /// information into <open>.
   virtual int open (void *args = 0);
 
   /**
diff --git a/ace/Time_Value.cpp b/ace/Time_Value.cpp
index 00f44a0a173..7618da2931a 100644
--- a/ace/Time_Value.cpp
+++ b/ace/Time_Value.cpp
@@ -1,4 +1,5 @@
 #include "ace/Time_Value.h"
+#include "ace/Basic_Types.h"
 
 ACE_RCSID (ace,
            Time_Value,
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index a2f7c856ef8..d523f8f8eba 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -44,10 +44,23 @@ typedef struct timespec timespec_t;
 #define ACE_ONE_SECOND_IN_USECS 1000000L
 #define ACE_ONE_SECOND_IN_NSECS 1000000000L
 
+// -------------------------------------------------------------------
+// These forward declarations are only used to circumvent a bug in
+// MSVC 6.0 compiler.  They shouldn't cause any problem for other
+// compilers and they can be removed once MS release a SP that contains
+// the fix.
+class ACE_Time_Value;
+ACE_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1,
+                                         const ACE_Time_Value &tv2);
+
+ACE_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1,
+                                         const ACE_Time_Value &tv2);
+
 // This forward declaration is needed by the set() and FILETIME() functions
 #if defined (ACE_LACKS_LONGLONG_T)
 class ACE_Export ACE_U_LongLong;
 #endif  /* ACE_LACKS_LONGLONG_T */
+// -------------------------------------------------------------------
 
 # if !defined (ACE_HAS_POSIX_TIME) && !defined (ACE_PSOS)
 // Definition per POSIX.
@@ -67,9 +80,6 @@ typedef struct timespec
 typedef struct timespec timespec_t;
 # endif /* ACE_LACKS_TIMESPEC_T */
 
-// needed for ACE_UINT64
-#include "ace/Basic_Types.h"
-
 // -------------------------------------------------------------------
 
 /**
@@ -82,15 +92,6 @@ typedef struct timespec timespec_t;
  * ACE.  These time values are typically used in conjunction with OS
  * mechanisms like <select>, <poll>, or <cond_timedwait>.
  */
-#if defined (ACE_WIN32) && defined (_WIN32_WCE)
-// Something is a bit brain-damaged here and I'm not sure what... this code
-// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC
-// complains that the operators that return ACE_Time_Value are C-linkage
-// functions that can't return a C++ class. The only way I've found to
-// defeat this is to wrap the whole class in extern "C++".
-//    - Steve Huston, 23-Aug-2004
-extern "C++" {
-#endif
 class ACE_Export ACE_Time_Value
 {
 public:
@@ -150,9 +151,7 @@ public:
   /// Converts from ACE_Time_Value format into milli-seconds format.
   /**
    * @return Sum of second field (in milliseconds) and microsecond field
-   *         (in milliseconds).  Note that this method can overflow if
-   *         the second and microsecond field values are large, so use
-   *         the msec (ACE_UINT64 &ms) method instead.
+   *         (in milliseconds).
    *
    * @note The semantics of this method differs from the sec() and
    *       usec() methods.  There is no analogous "millisecond"
@@ -160,19 +159,6 @@ public:
    */
   unsigned long msec (void) const;
 
-#if !defined (ACE_LACKS_LONGLONG_T)
-  /**
-   * @return Sum of second field (in milliseconds) and microsecond field
-   *         (in milliseconds) and return them via the @param ms parameter.
-   *
-   * @note The semantics of this method differs from the sec() and
-   *       usec() methods.  There is no analogous "millisecond"
-   *       component in an ACE_Time_Value.
-   */
-  void msec (ACE_UINT64 &ms) const;
-
-#endif /*ACE_LACKS_LONGLONG_T */
-
   /// Converts from milli-seconds format into ACE_Time_Value format.
   /**
    * @note The semantics of this method differs from the sec() and
@@ -334,9 +320,6 @@ private:
   /// Store the values as a timeval.
   timeval tv_;
 };
-#if defined (ACE_WIN32) && defined (_WIN32_WCE)
-}
-#endif
 
 /**
  * @class ACE_Countdown_Time
diff --git a/ace/Time_Value.inl b/ace/Time_Value.inl
index f139d5f7daa..8c907ce8b3f 100644
--- a/ace/Time_Value.inl
+++ b/ace/Time_Value.inl
@@ -120,17 +120,6 @@ ACE_Time_Value::msec (void) const
   return this->tv_.tv_sec * 1000 + this->tv_.tv_usec / 1000;
 }
 
-#if !defined (ACE_LACKS_LONGLONG_T)
-ACE_INLINE void
-ACE_Time_Value::msec (ACE_UINT64 &ms) const
-{
-  // ACE_OS_TRACE ("ACE_Time_Value::msec");
-  ms = this->tv_.tv_sec;
-  ms *= 1000;
-  ms += (this->tv_.tv_usec / 1000);
-}
-#endif /*ACE_LACKS_LONGLONG_T*/
-
 // Converts from milli-seconds format into Time_Value format.
 
 ACE_INLINE void
diff --git a/ace/Typed_SV_Message.inl b/ace/Typed_SV_Message.inl
index a2dde0af39e..27949626500 100644
--- a/ace/Typed_SV_Message.inl
+++ b/ace/Typed_SV_Message.inl
@@ -1,7 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/config-all.h"
+// Typed_SV_Message.i
+
 #include "ace/Global_Macros.h"
 
 template <class T> ACE_INLINE
diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp
index 64af6e9a58d..9702f1da622 100644
--- a/ace/UPIPE_Connector.cpp
+++ b/ace/UPIPE_Connector.cpp
@@ -40,7 +40,7 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
   ACE_TRACE ("ACE_UPIPE_Connector::connect");
   ACE_ASSERT (new_stream.get_handle () == ACE_INVALID_HANDLE);
 
-  ACE_HANDLE handle = ACE::handle_timed_open (timeout,
+  ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout,
                                                          addr.get_path_name (),
                                                          flags, perms);
 
@@ -64,12 +64,12 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
       // to our corresponding ACE_UPIPE_Acceptor, so he may link the
       // two streams.
       ssize_t result = ACE_OS::write (handle,
-                                      (const char *) &ustream,
-                                      sizeof ustream);
+				      (const char *) &ustream,
+				      sizeof ustream);
       if (result == -1)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT ("ACE_UPIPE_Connector %p\n"),
-                    ACE_LIB_TEXT ("write to pipe failed")));
+	ACE_ERROR ((LM_ERROR,
+		    ACE_LIB_TEXT ("ACE_UPIPE_Connector %p\n"),
+		    ACE_LIB_TEXT ("write to pipe failed")));
 
       // Wait for confirmation of stream linking.
       ACE_Message_Block *mb_p = 0;
@@ -80,15 +80,15 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
       // Do *not* coalesce the following two checks for result == -1.
       // They perform different checks and cannot be merged.
       if (result == -1)
-          ACE_ERROR ((LM_ERROR,
+	  ACE_ERROR ((LM_ERROR,
                       ACE_LIB_TEXT ("ACE_UPIPE_Connector %p\n"),
-                      ACE_LIB_TEXT ("no confirmation from server")));
+		      ACE_LIB_TEXT ("no confirmation from server")));
       else
-        // Close down the new_stream at this point in order to
-        // conserve handles.  Note that we don't need the SPIPE
-        // connection anymore since we're linked via the Message_Queue
-        // now.
-        new_stream.ACE_SPIPE::close ();
+	// Close down the new_stream at this point in order to
+	// conserve handles.  Note that we don't need the SPIPE
+	// connection anymore since we're linked via the Message_Queue
+	// now.
+	new_stream.ACE_SPIPE::close ();
       return result;
     }
 }
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 58bdf1fece2..b010fc6ca43 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -5,7 +5,6 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
   libout       = $(ACE_ROOT)/lib
   sharedname   = ACE
   dynamicflags = ACE_BUILD_DLL
-  install      = $(ACE_ROOT)/lib
 
   // This mpc file could be greatly simplified by putting the separate components
   // in subdirectories.
diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h
index 8b115c13cb6..a2eb7b91511 100644
--- a/ace/ace_wchar.h
+++ b/ace/ace_wchar.h
@@ -50,9 +50,6 @@
 #endif /* ACE_LEGACY_MODE */
 
 #if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
-#  if !defined (ACE_HAS_WCHAR)
-#    define ACE_HAS_WCHAR
-#  endif
 #  include /**/ <wchar.h>
 #endif /* ACE_HAS_XPG4_MULTIBYPTE_CHAR */
 
@@ -62,9 +59,6 @@
 #   include /**/ <stdlib.h>         /* For mbstowcs, etc. */
 #   include /**/ <string.h>         /* For strlen */
 #   define wint_t unsigned int      /* VxWorks has wchar_t but not wint_t */
-# elif defined (ACE_OPENVMS)
-#   include /**/ <wchar.h>
-#   include /**/ <wctype.h>
 # elif defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \
     (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
 #   include /**/ <cwchar>
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index 2e4ba28e98c..4a18f7a8fba 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -23,14 +23,11 @@
 # error ACE requires Windows CE 3.0 and later.
 #endif  // UNDER_CE
 
-#if (UNDER_CE < 400)
 // CE 3 doesn't have Winsock 2, but CE 4 does.
+#if (UNDER_CE < 400)
 # if !defined (ACE_HAS_WINSOCK2)
 #  define ACE_HAS_WINSOCK2 0
 # endif
-# define ACE_LACKS_ASSERT_H
-# define ACE_LACKS_SEARCH_H
-# define ACE_LACKS_WCHAR_H
 #endif /* UNDER_CE < 400 */
 
 #if !defined (ACE_HAS_WINCE)
@@ -193,8 +190,6 @@
 #define ACE_LACKS_CHDIR
 #define ACE_LACKS_ENV
 #define ACE_LACKS_HOSTNAME
-#define ACE_LACKS_REALPATH
-#define ACE_LACKS_SWAB
 
 #if defined (_WIN32_WCE_EMULATION)
 // @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl)
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 6358813be38..bd4641ad3d4 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -252,15 +252,8 @@
 
 #define ACE_HAS_UTIME
 
-// Platform has XPG4 wide character type and functions. However, the size
-// of wchar_t changes for 32- vs. 64-bit builds (unsigned short vs. unsigned
-// int, respectively).
+// Platform has XPG4 wide character type and functions
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
-#ifdef __64BIT__
-#  define ACE_SIZEOF_WCHAR 4
-#else
-#  define ACE_SIZEOF_WCHAR 2
-#endif /* __64BIT__ */
 
 #define ACE_LACKS_NETINET_TCP_H
 
@@ -316,7 +309,7 @@
 
 #define ACE_MALLOC_ALIGN 8
 
-#if (_XOPEN_SOURCE >= 500) && !defined(_UNIX95)
+#if (_XOPEN_SOURCE == 500) && !defined(_UNIX95)
 # define ACE_HAS_3_PARAM_WCSTOK
 #endif /* _XOPEN_SOURCE == 500 && !_UNIX95 */
 
diff --git a/ace/config-aix-5.x.h b/ace/config-aix-5.x.h
index 9f6cc07c3af..21c305745e7 100644
--- a/ace/config-aix-5.x.h
+++ b/ace/config-aix-5.x.h
@@ -2,9 +2,6 @@
 //
 // Config file for AIX 5.1 and 5.2.
 
-#ifndef ACE_CONFIG_AIX_5_X_H
-#define ACE_CONFIG_AIX_5_X_H
-
 // This define is needed for building with Visual Age C++ 5 in incremental
 // mode. In the batch mode build, platform_aix_ibm.GNU sets it. The incremental
 // mode compiler won't be supported after ACE 5.3, so this will also go away
@@ -43,7 +40,3 @@
 #if (defined (_AIX) && defined (__GNUC__))
 #define ACE_HAS_POSIX_GETPWNAM_R
 #endif /* (defined (_AIX) && defined (__GNUC__)) */
-
-#define ACE_HAS_TIMEZONE  /* Call tzset() to set timezone */
-
-#endif /* ACE_CONFIG_AIX_5_X_H */
diff --git a/ace/config-all.h b/ace/config-all.h
index 165761fc0ef..0c0bb5e7c9b 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -59,6 +59,10 @@
 # define ACE_NOTSUP do { errno = ENOTSUP; return; } while (0)
 #endif /* ! ACE_HAS_VERBOSE_NOTSUP */
 
+// These includes are here to avoid circular dependencies.
+// Keep this at the bottom of the file.  It contains the main macros.
+#include "ace/OS_main.h"
+
 // ----------------------------------------------------------------
 
 # define ACE_TRACE_IMPL(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__))
@@ -95,10 +99,6 @@
 #  include "ace/Trace.h"
 #endif /* ACE_OS_NTRACE */
 
-// These includes are here to avoid circular dependencies.
-// Keep this at the bottom of the file.  It contains the main macros.
-#include "ace/OS_main.h"
-
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_ALL_H */
diff --git a/ace/config-chorus.h b/ace/config-chorus.h
index 6f534c51a06..99a2e580869 100644
--- a/ace/config-chorus.h
+++ b/ace/config-chorus.h
@@ -71,7 +71,7 @@
 # define ACE_LACKS_LONGLONG_T
 #endif
 
-#define ACE_HAS_NONCONST_READV
+#define ACE_HAS_BROKEN_READV
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_DIRENT
@@ -101,7 +101,7 @@
 #define ACE_LACKS_MPROTECT
 #define ACE_LACKS_MSYNC
 #define ACE_LACKS_NAMED_POSIX_SEM
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 #define ACE_LACKS_READDIR_R
 #define ACE_LACKS_READV
 #define ACE_LACKS_RLIMIT
diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h
index f6962309bd0..230a42ecd1d 100644
--- a/ace/config-cygwin32.h
+++ b/ace/config-cygwin32.h
@@ -123,8 +123,9 @@
 
 #define ACE_LACKS_MKFIFO
 
+// Cygwin has no siginfo.h
 #define ACE_LACKS_SIGINFO_H
-
+// Cygwin has no ucontext.h
 #define ACE_LACKS_UCONTEXT_H
 
 #define ACE_LACKS_STROPTS_H
@@ -136,9 +137,6 @@
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIGINFO_T
 
-#define ACE_HAS_POSIX_SEM
-#define ACE_LACKS_NAMED_POSIX_SEM
-
 // Cygwin DLL suffix is .dll
 #define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dll")
 
diff --git a/ace/config-dgux-4.11-epc.h b/ace/config-dgux-4.11-epc.h
index 1168f6d03a7..7f0a01ee5ae 100644
--- a/ace/config-dgux-4.11-epc.h
+++ b/ace/config-dgux-4.11-epc.h
@@ -32,7 +32,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-// #define ACE_HAS_SYS_SYSCALL_H
+// #define ACE_HAS_SYSCALL_H
 
 // Platform supports reentrant functions (i.e., all the POSIX *_r functions).
 #define ACE_HAS_REENTRANT_FUNCTIONS
@@ -81,7 +81,7 @@
 #define ACE_HAS_SIGINFO_T
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index 41e1bd527cf..a39d8bd83cd 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -81,7 +81,7 @@
 #define ACE_HAS_SIGINFO_T
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h
index ea171b4a78f..389d1f9a6e6 100644
--- a/ace/config-freebsd.h
+++ b/ace/config-freebsd.h
@@ -117,7 +117,7 @@ extern "C" { char * cuserid (char *s); }
 #define ACE_HAS_SYSV_IPC
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 #if (__FreeBSD_version >= 300000)
 #define ACE_HAS_SIGINFO_T
@@ -190,7 +190,7 @@ extern "C" { char * cuserid (char *s); }
 #define ACE_HAS_STRERROR
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
@@ -265,6 +265,12 @@ typedef union sigval sigval_t;
 #define ACE_LACKS_ITOW
 #define ACE_HAS_3_PARAM_WCSTOK
 
+// Even though we do have tolower, we have a conflict when ACE_HAS_WCHAR is defined.
+#define ACE_LACKS_TOWLOWER
+
+// Even though we do have toupper, we have a conflict when ACE_HAS_WCHAR is defined.
+#define ACE_LACKS_TOWUPPER
+
 #if (__FreeBSD_version >= 501000)
 #  define ACE_HAS_PTHREAD_SETSTACK
 #endif
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 9937e35c0e3..0b49b272e19 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -90,9 +90,9 @@
 # define ACE_HAS_PENTIUM
 #endif /* i386 */
 
-// // GNU g++ 3.4.x implements "#pragma once".
+// GNU g++ 3.4.x implements "#pragma once".
 // #if (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)) && !defined (ACE_LACKS_PRAGMA_ONCE)
-// // We define it with a -D with make depend.
+//   // We define it with a -D with make depend.
 // # define ACE_LACKS_PRAGMA_ONCE
 // #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index 1f36459ddc9..628307e98fd 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -67,7 +67,7 @@ extern int h_errno;     /* This isn't declared in a header file on HP-UX */
 #define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 // But doesn't have a prototype for syscall()
 #define ACE_LACKS_SYSCALL
 
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index 63a08044532..5e812f3df7f 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -125,7 +125,6 @@
 // new(nothrow_t) is offered.
 #    define ACE_NEW_THROWS_EXCEPTIONS
 #    define ACE_HAS_NEW_NOTHROW
-#    define ACE_HAS_NEW_NO_H 1
 
 // Compiler's template mechanism must see source code (i.e., .C files).
 #    define ACE_TEMPLATES_REQUIRE_SOURCE
@@ -135,8 +134,6 @@
 // ... and uses the template<> syntax
 #    define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
 
-#    define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-
 // Preprocessor needs some help with data types
 #    if defined (__LP64__)
 #      define ACE_SIZEOF_LONG 8
@@ -210,6 +207,12 @@
 // It can also be set so that the mapped region is shareable with 32-bit
 // programs.  To enable the 32/64 sharing, comment out the first definition
 // of ACE_DEFAULT_BASE_ADDR and uncomment the two lines after it.
+// Note - there's a compiler bug on aC++ A.03.04 in 64-bit mode which prevents
+// these from working as-is.  So, there's some hackery in Naming_Context.cpp
+// and Memory_Pool.cpp which works around it.  It requires the
+// ACE_DEFAULT_BASE_ADDRL definition below - make sure it has the same
+// value as what you use for ACE_DEFAULT_BASE_ADDR.  This is allegedly fixed
+// in A.03.10 on the June Applications CD.
 #if defined (__LP64__)
 #  define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000)
 //#  define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
@@ -230,9 +233,6 @@
 #  define ACE_INFINITE 10000000
 #endif
 
-/* Compiler/platform correctly calls init()/fini() for shared libraries. */
-#define ACE_HAS_AUTOMATIC_INIT_FINI 1
-
 // Manually tweak the malloc control block paddings to properly align
 // things.
 #define ACE_MALLOC_PADDING 16
@@ -240,10 +240,7 @@
 #define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS  3
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
-
-#define ACE_HAS_SYS_PSTAT_H
-
+#define ACE_HAS_SYSCALL_H
 // But doesn't have a prototype for syscall()
 #define ACE_LACKS_SYSCALL
 
@@ -273,12 +270,6 @@
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
 
-/* Platform defines MAP_FAILED as a long constant. */
-#define ACE_HAS_LONG_MAP_FAILED 1
-
-/* Define to 1 if platform has memchr(). */
-#define ACE_HAS_MEMCHR 1
-
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
 
@@ -288,26 +279,12 @@
 // Compiler/platform supports poll().
 #define ACE_HAS_POLL
 
-/* Platform supports "position-independent" features provided by
-   ACE_Based_Pointer<>. */
-#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
-
-/* Platform supports POSIX getpwnam_r() function */
-#define ACE_HAS_POSIX_GETPWNAM_R 1
-
 // Platform supports POSIX O_NONBLOCK semantics.
 #define ACE_HAS_POSIX_NONBLOCK
 
 // Platform supports the POSIX struct timespec type
 #define ACE_HAS_POSIX_TIME
 
-/* Platform has pread() and pwrite() support. */
-#define ACE_HAS_P_READ_WRITE 1
-
-/* Platform will recurse infinitely on thread exits from TSS cleanup routines
-   (e.g., AIX) */
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1
-
 // Platform supports reentrant functions (all the POSIX *_r functions).
 #define ACE_HAS_REENTRANT_FUNCTIONS
 // ctime_r and asctime_r conform to POSIX.1c (2 param version)
@@ -321,36 +298,21 @@
 // in the future (problem ID P64).
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 
-/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */
-#define ACE_LACKS_PRI_T 1
-
 // Platform has shm_open
 #define ACE_HAS_SHM_OPEN
 
 // Compiler/platform defines the sig_atomic_t typedef
 #define ACE_HAS_SIG_ATOMIC_T
 
-/* Compiler requires extern "C" functions for signals. */
-#define ACE_HAS_SIG_C_FUNC 1
-
 // Platform's sigaction() function takes const sigaction* as 2nd parameter.
 #define ACE_HAS_SIGACTION_CONSTP2
 
 // Platform supports SVR4 extended signals
 #define ACE_HAS_SIGINFO_T
 
-/* Define to 1 if platform has sigsuspend(). */
-#define ACE_HAS_SIGSUSPEND 1
-
 // Platform doesn't detect a signal out of range unless it's way out of range.
 #define ACE_HAS_SIGISMEMBER_BUG
 
-/* Platform provides socklen_t type, such as Linux with glibc2. */
-#define ACE_HAS_SOCKLEN_T 1
-
-/* Platform/compiler supports _sys_errlist symbol */
-#define ACE_HAS_SYS_ERRLIST 1
-
 #define ACE_HAS_UALARM
 
 // Platform supports ucontext_t (which is used in the extended signal API).
@@ -362,24 +324,17 @@
 // Platform/compiler supports void * as second parameter to gettimeofday().
 #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
-/* Platform requires void * for mmap(). */
-#define ACE_HAS_VOIDPTR_MMAP 1
-
-/* OS/compiler uses void * arg 4 setsockopt() rather than const char * */
-#define ACE_HAS_VOIDPTR_SOCKOPT 1
-
 // Platform supports SVR4 dynamic linking semantics, in 64-bit mode only.
 // When used, this requires -ldl on the ACE library link line.
 #ifdef __LP64__
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #endif
 
-// Platform supports the getrusage() system call.
+// HP/UX has an undefined syscall for GETRUSAGE...
+#define ACE_HAS_SYSCALL_GETRUSAGE
+// Note, this only works if the flag is set above!
 #define ACE_HAS_GETRUSAGE
 
-/* Define to 1 if platform has the declaration of getrusage(). */
-#define ACE_HAS_GETRUSAGE_PROTOTYPE 1
-
 // Platform has the sigwait function in a header file
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIGTIMEDWAIT
@@ -417,8 +372,6 @@
 // But the putmsg signature doesn't have it as const...
 // Well, it really does, but it depends on preprocessor defines.
 #define ACE_LACKS_CONST_STRBUF_PTR
-/* Platform supports TLI timod STREAMS module */
-#define ACE_HAS_TIMOD_H 1
 
 // Platform supports STREAM pipes
 // This is possible, but not by default - need to rebuild the kernel to
@@ -439,8 +392,6 @@
 // The definitions of TCP_NODELAY and TCP_MAXSEG conflict between
 // sys/xti.h and netinet/tcp.h.
 #define ACE_HAS_CONFLICTING_XTI_MACROS
-/* Platform provides <sys/xti.h> header */
-#define ACE_HAS_SYS_XTI_H 1
 
 /////////////////////////////////////////////////////////////////////////
 //
@@ -475,7 +426,6 @@
 #  define ACE_HAS_PTHREADS_STD
 #  define ACE_HAS_PTHREADS_UNIX98_EXT
 #  define ACE_HAS_PTHREAD_CONTINUE
-#  define ACE_HAS_PTHREAD_RESUME_NP
 #  define ACE_HAS_PTHREAD_SUSPEND
 #  define ACE_HAS_RECURSIVE_MUTEXES
 #  define ACE_HAS_THREAD_SPECIFIC_STORAGE
diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h
new file mode 100644
index 00000000000..843c4fed432
--- /dev/null
+++ b/ace/config-hpux11.h
@@ -0,0 +1,245 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for HP
+// platforms running HP/UX 11.x.  It includes all of the ACE information
+// needed for HP-UX 11.x itself.  The compiler-specific information is in
+// config-hpux-11.x-<compiler>.h - they include this file.
+
+#ifndef ACE_CONFIG_H
+#error "You need to use a compiler-specific .h file - they include this file"
+#endif
+
+// Compiling for HPUX.
+#if !defined (HPUX)
+#define HPUX
+#endif /* HPUX */
+#define HPUX_11
+
+#ifndef _HPUX_SOURCE
+#define _HPUX_SOURCE
+#include /**/ "ace/pre.h"
+#endif
+
+#include /**/ <sys/stdsyms.h>
+
+////////////////////////////////////////////////////////////////////////////
+//
+// General OS information - see README for more details on what they mean
+//
+///////////////////////////////////////////////////////////////////////////
+
+// HP/UX needs to have these addresses in a special range.
+// If this is on a 64-bit model, the default is to use 64-bit addressing.
+// It can also be set so that the mapped region is shareable with 32-bit
+// programs.  To enable the 32/64 sharing, comment out the first definition
+// of ACE_DEFAULT_BASE_ADDR and uncomment the two lines after it.
+// Note - there's a compiler bug on aC++ A.03.04 in 64-bit mode which prevents
+// these from working as-is.  So, there's some hackery in Naming_Context.cpp
+// and Memory_Pool.cpp which works around it.  It requires the
+// ACE_DEFAULT_BASE_ADDRL definition below - make sure it has the same
+// value as what you use for ACE_DEFAULT_BASE_ADDR.  This is allegedly fixed
+// in A.03.10 on the June Applications CD.
+#if defined (__LP64__)
+#  define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000)
+//#  define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
+//#  define ACE_OS_EXTRA_MMAP_FLAGS MAP_ADDR32
+
+#  define ACE_DEFAULT_BASE_ADDRL (0x0000001100000000)
+//#  define ACE_DEFAULT_BASE_ADDRL (0x80000000)
+#else
+#  define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
+#endif  /* __LP64__ */
+
+// Platform can do async I/O (aio_*)
+#define ACE_HAS_AIO_CALLS
+// ... but seems to require this in order to keep from hanging.  Needs some
+// investigation, maybe with HP.  John Mulhern determined this value
+// empirically.  YMMV.  If it does vary, set it up in your own config.h which
+// then includes the ACE-supplied config.
+#if !defined (ACE_INFINITE)
+#  define ACE_INFINITE 10000000
+#endif
+
+// Compiler/platform contains the <sys/syscall.h> file.
+#define ACE_HAS_SYSCALL_H
+// But doesn't have a prototype for syscall()
+#define ACE_LACKS_SYSCALL
+
+// Platform supports POSIX 1.b clock_gettime ()
+#define ACE_HAS_CLOCK_GETTIME
+
+// Prototypes for both signal() and struct sigaction are consistent.
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+// Compiler/platform has Dirent iterator functions.
+#define ACE_HAS_DIRENT
+
+// Platform supports getpagesize() call
+#define ACE_HAS_GETPAGESIZE
+// But we define this just to be safe
+#define ACE_PAGE_SIZE 4096
+
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
+// Platform's select() has non-const timeval argument
+#define ACE_HAS_NONCONST_SELECT_TIMEVAL
+
+// Compiler/platform supports poll().
+#define ACE_HAS_POLL
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Platform supports the POSIX struct timespec type
+#define ACE_HAS_POSIX_TIME
+
+// Platform supports reentrant functions (all the POSIX *_r functions).
+#define ACE_HAS_REENTRANT_FUNCTIONS
+
+// HP-UX 11 has reentrant netdb functions.  The catch is that the old
+// functions (gethostbyname, etc.) are thread-safe and the _r versions are
+// not used and will be removed at some point.  So, define things so
+// the _r versions are not used.  This will slow things down a bit due to
+// the extra mutex lock in the ACE_NETDBCALL_RETURN macro, and will be fixed
+// in the future (problem ID P64).
+#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
+
+// Compiler/platform defines the sig_atomic_t typedef
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Platform supports SVR4 extended signals
+#define ACE_HAS_SIGINFO_T
+
+// Platform doesn't detect a signal out of range unless it's way out of range.
+#define ACE_HAS_SIGISMEMBER_BUG
+
+#define ACE_HAS_UALARM
+
+// Platform supports ucontext_t (which is used in the extended signal API).
+#define ACE_HAS_UCONTEXT_T
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// Platform/compiler supports void * as second parameter to gettimeofday().
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
+
+// Platform supports SVR4 dynamic linking semantics, in 64-bit mode only.
+// When used, this requires -ldl on the ACE library link line.
+#ifdef __LP64__
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+#endif
+
+// HP/UX has an undefined syscall for GETRUSAGE...
+#define ACE_HAS_SYSCALL_GETRUSAGE
+// Note, this only works if the flag is set above!
+#define ACE_HAS_GETRUSAGE
+
+// Platform has the sigwait function in a header file
+#define ACE_HAS_SIGWAIT
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+// accept() is thread-safe
+#define ACE_HAS_THREAD_SAFE_ACCEPT
+
+// Platform has XPG4 wide character support
+#define ACE_HAS_XPG4_MULTIBYTE_CHAR
+
+// Platform lacks a typedef for timespec_t, but has struct timespec
+#define ACE_LACKS_TIMESPEC_T
+
+// Shared library name/path components
+#define ACE_DLL_SUFFIX  ".sl"
+#if defined (__LP64__)
+#  define ACE_LD_SEARCH_PATH "LD_LIBRARY_PATH"
+#else
+#  define ACE_LD_SEARCH_PATH "SHLIB_PATH"
+#endif  /* __LP64__ */
+
+//////////////////////////////////////////////////////////////////////////
+//
+// STREAMS information
+//
+//////////////////////////////////////////////////////////////////////////
+
+// Platform supports STREAMS
+#define ACE_HAS_STREAMS
+// Compiler/platform supports struct strbuf.
+#define ACE_HAS_STRBUF_T
+// But the putmsg signature doesn't have it as const...
+// Well, it really does, but it depends on preprocessor defines.
+#define ACE_LACKS_CONST_STRBUF_PTR
+
+// Platform supports STREAM pipes
+// This is possible, but not by default - need to rebuild the kernel to
+// get them enabled - see pipe(2) and "STREAMS/UX for the HP 9000"
+// #define ACE_HAS_STREAM_PIPES
+
+/////////////////////////////////////////////////////////////////////////
+//
+// TLI/XTI information
+//
+////////////////////////////////////////////////////////////////////////
+
+// Platform supports XTI (includes TLI), including SVR4 facilities.
+#define ACE_HAS_TLI
+// ACE_HAS_SVR4_TLI should work on HP-UX, but doesn't yet.  Riverace
+// problem ID P27.
+//#define ACE_HAS_SVR4_TLI
+// Platform uses <xti.h>, not tiuser.h
+#define ACE_HAS_XTI
+// But it has _terrno() outside the extern "C" stuff.
+#define ACE_HAS_TIUSER_H_BROKEN_EXTERN_C
+// Platform provides ACE_TLI function prototypes.
+#define ACE_HAS_TLI_PROTOTYPES
+// HP-UX 11.00 (at least at initial releases) has some busted macro defs
+#define ACE_HAS_BROKEN_XTI_MACROS
+// HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the
+// errmsg not being const...
+#define ACE_HAS_BROKEN_T_ERROR
+
+/////////////////////////////////////////////////////////////////////////
+//
+// Threads information.
+//
+// Use of threads is controlled by the 'threads' argument to make.  See
+// include/makeinclude/platform_hpux_aCC.GNU for details. If it's not set,
+// the default is to enable it, since kernel threads are always available
+// on HP-UX 11, as opposed to 10.x where it was optional software.
+//
+////////////////////////////////////////////////////////////////////////
+
+#if defined (ACE_HAS_THREADS)
+#  if (ACE_HAS_THREADS == 0)
+#    undef ACE_HAS_THREADS
+#  endif /* ACE_HAS_THREADS == 0 */
+#else
+#  define ACE_HAS_THREADS
+#endif /* ACE_HAS_THREADS */
+
+#if defined (ACE_HAS_THREADS)
+
+#  if !defined (ACE_MT_SAFE)
+#    define ACE_MT_SAFE 1
+#  endif
+
+#  define ACE_HAS_PTHREADS
+#  define ACE_HAS_PTHREADS_STD
+#  define ACE_HAS_PTHREADS_UNIX98_EXT
+
+#  define ACE_HAS_THREAD_SPECIFIC_STORAGE
+#endif /* ACE_HAS_THREADS */
+
+#define ACE_HAS_POSIX_SEM
+
+#include /**/ "ace/post.h"
diff --git a/ace/config-icc-common.h b/ace/config-icc-common.h
index ec6614d365f..f599992bacd 100644
--- a/ace/config-icc-common.h
+++ b/ace/config-icc-common.h
@@ -11,7 +11,6 @@
 # define ACE_HAS_TEMPLATE_TYPEDEFS
 # define ACE_HAS_TYPENAME_KEYWORD
 # define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-# define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_HAS_TEMPLATE_SPECIALIZATION
 # define ACE_HAS_USING_KEYWORD
diff --git a/ace/config-integritySCA.h b/ace/config-integritySCA.h
index 990987673ef..62456383599 100644
--- a/ace/config-integritySCA.h
+++ b/ace/config-integritySCA.h
@@ -35,6 +35,7 @@
 #define _REENTRANT
 #define ACE_MT_SAFE 1
 #define __ACE_INLINE__
+#define ACE_HAS_ONE_DEFINITION_RULE
 
 // Compiler/platform has correctly prototyped header files.
 #define ACE_HAS_CPLUSPLUS_HEADERS
@@ -97,6 +98,7 @@
 #define ACE_LACKS_MUTEXATTR_PSHARED
 #define ACE_LACKS_PIPE
 #define ACE_LACKS_RLIMIT
+#define ACE_LACKS_RPC_H
 #define ACE_LACKS_RECVMSG
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SEMBUF_T
@@ -110,6 +112,7 @@
 #endif
 #define ACE_LACKS_FILE_FCNTL
 #define ACE_LACKS_FCNTL
+#define ACE_LACKS_SYS_FILE_H
 #if 0
 #define ACE_LACKS_DIRECTORY_FUNCTIONS
 #define ACE_LACKS_UNLINK
@@ -129,7 +132,7 @@
 #define ACE_LACKS_PID_STUFF
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_IPC_H
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 #define ACE_LACKS_SYS_MSG_H
 #define ACE_LACKS_UTSNAME_T
 #define ACE_LACKS_ISATTY
diff --git a/ace/config-irix5.2.h b/ace/config-irix5.2.h
index cdb1fb49bdd..c3027e86065 100644
--- a/ace/config-irix5.2.h
+++ b/ace/config-irix5.2.h
@@ -28,7 +28,7 @@
 #define ACE_HAS_VOIDPTR_MMAP
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index a3034d95583..51a5762e9b7 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -36,7 +36,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform supports alloca()
 // Although ACE does have alloca() on this compiler/platform combination, it is
diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h
index 8be382ce9f4..7cfa35e77ec 100644
--- a/ace/config-irix5.3-sgic++.h
+++ b/ace/config-irix5.3-sgic++.h
@@ -37,7 +37,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform supports alloca()
 // Although ACE does have alloca() on this compiler/platform combination, it is
diff --git a/ace/config-irix6.x-common.h b/ace/config-irix6.x-common.h
index 7f7e172a8c1..103f6e9771e 100644
--- a/ace/config-irix6.x-common.h
+++ b/ace/config-irix6.x-common.h
@@ -75,7 +75,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform supports snprintf
 #define ACE_HAS_SNPRINTF
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 3be0898f3a5..915b26d60ef 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -32,10 +32,8 @@
 // First the machine specific part
 
 #if defined (__alpha)
-# if __GLIBC_MINOR__ < 2
   // This is necessary on Alphas with glibc 2.0.7-13.
 # define ACE_POLL_IS_BROKEN
-# endif
 #elif defined (__powerpc__)
 # if !defined (ACE_DEFAULT_BASE_ADDR)
 #   define ACE_DEFAULT_BASE_ADDR ((char *) 0x40000000)
@@ -51,7 +49,7 @@
 // Then glibc/libc5 specific parts
 
 #if defined(__GLIBC__)
-# define ACE_HAS_NONCONST_SETRLIMIT
+# define ACE_HAS_BROKEN_SETRLIMIT
 # define ACE_HAS_RUSAGE_WHO_ENUM enum __rusage_who
 # define ACE_HAS_RLIMIT_RESOURCE_ENUM enum __rlimit_resource
 # define ACE_HAS_SOCKLEN_T
@@ -207,6 +205,8 @@
 #define ACE_LACKS_ITOW
 #define ACE_LACKS_WCSICMP
 #define ACE_LACKS_WCSNICMP
+#define ACE_LACKS_TOWLOWER
+#define ACE_LACKS_TOWUPPER
 
 #if __GLIBC__ >= 2
 # define ACE_HAS_3_PARAM_WCSTOK
@@ -227,7 +227,7 @@
 
 // Compiler/platform has the getrusage() system call.
 #define ACE_HAS_GETRUSAGE
-#define ACE_HAS_GETRUSAGE_PROTOTYPE
+#define ACE_HAS_GETRUSAGE_PROTO
 
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
@@ -269,6 +269,9 @@
 
 #endif
 
+// glibc supports the mkstemp() function.
+#define ACE_HAS_MKSTEMP
+
 // glibc requires _XOPEN_SOURCE_EXTENDED to make this prototype
 // visible, so force ACE to declare one.  Yuk!
 #define ACE_LACKS_MKSTEMP_PROTOTYPE
@@ -276,10 +279,6 @@
 // Platform defines struct timespec but not timespec_t
 #define ACE_LACKS_TIMESPEC_T
 
-// Platform supplies scandir()
-#define ACE_HAS_SCANDIR
-#define ACE_SCANDIR_CMP_USES_VOIDPTR
-
 //#define ACE_LACKS_STRRECVFD
 #define ACE_HAS_STRBUF_T
 
@@ -293,10 +292,7 @@
 #define ACE_HAS_SYSV_IPC
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
-
-// Platform/compiler supports global timezone variable.
-#define ACE_HAS_TIMEZONE
+#define ACE_HAS_SYSCALL_H
 
 // Platform/compiler supports void * as second parameter to gettimeofday().
 #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
@@ -325,7 +321,7 @@
 
 #define ACE_HAS_DIRENT
 
-#if defined (__ia64) || defined(__alpha)
+#if defined (__ia64)
 // On 64 bit platforms, the "long" type is 64-bits.  Override the
 // default 32-bit platform-specific format specifiers appropriately.
 # define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
diff --git a/ace/config-lite.h b/ace/config-lite.h
index 026671f9e84..07116fcf89a 100644
--- a/ace/config-lite.h
+++ b/ace/config-lite.h
@@ -125,12 +125,6 @@
 #   define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
 # endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS */
 
-# if !defined (ACE_HAS_PROCESS_SPAWN)
-#   if !defined (ACE_LACKS_FORK) || defined (ACE_WIN32) || defined (ACE_WINCE) || defined (ACE_OPENVMS) || defined (CHORUS)
-#     define ACE_HAS_PROCESS_SPAWN 1
-#   endif
-# endif /* ACE_HAS_PROCESS_SPAWN */
-
 // =========================================================================
 // RCSID Macros
 // =========================================================================
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index f36147fb310..1e2f6f34a10 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -1,7 +1,7 @@
 // $Id$
 
 // The following configuration file is designed to work for LynxOS,
-// version 3.0.0 and later, using the GNU g++ compiler.
+// version 2.5.0 and later, using the GNU g++ compiler.
 
 // Note on why ACE_HAS_POSIX_SEM is not #defined:
 // ACE_HAS_POSIX_SEM would cause native LynxOS mutexes and condition
@@ -21,9 +21,31 @@
 #endif /* ! __ACE_INLINE__ */
 
 #if defined (__GNUG__)
-# include "ace/config-g++-common.h"
+# if __GNUC_MINOR__ == 7
+
+#   include "ace/config-g++-common.h"
+
+    // The g++ that's distributed with LynxOS 3.0.0 needs this.
+    // It won't hurt with 2.5.0.
+#   undef ACE_HAS_TEMPLATE_SPECIALIZATION
+# elif __LYNXOS_SDK_VERSION <= 199603L
+    /* LynxOS <= 2.5.0 */
+    // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+    // this must appear before its #include.
+
+    // If ACE_HAS_STRING_CLASS is used with LynxOS 3.0.0, some
+    // executables, such as IOStream_Test, require linking with
+    // libg++.
+#   define ACE_HAS_STRING_CLASS
+
+#   include "ace/config-g++-common.h"
+# endif /* __GNUC_MINOR__ == 7 */
 #endif /* __GNUG__ */
 
+#if defined ( __LYNXOS_SDK_VERSION ) &&  ( __LYNXOS_SDK_VERSION <= 199701L )
+# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 0
+#endif /* __LYNXOS_SDK_VERSION */
+
 #if _POSIX_VERSION >= 199506L
   // LynxOS 3.1.0 or greater need ipc_1c.h to be included before net/if.h
   // to avoid macro conflict.
@@ -45,9 +67,9 @@
 #define ACE_HAS_ALLOCA
 #define ACE_HAS_ALLOCA_H
 #define ACE_HAS_AUTOMATIC_INIT_FINI
-#define ACE_HAS_NONCONST_READV
-#define ACE_HAS_NONCONST_SETRLIMIT
-#define ACE_HAS_NONCONST_WRITEV
+#define ACE_HAS_BROKEN_READV
+#define ACE_HAS_BROKEN_SETRLIMIT
+#define ACE_HAS_BROKEN_WRITEV
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_DIRENT
@@ -71,7 +93,7 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STRBUF_T
 #define ACE_HAS_STREAMS
@@ -81,24 +103,16 @@
 #define ACE_HAS_TERM_IOCTLS
 #define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
-#define ACE_LACKS_SWAB_PROTOTYPE
 #define ACE_LACKS_CONST_TIMESPEC_PTR
-#define ACE_LACKS_GETOPT_PROTOTYPE
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_SETPGID
 #define ACE_LACKS_SETREGID
 #define ACE_LACKS_SETREUID
-#define ACE_LACKS_INET_ATON_PROTOTYPE
 #define ACE_LACKS_MADVISE
-#define ACE_LACKS_MKTEMP_PROTOTYPE
-#define ACE_LACKS_MKSTEMP_PROTOTYPE
-#define ACE_LACKS_PUTENV_PROTOTYPE
 #define ACE_LACKS_REALPATH
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SIGINFO_H
 #define ACE_LACKS_SI_ADDR
-#define ACE_LACKS_STRCASECMP_PROTOTYPE
-#define ACE_LACKS_STRNCASECMP_PROTOTYPE
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_DLFCN_H
@@ -168,8 +182,6 @@
 #  define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 #  define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
 #  define ACE_HAS_TEMPLATE_SPECIALIZATION
-#  define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-#  undef ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 #endif /* __GNUC__ == 2  &&  __GNUC_MINOR__ == 9 */
 
 // By default, don't include RCS Id strings in object code.
diff --git a/ace/config-m88k.h b/ace/config-m88k.h
index 64c4ae8e298..699e9e3f4d6 100644
--- a/ace/config-m88k.h
+++ b/ace/config-m88k.h
@@ -69,7 +69,7 @@ struct ip_mreq
 #define ACE_HAS_SYSV_IPC
 
 // Sun has the wrong prototype for sendmsg.
-#define ACE_HAS_NONCONST_SENDMSG
+#define ACE_HAS_BROKEN_SENDMSG
 
 // The SunOS 5.x version of rand_r is inconsistent with the header files...
 #define ACE_HAS_BROKEN_RANDR
@@ -84,7 +84,7 @@ struct ip_mreq
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 #if !defined (ACE_HAS_FSU_PTHREADS)
 // Platform supports reentrant functions (i.e., all the POSIX *_r functions).
@@ -144,7 +144,7 @@ struct ip_mreq
 #define ACE_HAS_UCONTEXT_T
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
diff --git a/ace/config-macosx-panther.h b/ace/config-macosx-panther.h
index d02fae7ccd3..096214367f3 100644
--- a/ace/config-macosx-panther.h
+++ b/ace/config-macosx-panther.h
@@ -86,7 +86,7 @@
 //#define ACE_HAS_SYSV_IPC
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
@@ -122,7 +122,7 @@
 #define ACE_HAS_STRERROR
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Defines the page size of the system.
 #define ACE_HAS_GETPAGESIZE
@@ -148,6 +148,8 @@
 #endif /* ! ACE_MT_SAFE */
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
+#define ACE_HAS_PTHREAD_KILL
+#define ACE_HAS_PTHREAD_CANCEL
 #define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
diff --git a/ace/config-macosx.h b/ace/config-macosx.h
index 93f905e990a..8295575e316 100644
--- a/ace/config-macosx.h
+++ b/ace/config-macosx.h
@@ -88,7 +88,7 @@
 //#define ACE_HAS_SYSV_IPC
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
@@ -124,7 +124,7 @@
 #define ACE_HAS_STRERROR
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Defines the page size of the system.
 #define ACE_HAS_GETPAGESIZE
@@ -150,6 +150,8 @@
 #endif /* ! ACE_MT_SAFE */
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
+#define ACE_HAS_PTHREAD_KILL
+#define ACE_HAS_PTHREAD_CANCEL
 #define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
diff --git a/ace/config-mvs.h b/ace/config-mvs.h
index ddab94da911..bf8af448678 100644
--- a/ace/config-mvs.h
+++ b/ace/config-mvs.h
@@ -86,7 +86,7 @@
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MALLOC_H
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 #define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 #define ACE_LACKS_READDIR_R
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index 3e2b76af37e..1bfaf1a6c8f 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -1,155 +1,181 @@
 /* -*- C++ -*- */
 // $Id$
 
+// ***** This configuration file is still under testing. *****
+
+// The following configuration file is designed to work for NetBSD
+// platforms using GNU g++.
+
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#if ! defined (__ACE_INLINE__)
+#define __ACE_INLINE__
+#endif /* ! __ACE_INLINE__ */
+
+// ********************************************************
+// uncomment next line if you are using FreeBSD 2.1.x[R]
+// #define FreeBSD_2_1
+// ********************************************************
+#define ACE_NETBSD
 
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1
-#define ACE_HAS_3_PARAM_WCSTOK 1
-#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG 1
-#define ACE_HAS_ALT_CUSERID 1
-#define ACE_HAS_AUTOMATIC_INIT_FINI 1
-#define ACE_HAS_CLOCK_GETTIME 1
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1
-#define ACE_HAS_CPLUSPLUS_HEADERS 1
-#define ACE_HAS_DIRENT 1
-#define ACE_HAS_EXCEPTIONS 1
-#define ACE_HAS_GETIFADDRS 1
-#define ACE_HAS_GETPAGESIZE 1
-#define ACE_HAS_GETRUSAGE 1
-#define ACE_HAS_GETRUSAGE_PROTOTYPE 1
-#define ACE_HAS_GNU_CSTRING_H 1
-#define ACE_HAS_GPERF 1
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1
-#define ACE_HAS_IP_MULTICAST 1
-#define ACE_HAS_MEMCHR 1
-#define ACE_HAS_MSG 1
-#define ACE_HAS_NEW_NOTHROW 1
-#define ACE_HAS_NEW_NO_H 1
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
-#define ACE_HAS_ONLY_SCHED_OTHER 1
-#define ACE_HAS_POLL 1
-#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
-#define ACE_HAS_POSIX_NONBLOCK 1
-#define ACE_HAS_POSIX_TIME 1
-#define ACE_HAS_PTHREADS 1
-#define ACE_HAS_PTHREADS_STD 1
-#define ACE_HAS_PTHREADS_UNIX98_EXT 1
-#define ACE_HAS_PTHREAD_RESUME_NP 1
-#define ACE_HAS_PTHREAD_SUSPEND_NP 1
-#define ACE_HAS_P_READ_WRITE 1
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1
-#define ACE_HAS_REENTRANT_FUNCTIONS 1
-#define ACE_HAS_SIGACTION_CONSTP2 1
-#define ACE_HAS_SIGINFO_T 1
-#define ACE_HAS_SIGSUSPEND 1
-#define ACE_HAS_SIGTIMEDWAIT 1
-#define ACE_HAS_SIGWAIT 1
-#define ACE_HAS_SIG_ATOMIC_T 1
-#define ACE_HAS_SIG_C_FUNC 1
-#define ACE_HAS_SIN_LEN 1
-#define ACE_HAS_SNPRINTF 1
-#define ACE_HAS_SOCKADDR_MSG_NAME 1
-#define ACE_HAS_SOCKLEN_T 1
-#define ACE_HAS_SSIZE_T 1
-#define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#define ACE_HAS_STDCPP_STL_INCLUDES 1
-#define ACE_HAS_STDEXCEPT_NO_H 1
-#define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 1
-#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION 1
-#define ACE_HAS_STRERROR 1
-#define ACE_HAS_STRINGS 1
-#define ACE_HAS_STRING_CLASS 1
-#define ACE_HAS_STRPTIME 1
-#define ACE_HAS_SVR4_DYNAMIC_LINKING 1
-#define ACE_HAS_SYSV_IPC 1
-#define ACE_HAS_SYS_ERRLIST 1
-#define ACE_HAS_SYS_FILIO_H 1
-#define ACE_HAS_SYS_IOCTL_H 1
-#define ACE_HAS_SYS_SIGLIST 1
-#define ACE_HAS_SYS_SOCKIO_H 1
-#define ACE_HAS_SYS_SYSCALL_H 1
-#define ACE_HAS_TEMPLATE_SPECIALIZATION 1
-#define ACE_HAS_TEMPLATE_TYPEDEFS 1
-#define ACE_HAS_THREADS 1
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1
-#define ACE_HAS_TIMEZONE 1
-#define ACE_HAS_TIMEZONE_GETTIMEOFDAY 1
-#define ACE_HAS_TYPENAME_KEYWORD 1
-#define ACE_HAS_UALARM 1
-#define ACE_HAS_UCONTEXT_T 1
-#define ACE_HAS_USING_KEYWORD 1
-#define ACE_HAS_VOIDPTR_MMAP 1
-#define ACE_HAS_VOIDPTR_SOCKOPT 1
-#define ACE_HAS_WCHAR 1
-#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR 1
-#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1
-#define ACE_IOCTL_TYPE_ARG2 u_long
-#define ACE_LACKS_CONDATTR_PSHARED 1
-#define ACE_LACKS_GETHOSTENT 1
-#define ACE_LACKS_IOSTREAM_FX 1
-#define ACE_LACKS_ITOW 1
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
-#define ACE_LACKS_MSG_ACCRIGHTS 1
-#define ACE_LACKS_MUTEXATTR_PSHARED 1
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1
-#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
-#define ACE_LACKS_PRAGMA_ONCE 1
-#define ACE_LACKS_PRI_T 1
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1
-#define ACE_LACKS_PTHREAD_YIELD 1
-#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS 1
-#define ACE_LACKS_RWLOCKATTR_PSHARED 1
-#define ACE_LACKS_RWLOCK_T 1
-#define ACE_LACKS_SETSCHED 1
-#define ACE_LACKS_SIGINFO_H 1
-#define ACE_LACKS_STROPTS_H 1
-#define ACE_LACKS_STRRECVFD 1
-#define ACE_LACKS_TIMEDWAIT_PROTOTYPES 1
-#define ACE_LACKS_TIMESPEC_T 1
-#define ACE_LACKS_UNBUFFERED_STREAMBUF 1
-#define ACE_LACKS_WCSDUP 1
-#define ACE_LACKS_WCSICMP 1
-#define ACE_LACKS_WCSNICMP 1
-#define ACE_MT_SAFE 1
-#define ACE_NEW_THROWS_EXCEPTIONS 1
-#define ACE_TEMPLATES_REQUIRE_SOURCE 1
-#define ACE_UINT64_TYPEDEF unsigned long long
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-
-typedef unsigned long long ACE_UINT64;
-
-#if defined(__x86_64__)
-#define ACE_SIZEOF_DOUBLE 8
-#define ACE_SIZEOF_FLOAT 4
-#define ACE_SIZEOF_INT 4
-#define ACE_SIZEOF_LONG 8
-#define ACE_SIZEOF_LONG_DOUBLE 16
-#define ACE_SIZEOF_LONG_LONG 8
-#define ACE_SIZEOF_SHORT 2
-#define ACE_SIZEOF_VOID_P 8
-#define ACE_SIZEOF_WCHAR 4
-#define ACE_SSIZE_T_FORMAT_SPECIFIER	ACE_LIB_TEXT ("%ld")
-#define ACE_SIZE_T_FORMAT_SPECIFIER	ACE_LIB_TEXT ("%lu")
-
-#elif defined(__i386__)
-#define ACE_HAS_PENTIUM 1
-
-#define ACE_SIZEOF_DOUBLE 8
-#define ACE_SIZEOF_FLOAT 4
-#define ACE_SIZEOF_INT 4
-#define ACE_SIZEOF_LONG 4
 #define ACE_SIZEOF_LONG_DOUBLE 12
-#define ACE_SIZEOF_LONG_LONG 8
-#define ACE_SIZEOF_SHORT 2
-#define ACE_SIZEOF_VOID_P 4
-#define ACE_SIZEOF_WCHAR 4
-#else
-# error unknown CPU architecture
-#endif
-
-#endif  /* ACE_CONFIG_H */
-
-// Local Variables:
-// mode:C++
-// End:
+
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+#endif /* __GNUG__ */
+
+// #define ACE_HAS_BROKEN_NETBSD_MSYNC
+
+// Platform specific directives
+#define ACE_LACKS_GETPGID
+#define ACE_LACKS_SETPGID
+#define ACE_LACKS_SETREGID
+#define ACE_LACKS_SETREUID
+#define ACE_LACKS_RWLOCK_T
+#define ACE_HAS_SIG_MACROS
+#define ACE_HAS_CHARPTR_DL
+#define ACE_USES_ASM_SYMBOL_IN_DLSYM
+
+// NetBSD appears to have dirent support.
+#define ACE_HAS_DIRENT
+
+// NetBSD appears to have a sigset_t type.
+// #define ACE_LACKS_SIGSET
+
+// This is for 2.1.x only.  By default, gcc defines __FreeBSD__ automatically
+#if defined(FreeBSD_2_1)
+
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+// This is to fix the nested struct if_data definition on FreeBSD 2.1.x
+#include <sys/types.h>
+#include <sys/time.h>
+struct  if_data {
+/* generic interface information */
+  u_char  ifi_type;       /* ethernet, tokenring, etc */
+  u_char  ifi_physical;   /* e.g., AUI, Thinnet, 10base-T, etc */
+  u_char  ifi_addrlen;    /* media address length */
+  u_char  ifi_hdrlen;     /* media header length */
+  u_long  ifi_mtu;        /* maximum transmission unit */
+  u_long  ifi_metric;     /* routing metric (external only) */
+  u_long  ifi_baudrate;   /* linespeed */
+/* volatile statistics */
+  u_long  ifi_ipackets;   /* packets received on interface */
+  u_long  ifi_ierrors;    /* input errors on interface */
+  u_long  ifi_opackets;   /* packets sent on interface */
+  u_long  ifi_oerrors;    /* output errors on interface */
+  u_long  ifi_collisions; /* collisions on csma interfaces */
+  u_long  ifi_ibytes;     /* total number of octets received */
+  u_long  ifi_obytes;     /* total number of octets sent */
+  u_long  ifi_imcasts;    /* packets received via multicast */
+  u_long  ifi_omcasts;    /* packets sent via multicast */
+  u_long  ifi_iqdrops;    /* dropped on input, this interface */
+  u_long  ifi_noproto;    /* destined for unsupported protocol */
+  struct  timeval ifi_lastchange;/* time of last administrative ch
+ange */
+} ;
+
+// this is a hack, but since this only occured in FreeBSD 2.1.x,
+// I guess it is ok.
+#define ACE_HAS_BROKEN_TIMESPEC_MEMBERS
+
+#endif /* defined FreeBSD_2_1 */
+
+// Platform supports POSIX timers via struct timespec.
+#define ACE_HAS_POSIX_TIME
+#define ACE_HAS_UALARM
+
+// Platform defines struct timespec but not timespec_t
+#define ACE_LACKS_TIMESPEC_T
+
+#define ACE_LACKS_SYSTIME_H
+
+#define ACE_LACKS_STRRECVFD
+
+#define ACE_HAS_SIN_LEN
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+// Compiler/platform contains the <sys/syscall.h> file.
+#define ACE_HAS_SYSCALL_H
+
+#if !defined(FreeBSD_2_1)
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+#endif /* defined FreeBSD_2_1 */
+
+// Compiler/platform supports SVR4 signal typedef
+#define ACE_HAS_SVR4_SIGNAL_T
+
+// Compiler/platform supports alloca().
+// Although ACE does have alloca() on this compiler/platform combination, it is
+// disabled by default since it can be dangerous.  Uncomment the following line
+// if you ACE to use it.
+//#define ACE_HAS_ALLOCA
+
+// Compiler/platform supports SVR4 dynamic linking semantics..
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+
+// Compiler/platform correctly calls init()/fini() for shared libraries.
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+
+// Explicit dynamic linking permits "lazy" symbol resolution
+#define ACE_HAS_RTLD_LAZY_V
+
+// platform supports POSIX O_NONBLOCK semantics
+#define ACE_HAS_POSIX_NONBLOCK
+
+// platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
+// Lacks perfect filtering, must bind group address.
+#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING
+# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
+#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */
+
+// Compiler/platform has <alloca.h>
+//#define ACE_HAS_ALLOCA_H
+
+// Compiler/platform has the getrusage() system call.
+#define ACE_HAS_GETRUSAGE
+
+// Compiler/platform defines the sig_atomic_t typedef.
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Compiler/platform supports sys_siglist array.
+// *** This refers to (_sys_siglist) instead of (sys_siglist)
+// #define ACE_HAS_SYS_SIGLIST
+
+// Compiler/platform defines a union semun for SysV shared memory.
+#define ACE_HAS_SEMUN
+
+// Compiler supports the ssize_t typedef.
+#define ACE_HAS_SSIZE_T
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// Compiler/platform provides the sockio.h file.
+#define ACE_HAS_SOCKIO_H
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+// Platform provides <sys/filio.h> header.
+#define ACE_HAS_SYS_FILIO_H
+
+// Platform/compiler supports timezone * as second parameter to gettimeofday().
+#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
+
+#define ACE_HAS_MSG
+#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
+
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+#define ACE_LACKS_GETHOSTENT
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
diff --git a/ace/config-openbsd.h b/ace/config-openbsd.h
index 1894a3da92d..88b464a43f9 100644
--- a/ace/config-openbsd.h
+++ b/ace/config-openbsd.h
@@ -111,7 +111,7 @@
 #define ACE_HAS_SYSV_IPC
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // OpenBSD supports the getifaddrs interface
 #define ACE_HAS_GETIFADDRS
@@ -169,7 +169,7 @@
 #define ACE_HAS_STRERROR
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
@@ -230,6 +230,8 @@
 // bogus compiler syntax error.
 #define ACE_LACKS_CLEARERR
 
+#define ACE_HAS_MKSTEMP
+
 #define ACE_HAS_SNPRINTF
 
 // OpenBSD 3.2 lacks sched_setscheduler (see /usr/src/lib/libc_r/TODO)
diff --git a/ace/config-openvms.h b/ace/config-openvms.h
index 797db7091ca..8a103c8f815 100644
--- a/ace/config-openvms.h
+++ b/ace/config-openvms.h
@@ -21,18 +21,108 @@
 //#define MAXHOSTNAMELEN 255
 //#define MAXNAMLEN FILENAME_MAX
 //#define __unix__
-
-// OpenVMS does not support symlinks and does not define this.
-// Defining this as 0 effectively cancels out the one bit of code using this in
-// OS_NS_stdlib.cpp.
-#define MAXSYMLINKS 0
-
 #define ACE_OPENVMS
 #define ACE_DLL_SUFFIX ACE_LIB_TEXT("")
 
 #define ACE_HAS_DUMP    1
 
-//#define ACE_NEEDS_PTHREAD_UPPERCASE 1
+/*
+** These defines take care of the upper/lower casing problem that occurs
+** if you are using pthreads and are compiling /NAMES=AS_IS (which is necessary for ACE/TAO)
+**
+** Note that it does NOT take care of any argument differences between
+** the various implementations of pthreads.
+*/
+
+#define pthread_attr_create PTHREAD_ATTR_CREATE
+#define pthread_attr_delete PTHREAD_ATTR_DELETE
+#define pthread_attr_destroy PTHREAD_ATTR_DESTROY
+#define pthread_attr_getdetach_np PTHREAD_ATTR_GETDETACH_NP
+#define pthread_attr_getguardsize_np PTHREAD_ATTR_GETGUARDSIZE_NP
+#define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED
+#define pthread_attr_getprio PTHREAD_ATTR_GETPRIO
+#define pthread_attr_getsched PTHREAD_ATTR_GETSCHED
+#define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM
+#define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE
+#define pthread_attr_init PTHREAD_ATTR_INIT
+#define pthread_attr_setdetach_np PTHREAD_ATTR_SETDETACH_NP
+#define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE
+#define pthread_attr_setguardsize_np PTHREAD_ATTR_SETGUARDSIZE_NP
+#define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED
+#define pthread_attr_setprio PTHREAD_ATTR_SETPRIO
+#define pthread_attr_setsched PTHREAD_ATTR_SETSCHED
+#define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM
+#define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY
+#define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE
+#define pthread_cancel PTHREAD_CANCEL
+#define pthread_cancel_e PTHREAD_CANCEL_E
+#define pthread_cond_broadcast PTHREAD_COND_BROADCAST
+#define pthread_cond_destroy PTHREAD_COND_DESTROY
+#define pthread_cond_init PTHREAD_COND_INIT
+#define pthread_cond_sig_preempt_int_np PTHREAD_COND_SIG_PREEMPT_INT_NP
+#define pthread_cond_signal PTHREAD_COND_SIGNAL
+#define pthread_cond_signal_int_np PTHREAD_COND_SIGNAL_INT_NP
+#define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT
+#define pthread_cond_wait PTHREAD_COND_WAIT
+#define pthread_condattr_create PTHREAD_CONDATTR_CREATE
+#define pthread_condattr_delete PTHREAD_CONDATTR_DELETE
+#define pthread_condattr_init PTHREAD_CONDATTR_INIT
+#define pthread_create PTHREAD_CREATE
+#define pthread_delay_np PTHREAD_DELAY_NP
+#define pthread_detach PTHREAD_DETACH
+#define pthread_equal PTHREAD_EQUAL
+#define pthread_exc_fetch_fp_np PTHREAD_EXC_FETCH_FP_NP
+#define pthread_exc_handler_np PTHREAD_EXC_HANDLER_NP
+#define pthread_exc_pop_ctx_np PTHREAD_EXC_POP_CTX_NP
+#define pthread_exc_push_ctx_np PTHREAD_EXC_PUSH_CTX_NP
+#define pthread_exc_savecontext_np PTHREAD_EXC_SAVECONTEXT_NP
+#define pthread_exit PTHREAD_EXIT
+#define pthread_get_expiration_np PTHREAD_GET_EXPIRATION_NP
+#define pthread_getprio PTHREAD_GETPRIO
+#define pthread_getschedparam PTHREAD_GETSCHEDPARAM
+#define pthread_getscheduler PTHREAD_GETSCHEDULER
+#define pthread_getspecific PTHREAD_GETSPECIFIC
+#define pthread_getunique_np PTHREAD_GETUNIQUE_NP
+#define pthread_join PTHREAD_JOIN
+#define pthread_join32 PTHREAD_JOIN32
+#define pthread_keycreate PTHREAD_KEYCREATE
+#define pthread_key_create PTHREAD_KEY_CREATE
+#define pthread_kill PTHREAD_KILL
+#define pthread_lock_global_np PTHREAD_LOCK_GLOBAL_NP
+#define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY
+#define pthread_mutex_init PTHREAD_MUTEX_INIT
+#define pthread_mutex_lock PTHREAD_MUTEX_LOCK
+#define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK
+#define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK
+#define pthread_mutexattr_create PTHREAD_MUTEXATTR_CREATE
+#define pthread_mutexattr_delete PTHREAD_MUTEXATTR_DELETE
+#define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY
+#define pthread_mutexattr_getkind_np PTHREAD_MUTEXATTR_GETKIND_NP
+#define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT
+#define pthread_mutexattr_setkind_np PTHREAD_MUTEXATTR_SETKIND_NP
+#define pthread_mutexattr_settype_np PTHREAD_MUTEXATTR_SETTYPE_NP
+#define pthread_once PTHREAD_ONCE
+#define pthread_resume_np PTHREAD_RESUME_NP
+#define pthread_self PTHREAD_SELF
+#define pthread_setasynccancel PTHREAD_SETASYNCCANCEL
+#define pthread_setcancel PTHREAD_SETCANCEL
+#define pthread_setcancelstate PTHREAD_SETCANCELSTATE
+#define pthread_setprio PTHREAD_SETPRIO
+#define pthread_setschedparam PTHREAD_SETSCHEDPARAM
+#define pthread_setscheduler PTHREAD_SETSCHEDULER
+#define pthread_setspecific PTHREAD_SETSPECIFIC
+#define pthread_suspend_np PTHREAD_SUSPEND_NP
+#define pthread_testcancel PTHREAD_TESTCANCEL
+#define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP
+#define pthread_yield PTHREAD_YIELD
+#define pthread_yield_np PTHREAD_YIELD_NP
+
+/* new for OpenVMS 7.3.2 ECO 1 */
+#define pthread_attr_setscope       PTHREAD_ATTR_SETSCOPE
+#define pthread_attr_setstackaddr   PTHREAD_ATTR_SETSTACKADDR
+#define pthread_condattr_destroy    PTHREAD_CONDATTR_DESTROY
+#define pthread_key_delete          PTHREAD_KEY_DELETE
+#define pthread_setcanceltype       PTHREAD_SETCANCELTYPE
 
 /*
 #define XtAppAddInput XTAPPADDINPUT
@@ -72,8 +162,6 @@
 #define ACE_LACKS_SETSID 1
 #define ACE_LACKS_FCNTL 1
 
-#define ACE_LACKS_REALPATH 1
-
 #define ACE_LACKS_TIMESPEC_T    1
 #define ACE_LACKS_CONST_TIMESPEC_PTR 1
 
@@ -89,8 +177,6 @@
 #define ACE_LACKS_PWD_REENTRANT_FUNCTIONS 1
 #define ACE_LACKS_RAND_REENTRANT_FUNCTIONS 1
 
-#define ACE_LACKS_UNIX_SIGNALS 1
-
 #define ACE_MT_SAFE 1
                                         /*Compile using multi-thread libraries*/
 #define ACE_NEW_THROWS_EXCEPTIONS 1
@@ -104,8 +190,6 @@
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
                                         /*Platform has its standard c++
                                         library in the namespace std.*/
-#define ACE_HAS_VOIDPTR_GETTIMEOFDAY 1
-                                        /* 2nd arg 'void*' instead of 'struct timezone*' */
 #define ACE_HAS_SNPRINTF 1
                                         /*Platform offers snprintf().*/
 #define ACE_HAS_P_READ_WRITE
@@ -211,8 +295,6 @@
 #define ACE_HAS_SIGWAIT 1
                                         /*Platform/compiler has the
                                         sigwait(2) prototype*/
-#define ACE_HAS_SIGTIMEDWAIT 1
-
 #define ACE_HAS_SIG_C_FUNC 1
                                         /*Compiler requires extern "C"
                                         functions for signals.*/
@@ -244,9 +326,6 @@
 #define ACE_HAS_TEMPLATE_SPECIALIZATION 1
                                         /*Compiler implements template
                                         specialization*/
-
-#define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 1
-
 #define ACE_HAS_TEMPLATE_TYPEDEFS 1
                                         /*Compiler implements templates
                                         that support typedefs inside
@@ -266,6 +345,10 @@
                                         /*The pthread_create() routine
                                         *must* take extern C
                                         functions.*/
+#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
+                                        /*Platform/compiler supports
+                                        timezone * as second parameter
+                                        to gettimeofday()*/
 #define ACE_HAS_UALARM 1
                                         /*Platform supports ualarm()*/
 #define ACE_HAS_USING_KEYWORD 1
@@ -300,7 +383,7 @@
                                         gethostbyaddr_r,
                                         gethostbyname_r,
                                         getservbyname_r).*/
-#define ACE_LACKS_SYS_PARAM_H 1
+#define ACE_LACKS_PARAM_H 1
                                         /*Platform lacks <sys/param.h>
                                         (e.g., MVS)*/
 #define ACE_LACKS_PRI_T 1
@@ -360,107 +443,4 @@
 
 #define ACE_NEEDS_HUGE_THREAD_STACKSIZE (64U*1024)
                                         /*Required by platforms with small default stacks.*/
-
-#ifdef ACE_NEEDS_PTHREAD_UPPERCASE
-
-/*
-** These defines take care of the upper/lower casing problem that occurs
-** if you are using pthreads and are compiling /NAMES=AS_IS (which is necessary for ACE/TAO)
-**
-** Note that it does NOT take care of any argument differences between
-** the various implementations of pthreads.
-*/
-
-#define pthread_attr_create PTHREAD_ATTR_CREATE
-#define pthread_attr_delete PTHREAD_ATTR_DELETE
-#define pthread_attr_destroy PTHREAD_ATTR_DESTROY
-#define pthread_attr_getdetach_np PTHREAD_ATTR_GETDETACH_NP
-#define pthread_attr_getguardsize_np PTHREAD_ATTR_GETGUARDSIZE_NP
-#define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED
-#define pthread_attr_getprio PTHREAD_ATTR_GETPRIO
-#define pthread_attr_getsched PTHREAD_ATTR_GETSCHED
-#define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM
-#define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE
-#define pthread_attr_init PTHREAD_ATTR_INIT
-#define pthread_attr_setdetach_np PTHREAD_ATTR_SETDETACH_NP
-#define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE
-#define pthread_attr_setguardsize_np PTHREAD_ATTR_SETGUARDSIZE_NP
-#define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED
-#define pthread_attr_setprio PTHREAD_ATTR_SETPRIO
-#define pthread_attr_setsched PTHREAD_ATTR_SETSCHED
-#define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM
-#define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY
-#define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE
-#define pthread_cancel PTHREAD_CANCEL
-#define pthread_cancel_e PTHREAD_CANCEL_E
-#define pthread_cond_broadcast PTHREAD_COND_BROADCAST
-#define pthread_cond_destroy PTHREAD_COND_DESTROY
-#define pthread_cond_init PTHREAD_COND_INIT
-#define pthread_cond_sig_preempt_int_np PTHREAD_COND_SIG_PREEMPT_INT_NP
-#define pthread_cond_signal PTHREAD_COND_SIGNAL
-#define pthread_cond_signal_int_np PTHREAD_COND_SIGNAL_INT_NP
-#define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT
-#define pthread_cond_wait PTHREAD_COND_WAIT
-#define pthread_condattr_create PTHREAD_CONDATTR_CREATE
-#define pthread_condattr_delete PTHREAD_CONDATTR_DELETE
-#define pthread_condattr_init PTHREAD_CONDATTR_INIT
-#define pthread_create PTHREAD_CREATE
-#define pthread_delay_np PTHREAD_DELAY_NP
-#define pthread_detach PTHREAD_DETACH
-#define pthread_equal PTHREAD_EQUAL
-#define pthread_exc_fetch_fp_np PTHREAD_EXC_FETCH_FP_NP
-#define pthread_exc_handler_np PTHREAD_EXC_HANDLER_NP
-#define pthread_exc_pop_ctx_np PTHREAD_EXC_POP_CTX_NP
-#define pthread_exc_push_ctx_np PTHREAD_EXC_PUSH_CTX_NP
-#define pthread_exc_savecontext_np PTHREAD_EXC_SAVECONTEXT_NP
-#define pthread_exit PTHREAD_EXIT
-#define pthread_get_expiration_np PTHREAD_GET_EXPIRATION_NP
-#define pthread_getprio PTHREAD_GETPRIO
-#define pthread_getschedparam PTHREAD_GETSCHEDPARAM
-#define pthread_getscheduler PTHREAD_GETSCHEDULER
-#define pthread_getspecific PTHREAD_GETSPECIFIC
-#define pthread_getunique_np PTHREAD_GETUNIQUE_NP
-#define pthread_join PTHREAD_JOIN
-#define pthread_join32 PTHREAD_JOIN32
-#define pthread_keycreate PTHREAD_KEYCREATE
-#define pthread_key_create PTHREAD_KEY_CREATE
-#define pthread_kill PTHREAD_KILL
-#define pthread_lock_global_np PTHREAD_LOCK_GLOBAL_NP
-#define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY
-#define pthread_mutex_init PTHREAD_MUTEX_INIT
-#define pthread_mutex_lock PTHREAD_MUTEX_LOCK
-#define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK
-#define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK
-#define pthread_mutexattr_create PTHREAD_MUTEXATTR_CREATE
-#define pthread_mutexattr_delete PTHREAD_MUTEXATTR_DELETE
-#define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY
-#define pthread_mutexattr_getkind_np PTHREAD_MUTEXATTR_GETKIND_NP
-#define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT
-#define pthread_mutexattr_setkind_np PTHREAD_MUTEXATTR_SETKIND_NP
-#define pthread_mutexattr_settype_np PTHREAD_MUTEXATTR_SETTYPE_NP
-#define pthread_once PTHREAD_ONCE
-#define pthread_resume_np PTHREAD_RESUME_NP
-#define pthread_self PTHREAD_SELF
-#define pthread_setasynccancel PTHREAD_SETASYNCCANCEL
-#define pthread_setcancel PTHREAD_SETCANCEL
-#define pthread_setcancelstate PTHREAD_SETCANCELSTATE
-#define pthread_setprio PTHREAD_SETPRIO
-#define pthread_setschedparam PTHREAD_SETSCHEDPARAM
-#define pthread_setscheduler PTHREAD_SETSCHEDULER
-#define pthread_setspecific PTHREAD_SETSPECIFIC
-#define pthread_suspend_np PTHREAD_SUSPEND_NP
-#define pthread_testcancel PTHREAD_TESTCANCEL
-#define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP
-#define pthread_yield PTHREAD_YIELD
-#define pthread_yield_np PTHREAD_YIELD_NP
-
-/* new for OpenVMS 7.3.2 ECO 1 */
-#define pthread_attr_setscope       PTHREAD_ATTR_SETSCOPE
-#define pthread_attr_setstackaddr   PTHREAD_ATTR_SETSTACKADDR
-#define pthread_condattr_destroy    PTHREAD_CONDATTR_DESTROY
-#define pthread_key_delete          PTHREAD_KEY_DELETE
-#define pthread_setcanceltype       PTHREAD_SETCANCELTYPE
-
-#endif // if ACE_NEEDS_PTHREAD_UPPERCASE
-
 #endif
diff --git a/ace/config-osf1-3.2.h b/ace/config-osf1-3.2.h
index 5b947116f63..4fe6d10fb79 100644
--- a/ace/config-osf1-3.2.h
+++ b/ace/config-osf1-3.2.h
@@ -61,13 +61,13 @@ extern "C" pid_t getpgid (pid_t);
 #define ACE_HAS_LONG_MAP_FAILED
 
 // Platform's implementation of sendmsg() has a non-const msgheader parameter.
-#define ACE_HAS_NONCONST_SENDMSG
+#define ACE_HAS_BROKEN_SENDMSG
 
 // Platform's implementation of writev() has a non-const iovec parameter.
-#define ACE_HAS_NONCONST_WRITEV
+#define ACE_HAS_BROKEN_WRITEV
 
 // Platform's implementation of setlrmit() has a non-const rlimit parameter.
-#define ACE_HAS_NONCONST_SETRLIMIT
+#define ACE_HAS_BROKEN_SETRLIMIT
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
@@ -76,7 +76,7 @@ extern "C" pid_t getpgid (pid_t);
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform correctly calls init()/fini().
 #define ACE_HAS_AUTOMATIC_INIT_FINI
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 51ddb61800a..a070449e84c 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -123,9 +123,9 @@
 
 #define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
 #define ACE_HAS_AUTOMATIC_INIT_FINI
-#define ACE_HAS_NONCONST_SETRLIMIT
+#define ACE_HAS_BROKEN_SETRLIMIT
 #define ACE_HAS_BROKEN_T_ERROR
-#define ACE_HAS_NONCONST_WRITEV
+#define ACE_HAS_BROKEN_WRITEV
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_CPLUSPLUS_HEADERS
@@ -153,7 +153,7 @@
 #define ACE_HAS_STRPTIME
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_SVR4_SIGNAL_T
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 #define ACE_HAS_SYSV_IPC
 #if (ACE_MT_SAFE == 0)
 // clearerr is not defined when _REENTRANT is not defined
@@ -178,7 +178,7 @@
 // approporiate ordering of the include files. The Platinum release
 // now temporarily supports both forms.  Platform's implementation of
 // sendmsg() has a non-const msgheader parameter.
-#define ACE_HAS_NONCONST_SENDMSG
+#define ACE_HAS_BROKEN_SENDMSG
 #define ACE_HAS_IDTYPE_T
 
 #include /**/ "ace/post.h"
diff --git a/ace/config-psos-diab-mips.h b/ace/config-psos-diab-mips.h
index daa02b75560..cf9a689f2e5 100644
--- a/ace/config-psos-diab-mips.h
+++ b/ace/config-psos-diab-mips.h
@@ -119,9 +119,9 @@
 
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 
-/* #define ACE_HAS_NONCONST_SENDMSG */
+/* #define ACE_HAS_BROKEN_SENDMSG */
 
-/* #define ACE_HAS_NONCONST_WRITEV  */
+/* #define ACE_HAS_BROKEN_WRITEV  */
 
 #define ACE_HAS_BROKEN_CONVERSIONS
 
@@ -175,12 +175,14 @@
 
 #define ACE_LACKS_MSYNC
 
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 
 #define ACE_LACKS_PWD_FUNCTIONS
 
 #define ACE_LACKS_RLIMIT
 
+#define ACE_LACKS_RPC_H
+
 #define ACE_LACKS_RWLOCK_T
 
 #define ACE_LACKS_SBRK
diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h
index 9347e12861c..98dd63db07e 100644
--- a/ace/config-psos-diab-ppc.h
+++ b/ace/config-psos-diab-ppc.h
@@ -132,9 +132,9 @@
 
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 
-/* #define ACE_HAS_NONCONST_SENDMSG */
+/* #define ACE_HAS_BROKEN_SENDMSG */
 
-/* #define ACE_HAS_NONCONST_WRITEV  */
+/* #define ACE_HAS_BROKEN_WRITEV  */
 
 #define ACE_HAS_BROKEN_CONVERSIONS
 
@@ -183,7 +183,7 @@
 
 #define ACE_LACKS_MSYNC
 
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 
 #define ACE_LACKS_PWD_FUNCTIONS
 
diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h
index 842cd7a00c3..857647ebd2b 100644
--- a/ace/config-psos-diab.h
+++ b/ace/config-psos-diab.h
@@ -117,9 +117,9 @@
 
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 
-/* #define ACE_HAS_NONCONST_SENDMSG */
+/* #define ACE_HAS_BROKEN_SENDMSG */
 
-/* #define ACE_HAS_NONCONST_WRITEV  */
+/* #define ACE_HAS_BROKEN_WRITEV  */
 
 #define ACE_HAS_BROKEN_CONVERSIONS
 
@@ -166,7 +166,7 @@
 
 #define ACE_LACKS_MSYNC
 
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 
 #define ACE_LACKS_PWD_FUNCTIONS
 
diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h
index 917ee850c71..50696703dbe 100644
--- a/ace/config-psos-tm.h
+++ b/ace/config-psos-tm.h
@@ -85,9 +85,9 @@
 
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 
-/* #define ACE_HAS_NONCONST_SENDMSG */
+/* #define ACE_HAS_BROKEN_SENDMSG */
 
-/* #define ACE_HAS_NONCONST_WRITEV  */
+/* #define ACE_HAS_BROKEN_WRITEV  */
 
 #define ACE_HAS_BROKEN_CONVERSIONS
 
@@ -135,7 +135,7 @@
 
 #define ACE_LACKS_MSYNC
 
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 
 #define ACE_LACKS_PWD_FUNCTIONS
 
diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h
index b6d83a38ffa..3e0ecb11b70 100644
--- a/ace/config-psosim-g++.h
+++ b/ace/config-psosim-g++.h
@@ -131,9 +131,9 @@
 
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 
-/* #define ACE_HAS_NONCONST_SENDMSG */
+/* #define ACE_HAS_BROKEN_SENDMSG */
 
-/* #define ACE_HAS_NONCONST_WRITEV  */
+/* #define ACE_HAS_BROKEN_WRITEV  */
 
 #define ACE_HAS_CHARPTR_SOCKOPT
 
@@ -177,7 +177,7 @@
 
 #define ACE_LACKS_MSYNC
 
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 
 #define ACE_LACKS_PWD_FUNCTIONS
 
diff --git a/ace/config-qnx-neutrino.h b/ace/config-qnx-neutrino.h
index fc2f55d1968..5c92d03875f 100644
--- a/ace/config-qnx-neutrino.h
+++ b/ace/config-qnx-neutrino.h
@@ -110,6 +110,7 @@
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
+#define ACE_LACKS_RPC_H
 #define ACE_LACKS_RTTI
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SBRK
diff --git a/ace/config-qnx-rtp-62x.h b/ace/config-qnx-rtp-62x.h
index c24ff841715..c01295ad7aa 100644
--- a/ace/config-qnx-rtp-62x.h
+++ b/ace/config-qnx-rtp-62x.h
@@ -85,6 +85,7 @@
 #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
 #define ACE_LACKS_POLL_H
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
+#define ACE_LACKS_RPC_H
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SOCKET_BUFSIZ
 #define ACE_LACKS_STREAM_MODULES
diff --git a/ace/config-qnx-rtp-pre62x.h b/ace/config-qnx-rtp-pre62x.h
index c2afa521c55..6239520ec06 100644
--- a/ace/config-qnx-rtp-pre62x.h
+++ b/ace/config-qnx-rtp-pre62x.h
@@ -83,6 +83,7 @@
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
+#define ACE_LACKS_RPC_H
 #define ACE_LACKS_RTTI
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SBRK
diff --git a/ace/config-rtems.h b/ace/config-rtems.h
index 291a55854d6..51abb8be168 100644
--- a/ace/config-rtems.h
+++ b/ace/config-rtems.h
@@ -87,7 +87,7 @@
 #define ACE_LACKS_EXEC
 #define ACE_LACKS_FILELOCKS
 #define ACE_LACKS_FORK
-#define ACE_LACKS_GETOPT_PROTOTYPE
+#define ACE_LACKS_GETOPT_PROTO
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_MADVISE
@@ -99,7 +99,7 @@
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 #define ACE_LACKS_READDIR_R
 #define ACE_LACKS_READLINK
-#define ACE_HAS_NONCONST_READV
+#define ACE_HAS_BROKEN_READV
 #define ACE_LACKS_READV
 #define ACE_LACKS_RLIMIT
 #define ACE_LACKS_RLIMIT_PROTOTYPE
@@ -120,7 +120,7 @@
 #define ACE_LACKS_SYS_NERR
 #define ACE_LACKS_UALARM_PROTOTYPE
 #define ACE_LACKS_UCONTEXT_H
-#define ACE_HAS_NONCONST_WRITEV
+#define ACE_HAS_BROKEN_WRITEV
 #define ACE_LACKS_WRITEV
 #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536
 #define ACE_NEEDS_SCHED_H
diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h
index 67ff29a6333..ba10b484f46 100644
--- a/ace/config-sco-4.2-nothread.h
+++ b/ace/config-sco-4.2-nothread.h
@@ -55,7 +55,7 @@
 //#define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-//#define ACE_HAS_SYS_SYSCALL_H
+//#define ACE_HAS_SYSCALL_H
 
 // Fixes a problem with HP/UX not wrapping the mmap(2) header files
 // with extern "C".
@@ -91,6 +91,9 @@
 // Platform/compiler supports void * as second parameter to gettimeofday().
 #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
+// HP/UX has an undefined syscall for GETRUSAGE...
+//#define ACE_HAS_SYSCALL_GETRUSAGE
+
 // Note, this only works if the flag is set above!
 //#define ACE_HAS_GETRUSAGE
 
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index 29797535bd2..fc43c24f358 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -58,7 +58,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-//#define ACE_HAS_SYS_SYSCALL_H
+//#define ACE_HAS_SYSCALL_H
 
 // Fixes a problem with HP/UX not wrapping the mmap(2) header files
 // with extern "C".
@@ -95,6 +95,9 @@
 // #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
+// HP/UX has an undefined syscall for GETRUSAGE...
+//#define ACE_HAS_SYSCALL_GETRUSAGE
+
 // Note, this only works if the flag is set above!
 //#define ACE_HAS_GETRUSAGE
 
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 1820a96f3ca..a5d94c82cb3 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -39,7 +39,7 @@
 #define ACE_HAS_TERM_IOCTLS
 
 // Compiler/platform contains the <sys/syscall.h> file.
-//#define ACE_HAS_SYS_SYSCALL_H
+//#define ACE_HAS_SYSCALL_H
 
 // Fixes a problem with HP/UX not wrapping the mmap(2) header files
 // with extern "C".
@@ -74,6 +74,9 @@
 
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
+// HP/UX has an undefined syscall for GETRUSAGE...
+//#define ACE_HAS_SYSCALL_GETRUSAGE
+
 // Note, this only works if the flag is set above!
 //#define ACE_HAS_GETRUSAGE
 
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index 29e62b6dc69..21663d0cfe7 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -38,7 +38,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform has the getrusage() system call.
 #define ACE_HAS_GETRUSAGE
@@ -63,7 +63,7 @@
 #define ACE_HAS_SEMUN
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler/platform supports struct strbuf
 #define ACE_HAS_STRBUF_T
diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h
index c4ec4919a5d..062699f983a 100644
--- a/ace/config-sunos4-lucid3.2.h
+++ b/ace/config-sunos4-lucid3.2.h
@@ -24,7 +24,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform supports alloca()
 // Although ACE does have alloca() on this compiler/platform combination, it is
@@ -54,7 +54,7 @@
 #define ACE_HAS_SEMUN
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler/platform supports struct strbuf
 #define ACE_HAS_STRBUF_T
diff --git a/ace/config-sunos4-sun3.x.h b/ace/config-sunos4-sun3.x.h
index 2a6fd6cde09..0ee548bff80 100644
--- a/ace/config-sunos4-sun3.x.h
+++ b/ace/config-sunos4-sun3.x.h
@@ -25,7 +25,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform has the getrusage() system call.
 #define ACE_HAS_GETRUSAGE
@@ -46,7 +46,7 @@
 #define ACE_HAS_SEMUN
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler/platform supports struct strbuf
 #define ACE_HAS_STRBUF_T
diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h
index 2783cd42875..aa75e37665a 100644
--- a/ace/config-sunos4-sun4.1.4.h
+++ b/ace/config-sunos4-sun4.1.4.h
@@ -26,7 +26,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform has the getrusage() system call.
 #define ACE_HAS_GETRUSAGE
@@ -51,7 +51,7 @@
 #define ACE_HAS_SEMUN
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler has brain-damaged SPARCwork signal prototype...
 #define ACE_HAS_SPARCWORKS_401_SIGNALS
diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h
index f3ed77a046d..ee3e46e1a5c 100644
--- a/ace/config-sunos4-sun4.x.h
+++ b/ace/config-sunos4-sun4.x.h
@@ -31,7 +31,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform has the getrusage() system call.
 #define ACE_HAS_GETRUSAGE
@@ -56,7 +56,7 @@
 #define ACE_HAS_SEMUN
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler has brain-damaged SPARCwork signal prototype...
 #define ACE_HAS_SPARCWORKS_401_SIGNALS
diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h
index 9d827efe50a..3e078451f10 100644
--- a/ace/config-sunos5.4-centerline-2.x.h
+++ b/ace/config-sunos5.4-centerline-2.x.h
@@ -21,7 +21,7 @@
 #define ACE_HAS_SYSV_IPC
 
 // Sun has the wrong prototype for sendmsg.
-#define ACE_HAS_NONCONST_SENDMSG
+#define ACE_HAS_BROKEN_SENDMSG
 
 // The SunOS 5.x version of rand_r is inconsistent with the header files...
 #define ACE_HAS_BROKEN_RANDR
@@ -36,7 +36,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Platform has terminal ioctl flags like TCGETS and TCSETS.
 #define ACE_HAS_TERM_IOCTLS
@@ -76,7 +76,7 @@
 #define ACE_HAS_UCONTEXT_T
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index 4a75f7feb77..4d0217cdc40 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -32,7 +32,7 @@
 #define ACE_HAS_SYSV_IPC
 
 // Sun has the wrong prototype for sendmsg.
-#define ACE_HAS_NONCONST_SENDMSG
+#define ACE_HAS_BROKEN_SENDMSG
 
 // The SunOS 5.x version of rand_r is inconsistent with the header files...
 #define ACE_HAS_BROKEN_RANDR
@@ -47,7 +47,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
@@ -93,7 +93,7 @@
 #define ACE_HAS_UCONTEXT_T
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h
index ea80d7c51c1..b52eae3f9e6 100644
--- a/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ace/config-sunos5.4-sunc++-4.x.h
@@ -26,7 +26,7 @@
 #define ACE_HAS_SYSV_IPC
 
 // Sun has the wrong prototype for sendmsg.
-#define ACE_HAS_NONCONST_SENDMSG
+#define ACE_HAS_BROKEN_SENDMSG
 
 // The SunOS 5.x version of rand_r is inconsistent with the header files...
 #define ACE_HAS_BROKEN_RANDR
@@ -41,7 +41,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Platform has terminal ioctl flags like TCGETS and TCSETS.
 #define ACE_HAS_TERM_IOCTLS
@@ -90,7 +90,7 @@
 #define ACE_HAS_UCONTEXT_T
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 65986361746..af4e2634591 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -175,7 +175,7 @@
 #define ACE_HAS_MSG
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Platform has terminal ioctl flags like TCGETS and TCSETS.
 #define ACE_HAS_TERM_IOCTLS
@@ -229,7 +229,7 @@
 #define ACE_HAS_UCONTEXT_T
 
 // Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
diff --git a/ace/config-sunos5.8.h b/ace/config-sunos5.8.h
index 1a2595ad992..de6803e9822 100644
--- a/ace/config-sunos5.8.h
+++ b/ace/config-sunos5.8.h
@@ -11,12 +11,6 @@
 // #include the SunOS 5.7 config, then add any SunOS 5.8 updates below.
 #include "ace/config-sunos5.7.h"
 
-// This may be true for versions prior to Solaris 8 as well, but I don't
-// have any to try it on.
-#if !defined (ACE_HAS_TIMEZONE)
-#  define ACE_HAS_TIMEZONE
-#endif
-
 // The range of thread priorities for 5.8 differs from 5.7 in the
 // minimum priority for the SCHED_OTHER policy (i.e.,
 // ACE_THR_PRI_OTHER_MIN)
diff --git a/ace/config-tandem-nsk-mips-v2.h b/ace/config-tandem-nsk-mips-v2.h
index d37a2769ce3..5996dad3f32 100644
--- a/ace/config-tandem-nsk-mips-v2.h
+++ b/ace/config-tandem-nsk-mips-v2.h
@@ -274,7 +274,7 @@ extern int cma_sigwait  (sigset_t *);
 //=========================================================================
 
 // Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 // Platform lacks malloc.h
 #define ACE_LACKS_MALLOC_H
@@ -306,7 +306,7 @@ extern int cma_sigwait  (sigset_t *);
 
 // OS/compiler omits the const from the iovec parameter in the
 // writev() prototype.
-#define ACE_HAS_NONCONST_WRITEV
+#define ACE_HAS_BROKEN_WRITEV
 
 // Platform lacks <stdint.h>
 #define ACE_LACKS_STDINT_H
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index fe25aef308a..dac4b85a623 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -37,7 +37,7 @@
 #define ACE_HAS_SYSV_IPC
 
 // OS/compiler omits the const from the sendmsg() prototype.
-#define ACE_HAS_NONCONST_SENDMSG
+#define ACE_HAS_BROKEN_SENDMSG
 
 //OS/compiler's header files are inconsistent with libC definition of rand_r().
 //#define ACE_HAS_BROKEN_RANDR          // Defines it the same way as sunos5.4
@@ -52,7 +52,7 @@
 #define ACE_HAS_MSG
 
 //Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 //Platform provides <sysent.h> header
 #define ACE_HAS_SYSENT_H
@@ -116,7 +116,7 @@
 #define ACE_HAS_SIGWAIT
 
 //Compiler/platform provides the sockio.h file
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 // Compiler supports the ssize_t typedef
 #define ACE_HAS_SSIZE_T    // Limits.h must be included
@@ -272,9 +272,9 @@
 // files with extern "C".
 //ACE_HAS_BROKEN_POSIX_TIME             Platform defines struct timespec in
 // <sys/timers.h>
-//ACE_HAS_NONCONST_SETRLIMIT             OS/compiler omits the const from the
+//ACE_HAS_BROKEN_SETRLIMIT             OS/compiler omits the const from the
 // rlimit parameter in the setrlimit() prototype.
-//ACE_HAS_NONCONST_WRITEV                OS/compiler omits the const from the
+//ACE_HAS_BROKEN_WRITEV                OS/compiler omits the const from the
 // iovec parameter in the writev() prototype.
 // There is a bstring in the Tandem but where man bstring OK, find bstring NOK
 // ? ACE_HAS_BSTRING                     Platform has <bstring.h> (which contains bzero() prototype)
@@ -327,6 +327,8 @@
 //? ACE_HAS_STRUCT_NETDB_DATA           Compiler/platform has strange
 // hostent API for socket *_r() calls
 //ACE_HAS_VOIDPTR_GETTIMEOFDAY           
+//? ACE_HAS_SYSCALL_GETRUSAGE           HP/UX has an undefined syscall for
+//GETRUSAGE...
 //ACE_HAS_TEMPLATE_TYPEDEFS             Compiler implements templates that
 // support typedefs inside of classes used as formal arguments to a template
 // class.
@@ -368,7 +370,7 @@
 //ACE_LACKS_NETDB_REENTRANT_FUNCTIONS   Platform does not support reentrant
 // netdb functions (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r,
 // gethostbyname_r, getservbyname_r).
-//ACE_LACKS_SYS_PARAM_H                     Platform lacks <sys/param.h> (e.g.,
+//ACE_LACKS_PARAM_H                     Platform lacks <sys/param.h> (e.g.,
 //MVS)
 //certain System V functions like shared memory and message queues.
 //ACE_LACKS_RECVMSG                     Platform lacks recvmsg() (e.g., Linux)
diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h
index ebfd2b9af31..a9b83075a08 100644
--- a/ace/config-unixware-2.01-g++.h
+++ b/ace/config-unixware-2.01-g++.h
@@ -40,12 +40,13 @@
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_REGEX
+#define ACE_HAS_LAZY_V
 #define ACE_HAS_SELECT_H
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_UCONTEXT_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STHREADS
 #define ACE_HAS_THR_KEYDELETE
@@ -54,7 +55,7 @@
 #define ACE_HAS_STREAM_PIPES
 #define ACE_HAS_STRERROR
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 #define ACE_HAS_SYSINFO
 #define ACE_HAS_SYSV_IPC
 #define ACE_HAS_SYS_FILIO_H
diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h
index 31587be6605..5f8046dd2e1 100644
--- a/ace/config-unixware-2.1.2-g++.h
+++ b/ace/config-unixware-2.1.2-g++.h
@@ -42,12 +42,13 @@
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_REGEX
+#define ACE_HAS_LAZY_V
 #define ACE_HAS_SELECT_H
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_UCONTEXT_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STHREADS
 #define ACE_HAS_THR_KEYDELETE
@@ -56,7 +57,7 @@
 #define ACE_HAS_STREAM_PIPES
 #define ACE_HAS_STRERROR
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 #define ACE_HAS_SYSINFO
 #define ACE_HAS_SYSV_IPC
 #define ACE_HAS_SYS_FILIO_H
diff --git a/ace/config-unixware-7.1.0.h b/ace/config-unixware-7.1.0.h
index 33fd6dd4df6..673f5c24561 100644
--- a/ace/config-unixware-7.1.0.h
+++ b/ace/config-unixware-7.1.0.h
@@ -36,6 +36,7 @@
 
 #define ACE_HAS_NEW_NO_H 1
 #define ACE_HAS_STDEXCEPT_NO_H 1
+#define ACE_HAS_IOMANIP_NO_H 1
 
 /* Platform provides <sys/ioctl.h> header */
 #define ACE_HAS_SYS_IOCTL_H 1
@@ -118,7 +119,7 @@
 
 /* Platform has a getrusage () prototype in sys/resource.h that differs from
    the one in ace/OS.i. */
-#define ACE_HAS_GETRUSAGE_PROTOTYPE 1
+#define ACE_HAS_GETRUSAGE_PROTO 1
 
 /* Denotes that GNU has cstring.h as standard which redefines memchr() */
 #define ACE_HAS_GNU_CSTRING_H
@@ -228,7 +229,7 @@
 #define ACE_HAS_SIZET_SOCKET_LEN 1
 
 /* Compiler/platform provides the sys/sockio.h file */
-#define ACE_HAS_SYS_SOCKIO_H 1
+#define ACE_HAS_SOCKIO_H 1
 
 /* Compiler supports the ssize_t typedef */
 #define ACE_HAS_SSIZE_T 1
@@ -267,7 +268,7 @@
 #define ACE_HAS_SVR4_TLI 1
 
 /* Compiler/platform contains the <sys/syscall.h> file. */
-#define ACE_HAS_SYS_SYSCALL_H 1
+#define ACE_HAS_SYSCALL_H 1
 
 /* Platform supports system configuration information */
 #define ACE_HAS_SYSINFO 1
diff --git a/ace/config-unixware-7.1.0.udk.h b/ace/config-unixware-7.1.0.udk.h
index 15c635df0a5..9f2b290cffc 100644
--- a/ace/config-unixware-7.1.0.udk.h
+++ b/ace/config-unixware-7.1.0.udk.h
@@ -41,6 +41,7 @@
 
 #define ACE_HAS_NEW_NO_H 1
 #define ACE_HAS_STDEXCEPT_NO_H 1
+#define ACE_HAS_IOMANIP_NO_H 1
 
 /* Platform provides <sys/ioctl.h> header */
 #define ACE_HAS_SYS_IOCTL_H 1
@@ -146,7 +147,7 @@
 
 /* Platform has a getrusage () prototype in sys/resource.h that differs from
    the one in ace/OS.i. */
-#define ACE_HAS_GETRUSAGE_PROTOTYPE
+#define ACE_HAS_GETRUSAGE_PROTO
 
 /* The GPERF utility is compiled for this platform */
 #define ACE_HAS_GPERF
@@ -282,7 +283,7 @@
 #define ACE_HAS_SIZET_SOCKET_LEN
 
 /* Compiler/platform provides the sys/sockio.h file */
-#define ACE_HAS_SYS_SOCKIO_H
+#define ACE_HAS_SOCKIO_H
 
 /* Compiler supports the ssize_t typedef */
 #define ACE_HAS_SSIZE_T
@@ -327,7 +328,7 @@
 #define ACE_HAS_SVR4_TLI
 
 /* Compiler/platform contains the <sys/syscall.h> file. */
-#define ACE_HAS_SYS_SYSCALL_H
+#define ACE_HAS_SYSCALL_H
 
 /* Platform supports system configuration information */
 #define ACE_HAS_SYSINFO 1
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index c7b41c9ea97..43e6e6cc60f 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -104,8 +104,8 @@
 #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768
 #define ACE_DEFAULT_THREAD_KEYS 16
 #define ACE_HAS_BROKEN_ACCEPT_ADDR
-#define ACE_HAS_NONCONST_SENDMSG
-#define ACE_HAS_NONCONST_WRITEV
+#define ACE_HAS_BROKEN_SENDMSG
+#define ACE_HAS_BROKEN_WRITEV
 #define ACE_HAS_CHARPTR_DL
 #define ACE_HAS_CHARPTR_SOCKOPT
 #define ACE_HAS_CLOCK_GETTIME
@@ -149,7 +149,7 @@
 #define ACE_LACKS_MPROTECT
 #define ACE_LACKS_MSYNC
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 #define ACE_LACKS_PWD_FUNCTIONS
 #define ACE_LACKS_READDIR_R
 #define ACE_LACKS_READLINK
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 079ba1fb143..345b73f5de3 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -88,7 +88,7 @@
 //  #endif
 
 // Define the special export macros needed to export symbols outside a dll
-#if !defined(__BORLANDC__) && !defined(__IBMCPP__)
+#ifndef __BORLANDC__
 #define ACE_HAS_CUSTOM_EXPORT_MACROS
 #define ACE_Proper_Export_Flag __declspec (dllexport)
 #define ACE_Proper_Import_Flag __declspec (dllimport)
@@ -219,10 +219,9 @@
 #define ACE_LACKS_REWINDDIR
 #define ACE_LACKS_READDIR_R
 #define ACE_LACKS_INET_ATON
-#define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_PARAM_H
 #define ACE_LACKS_PTHREAD_H
 #define ACE_LACKS_ARPA_INET_H
-#define ACE_LACKS_MADVISE
 
 #define ACE_HAS_SNPRINTF
 #define ACE_HAS_VFWPRINTF
diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h
index f3f47bfd8f7..edde4e820a2 100644
--- a/ace/config-win32-msvc-7.h
+++ b/ace/config-win32-msvc-7.h
@@ -70,7 +70,6 @@
 #define ACE_LACKS_STRRECVFD
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
-#define ACE_HAS_TEMPLATE_TYPEDEFS
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index 02e0daa03a4..84a6307949e 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -46,20 +46,7 @@
 # endif  /* ACE_LD_DECORATOR_STR */
 #endif  /* _MSC_VER >= 1200 */
 
-// Compiler sets _CPPRTTI if rtti is enabled.
-#if defined (_CPPRTTI)
-#  if defined (ACE_LACKS_RTTI)
-#    undef ACE_LACKS_RTTI
-#  endif
-#else
-#  if !defined (ACE_LACKS_RTTI)
-#    define ACE_LACKS_RTTI
-#  endif
-#endif /* _CPPRTTI */
-
-#if (_MSC_VER >= 1400)
-# include "ace/config-win32-msvc-8.h"
-#elif (_MSC_VER >= 1300)
+#if (_MSC_VER >= 1300)
 # include "ace/config-win32-msvc-7.h"
 #elif (_MSC_VER >= 1200)
 # include "ace/config-win32-msvc-6.h"
diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h
index 8aa12dd65eb..6b14c88c866 100644
--- a/ace/config-win32-visualage.h
+++ b/ace/config-win32-visualage.h
@@ -31,14 +31,6 @@
 #define ACE_CC_PREPROCESSOR ""
 #define ACE_CC_PREPROCESSOR_ARGS ""
 
-#define ACE_HAS_CUSTOM_EXPORT_MACROS
-#define ACE_Proper_Export_Flag __declspec (dllexport)
-#define ACE_Proper_Import_Flag __declspec (dllimport)
-#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class  T
-#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>;
-#define ACE_IMPORT_SINGLETON_DECLARATION(T) template class T
-#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class SINGLETON_TYPE <CLASS, LOCK>;
-
 // By default WIN32 has FD_SETSIZE of 64, which places the limit
 // between 61 and 64 on the number of clients a server using the
 // Select Reactor can support at the same time (i.e., 64 - standard in,
@@ -82,44 +74,9 @@
 #define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 
-#define ACE_LACKS_NET_IF_H
-#define ACE_LACKS_NETINET_IN_H
-#define ACE_LACKS_DIRENT_H
-#define ACE_LACKS_DLFCN_H
-#define ACE_LACKS_NETDB_H
-#define ACE_LACKS_PWD_H
-#define ACE_LACKS_SEMAPHORE_H
-#define ACE_LACKS_STDINT_H
-#define ACE_LACKS_STRINGS_H
-#define ACE_LACKS_SYS_IOCTL_H
-#define ACE_LACKS_STROPTS_H
-#define ACE_LACKS_UCONTEXT_H
-#define ACE_LACKS_SYS_IPC_H
-#define ACE_LACKS_SYS_MMAN_H
-#define ACE_LACKS_SYS_RESOURCE_H
-#define ACE_LACKS_SYS_SELECT_H
-#define ACE_LACKS_SYS_SEM_H
-#define ACE_LACKS_SYS_SOCKET_H
-#define ACE_LACKS_SYS_TIME_H
-#define ACE_LACKS_SYS_UIO_H
-#define ACE_LACKS_SYS_WAIT_H
-#define ACE_LACKS_SYS_SHM_H
-#define ACE_LACKS_SYS_MSG_H
-#define ACE_LACKS_TERMIOS_H
-#define ACE_LACKS_POLL_H
-#define ACE_LACKS_NETINET_TCP_H
-#define ACE_HAS_3_PARAM_WCSTOK
-#define ACE_LACKS_STRCASECMP
-#define ENOTEMPTY     WSAENOTEMPTY
-#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-
 #undef WIFEXITED
 #undef WEXITSTATUS
 
-#define _O_CREAT  O_CREAT
-#define _O_TRUNC   O_TRUNC
-#define _O_TEMPORARY   0
-#define _O_EXCL   O_EXCL
 #define _O_RDWR   O_RDWR
 #define _O_WRONLY O_WRONLY
 #define _O_RDONLY O_RDONLY
diff --git a/ace/os_include/arpa/os_inet.h b/ace/os_include/arpa/os_inet.h
index 34efdeed433..1ba2a0c1051 100644
--- a/ace/os_include/arpa/os_inet.h
+++ b/ace/os_include/arpa/os_inet.h
@@ -70,9 +70,9 @@ extern "C"
    unsigned long  inet_network (const char *);
 #endif /* ! (ACE_VXWORKS) && ACE_VXWORKS <= 0x540 */
 
-#if defined (ACE_LACKS_INET_ATON_PROTOTYPE)
+#if defined (__Lynx__)
   int inet_aton (const char *, struct in_addr *);
-#endif /* ACE_LACKS_INET_ATON_PROTOTYPE */
+#endif /* __Lynx__ */
 
 #ifdef __cplusplus
 }
diff --git a/ace/os_include/os_errno.h b/ace/os_include/os_errno.h
index 4c39bc04dfa..142b5338cfa 100644
--- a/ace/os_include/os_errno.h
+++ b/ace/os_include/os_errno.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/os_float.h b/ace/os_include/os_float.h
index 94cfb3dc5ef..b876600aa33 100644
--- a/ace/os_include/os_float.h
+++ b/ace/os_include/os_float.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/os_inttypes.h b/ace/os_include/os_inttypes.h
index 12ce23d9b8c..f01cf4b2803 100644
--- a/ace/os_include/os_inttypes.h
+++ b/ace/os_include/os_inttypes.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/os_limits.h b/ace/os_include/os_limits.h
index 27be31af2b4..0724e4c5ed3 100644
--- a/ace/os_include/os_limits.h
+++ b/ace/os_include/os_limits.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,15 +31,9 @@
 # include /**/ <limits.h>
 #endif /* !ACE_LACKS_LIMITS_H */
 
-#if !defined (ACE_LACKS_SYS_PARAM_H)
+#if !defined (ACE_LACKS_PARAM_H)
 #  include /**/ <sys/param.h>
-#endif /* ACE_LACKS_SYS_PARAM_H */
-
-// On VxWorks _POSIX_TIMER_MAX is defined in time.h, report this to WindRiver
-// support.
-#if defined (VXWORKS)
-#  include /**/ <time.h>
-#endif /* VXWORKS */
+#endif /* ACE_LACKS_PARAM_H */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
diff --git a/ace/os_include/os_signal.h b/ace/os_include/os_signal.h
index 45a1a0fddaf..86e619b41a0 100644
--- a/ace/os_include/os_signal.h
+++ b/ace/os_include/os_signal.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/os_stdint.h b/ace/os_include/os_stdint.h
index 3d9327ac99a..02fe7101725 100644
--- a/ace/os_include/os_stdint.h
+++ b/ace/os_include/os_stdint.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/os_stdlib.h b/ace/os_include/os_stdlib.h
index 5bcb77f430c..006272ef84c 100644
--- a/ace/os_include/os_stdlib.h
+++ b/ace/os_include/os_stdlib.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -67,22 +67,21 @@ extern "C"
    int putenv (char *); // stdlib.h
 #endif /* ACE_PSOS_SNARFS_HEADER_INFO */
 
+// These prototypes are chronically lacking from many versions of
+// UNIX.
+#if !defined (ACE_WIN32) && defined (ACE_LACKS_MKTEMP)
+  char *mktemp (char *);
+#endif /* !ACE_WIN32 && ACE_LACKS_MKTEMP */
 
 #if defined (DIGITAL_UNIX)
   extern int _Prand_r (unsigned int *seedptr);
 #endif /* DIGITAL_UNIX */
 
-#if defined (ACE_LACKS_PUTENV_PROTOTYPE)
+#if defined (__Lynx__)
   int putenv (char *);
-#endif /* ACE_LACKS_PUTENV_PROTOTYPE */
-
-#if defined (ACE_LACKS_MKTEMP_PROTOTYPE)
   char *mktemp (char *);
-#endif /* ACE_LACKS_MKTEMP_PROTOTYPE */
-
-#if defined (ACE_LACKS_MKSTEMP_PROTOTYPE)
   int mkstemp(char *);
-#endif /* ACE_LACKS_MKSTEMP_PROTOTYPE */
+#endif /* __Lynx__ */
 
 #ifdef __cplusplus
 }
diff --git a/ace/os_include/os_strings.h b/ace/os_include/os_strings.h
index 2fdcf723bec..850b21f60a5 100644
--- a/ace/os_include/os_strings.h
+++ b/ace/os_include/os_strings.h
@@ -36,13 +36,10 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (ACE_LACKS_STRCASECMP_PROTOTYPE)
+#if defined (__Lynx__)
   int strcasecmp(const char *, const char *);
-#endif /* ACE_LACKS_STRCASECMP_PROTOTYPE */
-
-#if defined (ACE_LACKS_STRNCASECMP_PROTOTYPE)
   int strncasecmp(const char *, const char *, size_t);
-#endif /* ACE_LACKS_STRNCASECMP_PROTOTYPE */
+#endif /* __Lynx__ */
     
 #ifdef __cplusplus
 }
diff --git a/ace/os_include/os_stropts.h b/ace/os_include/os_stropts.h
index e28b672f560..d4113e49983 100644
--- a/ace/os_include/os_stropts.h
+++ b/ace/os_include/os_stropts.h
@@ -46,7 +46,7 @@
 #  include /**/ <sys/filio.h>
 #endif /* ACE_HAS_SYS_FILIO_H */
 
-#if defined (ACE_HAS_SYS_SOCKIO_H)
+#if defined (ACE_HAS_SOCKIO_H)
 #  include /**/ <sys/sockio.h>
 #endif /* ACE_HAS_SOCKIO_ */
 
diff --git a/ace/os_include/os_time.h b/ace/os_include/os_time.h
index 80f49200187..17d945a7074 100644
--- a/ace/os_include/os_time.h
+++ b/ace/os_include/os_time.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/os_ucontext.h b/ace/os_include/os_ucontext.h
index dd4b5001ba9..67ce5ba9b10 100644
--- a/ace/os_include/os_ucontext.h
+++ b/ace/os_include/os_ucontext.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/os_unistd.h b/ace/os_include/os_unistd.h
index 8a9324cd741..5594604b260 100644
--- a/ace/os_include/os_unistd.h
+++ b/ace/os_include/os_unistd.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -166,14 +166,11 @@ extern "C"
 
 # endif /* ACE_LACKS_TIMEDWAIT_PROTOTYPES */
 
-#if defined (ACE_LACKS_SWAB_PROTOTYPE)
+#if defined (__Lynx__)
   void swab(const void *, void *, ssize_t);
-#endif /* ACE_LACKS_SWAB_PROTOTYPE */
-  
-#if defined (ACE_LACKS_GETOPT_PROTOTYPE)
   int getopt(int, char * const [], const char *);
-#endif /* ACE_LACKS_GETOPT_PROTOTYPE */
-  
+#endif /* __Lynx__ */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/sys/os_ipc.h b/ace/os_include/sys/os_ipc.h
index ee5d198048e..3acd1ed78cc 100644
--- a/ace/os_include/sys/os_ipc.h
+++ b/ace/os_include/sys/os_ipc.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_mman.h b/ace/os_include/sys/os_mman.h
index 6ccb58d548f..d481cafaad8 100644
--- a/ace/os_include/sys/os_mman.h
+++ b/ace/os_include/sys/os_mman.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_msg.h b/ace/os_include/sys/os_msg.h
index e6b2c6c1c63..e5b4a0b4214 100644
--- a/ace/os_include/sys/os_msg.h
+++ b/ace/os_include/sys/os_msg.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_resource.h b/ace/os_include/sys/os_resource.h
index dd289b10a7a..8845e544782 100644
--- a/ace/os_include/sys/os_resource.h
+++ b/ace/os_include/sys/os_resource.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,9 +35,9 @@
 #  include /**/ <sys/systeminfo.h>
 #endif /* ACE_HAS_SYS_INFO */
 
-#if defined (ACE_HAS_SYS_SYSCALL_H)
+#if defined (ACE_HAS_SYSCALL_H)
 #  include /**/ <sys/syscall.h>
-#endif /* ACE_HAS_SYS_SYSCALL_H */
+#endif /* ACE_HAS_SYSCALL_H */
 
 // prusage_t is defined in <sys/procfs.h>
 #if defined (ACE_HAS_PROC_FS)
@@ -61,6 +61,12 @@ extern "C"
 #  endif /* defined (linux) || defined (AIX) || defined (SCO) */
 #endif /* RLIMIT_NOFILE */
 
+#if defined (ACE_HAS_BROKEN_SETRLIMIT)
+   typedef struct rlimit ACE_SETRLIMIT_TYPE;
+#else
+   typedef const struct rlimit ACE_SETRLIMIT_TYPE;
+#endif /* ACE_HAS_BROKEN_SETRLIMIT */
+
 #if defined (ACE_WIN32)
 #  define RUSAGE_SELF 1
    /// Fake the UNIX rusage structure.  Perhaps we can add more to this
@@ -92,7 +98,7 @@ extern "C"
 #if !defined (ACE_WIN32)
 // These prototypes are chronically lacking from many versions of
 // UNIX.
-# if !defined (ACE_HAS_GETRUSAGE_PROTOTYPE)
+# if !defined (ACE_HAS_GETRUSAGE_PROTO)
   int getrusage (int who, struct rusage *rusage);
 # endif /* ! ACE_HAS_GETRUSAGE_PROTO */
 
diff --git a/ace/os_include/sys/os_select.h b/ace/os_include/sys/os_select.h
index f8da718e6a9..99f32bb4936 100644
--- a/ace/os_include/sys/os_select.h
+++ b/ace/os_include/sys/os_select.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_sem.h b/ace/os_include/sys/os_sem.h
index 93f669d2913..b0f3544dd26 100644
--- a/ace/os_include/sys/os_sem.h
+++ b/ace/os_include/sys/os_sem.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_shm.h b/ace/os_include/sys/os_shm.h
index af005e8dbb2..47c40660344 100644
--- a/ace/os_include/sys/os_shm.h
+++ b/ace/os_include/sys/os_shm.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_socket.h b/ace/os_include/sys/os_socket.h
index 938a71b39db..8f232a67b81 100644
--- a/ace/os_include/sys/os_socket.h
+++ b/ace/os_include/sys/os_socket.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -50,6 +50,12 @@ extern "C"
    struct msghdr {};
 #endif /* ACE_HAS_MSG */
 
+#if defined (ACE_HAS_BROKEN_SENDMSG)
+   typedef struct msghdr ACE_SENDMSG_TYPE;
+#else
+   typedef const struct msghdr ACE_SENDMSG_TYPE;
+#endif /* ACE_HAS_BROKEN_SENDMSG */
+
 #if defined (ACE_HAS_MSG) && defined (ACE_LACKS_MSG_ACCRIGHTS)
 #  if !defined (msg_accrights)
 #    undef msg_control
@@ -196,7 +202,7 @@ extern "C"
                           struct timespec *timeout);
 
   ssize_t sendmsg_timedwait (ACE_HANDLE handle,
-			     const struct msghdr *msg,
+                             ACE_SENDMSG_TYPE *msg,
                              int flags,
                              struct timespec *timeout);
 
diff --git a/ace/os_include/sys/os_stat.h b/ace/os_include/sys/os_stat.h
index 375a91714f4..1a9a357cf92 100644
--- a/ace/os_include/sys/os_stat.h
+++ b/ace/os_include/sys/os_stat.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_statvfs.h b/ace/os_include/sys/os_statvfs.h
index 546c20b10f2..e24c85daab8 100644
--- a/ace/os_include/sys/os_statvfs.h
+++ b/ace/os_include/sys/os_statvfs.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_time.h b/ace/os_include/sys/os_time.h
index 4fb260bcd7e..37edcd8d328 100644
--- a/ace/os_include/sys/os_time.h
+++ b/ace/os_include/sys/os_time.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_timeb.h b/ace/os_include/sys/os_timeb.h
index c3b3559269b..aa2102e8b95 100644
--- a/ace/os_include/sys/os_timeb.h
+++ b/ace/os_include/sys/os_timeb.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_times.h b/ace/os_include/sys/os_times.h
index c63b9e0098c..62e69921e7d 100644
--- a/ace/os_include/sys/os_times.h
+++ b/ace/os_include/sys/os_times.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_types.h b/ace/os_include/sys/os_types.h
index da7cb514c75..ee5999c5cbb 100644
--- a/ace/os_include/sys/os_types.h
+++ b/ace/os_include/sys/os_types.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_uio.h b/ace/os_include/sys/os_uio.h
index 1a7fd505c39..6c39c1e15b8 100644
--- a/ace/os_include/sys/os_uio.h
+++ b/ace/os_include/sys/os_uio.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -63,15 +63,27 @@ extern "C"
 #endif /* __rtems__ */
 
 
+#if defined (ACE_HAS_BROKEN_WRITEV)
+   typedef struct iovec ACE_WRITEV_TYPE;
+#else
+   typedef const struct iovec ACE_WRITEV_TYPE;
+#endif /* ACE_HAS_BROKEN_WRITEV */
+
+#if defined (ACE_HAS_BROKEN_READV)
+   typedef const struct iovec ACE_READV_TYPE;
+#else
+   typedef struct iovec ACE_READV_TYPE;
+#endif /* ACE_HAS_BROKEN_READV */
+
 # if defined (ACE_LACKS_TIMEDWAIT_PROTOTYPES)
 
   ssize_t readv_timedwait (ACE_HANDLE handle,
-                           const iovec *iov,
+                           iovec *iov,
                            int iovcnt,
                            struct timespec* timeout);
 
   ssize_t writev_timedwait (ACE_HANDLE handle,
-                            const iovec *iov,
+                            ACE_WRITEV_TYPE *iov,
                             int iovcnt,
                             struct timespec *timeout);
 
diff --git a/ace/os_include/sys/os_un.h b/ace/os_include/sys/os_un.h
index 1b2e5aca9ef..29e35fb8252 100644
--- a/ace/os_include/sys/os_un.h
+++ b/ace/os_include/sys/os_un.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_utsname.h b/ace/os_include/sys/os_utsname.h
index d707cbecc7d..906ae60dca6 100644
--- a/ace/os_include/sys/os_utsname.h
+++ b/ace/os_include/sys/os_utsname.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/os_include/sys/os_wait.h b/ace/os_include/sys/os_wait.h
index eb9f7e1d2de..8e6ec6e1624 100644
--- a/ace/os_include/sys/os_wait.h
+++ b/ace/os_include/sys/os_wait.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/apps/FaCE/FaCE.vcp b/apps/FaCE/FaCE.vcp
new file mode 100644
index 00000000000..1dcf8c5fe60
--- /dev/null
+++ b/apps/FaCE/FaCE.vcp
@@ -0,0 +1,604 @@
+# Microsoft eMbedded Visual Tools Project File - Name="FaCE" - Package Owner=<4>
+# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (WCE x86) Application" 0x8301
+# TARGTYPE "Win32 (WCE ARM) Application" 0x8501
+
+CFG=FaCE - Win32 (WCE ARM) 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 "FaCE.vcn".
+!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 "FaCE.vcn" CFG="FaCE - Win32 (WCE ARM) Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "FaCE - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "FaCE - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "FaCE - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Application")
+!MESSAGE "FaCE - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+# PROP ATL_Project 2
+
+!IF  "$(CFG)" == "FaCE - Win32 (WCE ARM) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ARMRel"
+# PROP BASE Intermediate_Dir "ARMRel"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ARMRel"
+# PROP Intermediate_Dir "ARMRel"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "$(ACE_ROOT)" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Oxs /M$(CECrtMT) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib ace_os.lib ace.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /libpath:"$(ACE_ROOT)\LIB\Release\ARM" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "ARMDbg"
+# PROP BASE Intermediate_Dir "ARMDbg"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "ARMDbg"
+# PROP Intermediate_Dir "ARMDbg"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "$(ACE_ROOT)" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib ace_osd.lib aced.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"$(ACE_ROOT)\LIB\Debug\ARM" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE x86) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "X86Rel"
+# PROP BASE Intermediate_Dir "X86Rel"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "X86Rel"
+# PROP Intermediate_Dir "X86Rel"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /Oxs /c
+# ADD CPP /nologo /W3 /I "$(ACE_ROOT)" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Gs8192 /GF /Oxs /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib ace_os.lib ace.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE x86) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "X86Dbg"
+# PROP BASE Intermediate_Dir "X86Dbg"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "X86Dbg"
+# PROP Intermediate_Dir "X86Dbg"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "$(ACE_ROOT)" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Gs8192 /GF /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib ace_osd.lib aced.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"$(ACE_ROOT)\LIB\Debug\X86EM" /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ENDIF 
+
+# Begin Target
+
+# Name "FaCE - Win32 (WCE ARM) Release"
+# Name "FaCE - Win32 (WCE ARM) Debug"
+# Name "FaCE - Win32 (WCE x86) Release"
+# Name "FaCE - Win32 (WCE x86) Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\FaCE.cpp
+
+!IF  "$(CFG)" == "FaCE - Win32 (WCE ARM) Release"
+
+DEP_CPP_FACE_=\
+	".\FaCE.h"\
+	
+NODEP_CPP_FACE_=\
+	".\ipapi.h"\
+	".\StdAfx.h"\
+	".\ygshell.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_FACE_=\
+	".\FaCE.h"\
+	
+NODEP_CPP_FACE_=\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ACE.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\CE_Screen_Output.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\
+	".\ipapi.h"\
+	".\StdAfx.h"\
+	".\ygshell.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE x86) Release"
+
+DEP_CPP_FACE_=\
+	".\FaCE.h"\
+	
+NODEP_CPP_FACE_=\
+	".\ipapi.h"\
+	".\StdAfx.h"\
+	".\ygshell.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE x86) Debug"
+
+DEP_CPP_FACE_=\
+	"..\..\ace\ace.h"\
+	"..\..\ace\ACE.i"\
+	"..\..\ace\ACE_export.h"\
+	"..\..\ace\ace_wchar.h"\
+	"..\..\ace\ace_wchar.inl"\
+	"..\..\ace\Argv_Type_Converter.h"\
+	"..\..\ace\Argv_Type_Converter.inl"\
+	"..\..\ace\Base_Thread_Adapter.h"\
+	"..\..\ace\Base_Thread_Adapter.inl"\
+	"..\..\ace\Basic_Types.h"\
+	"..\..\ace\Basic_Types.i"\
+	"..\..\ace\CE_Screen_Output.h"\
+	"..\..\ace\config-all.h"\
+	"..\..\ace\config-cygwin32-common.h"\
+	"..\..\ace\config-cygwin32.h"\
+	"..\..\ace\config-g++-common.h"\
+	"..\..\ace\config-ghs-common.h"\
+	"..\..\ace\config-win32-borland.h"\
+	"..\..\ace\config-win32-common.h"\
+	"..\..\ace\config-win32-ghs.h"\
+	"..\..\ace\config-win32-mingw.h"\
+	"..\..\ace\config-win32-msvc-5.h"\
+	"..\..\ace\config-win32-msvc-6.h"\
+	"..\..\ace\config-win32-msvc-7.h"\
+	"..\..\ace\config-win32-msvc.h"\
+	"..\..\ace\config-win32-visualage.h"\
+	"..\..\ace\config-win32.h"\
+	"..\..\ace\config-WinCE.h"\
+	"..\..\ace\config.h"\
+	"..\..\ace\Default_Constants.h"\
+	"..\..\ace\Flag_Manip.h"\
+	"..\..\ace\Flag_Manip.i"\
+	"..\..\ace\Global_Macros.h"\
+	"..\..\ace\Handle_Ops.h"\
+	"..\..\ace\Handle_Ops.i"\
+	"..\..\ace\Init_ACE.h"\
+	"..\..\ace\Init_ACE.i"\
+	"..\..\ace\iosfwd.h"\
+	"..\..\ace\Lib_Find.h"\
+	"..\..\ace\Lib_Find.i"\
+	"..\..\ace\Log_Msg.h"\
+	"..\..\ace\Log_Msg_Callback.h"\
+	"..\..\ace\Log_Priority.h"\
+	"..\..\ace\Log_Record.h"\
+	"..\..\ace\Log_Record.i"\
+	"..\..\ace\Managed_Object.cpp"\
+	"..\..\ace\Managed_Object.h"\
+	"..\..\ace\Managed_Object.i"\
+	"..\..\ace\Min_Max.h"\
+	"..\..\ace\Object_Manager.h"\
+	"..\..\ace\Object_Manager.i"\
+	"..\..\ace\OS.h"\
+	"..\..\ace\OS.i"\
+	"..\..\ace\OS_Dirent.h"\
+	"..\..\ace\OS_Dirent.inl"\
+	"..\..\ace\OS_Errno.h"\
+	"..\..\ace\OS_Errno.inl"\
+	"..\..\ace\OS_Export.h"\
+	"..\..\ace\OS_Log_Msg_Attributes.h"\
+	"..\..\ace\OS_Log_Msg_Attributes.inl"\
+	"..\..\ace\OS_Memory.h"\
+	"..\..\ace\OS_Memory.inl"\
+	"..\..\ace\OS_String.h"\
+	"..\..\ace\OS_String.inl"\
+	"..\..\ace\OS_TLI.h"\
+	"..\..\ace\OS_TLI.inl"\
+	"..\..\ace\post.h"\
+	"..\..\ace\pre.h"\
+	"..\..\ace\Sock_Connect.h"\
+	"..\..\ace\Sock_Connect.i"\
+	"..\..\ace\streams.h"\
+	"..\..\ace\svc_export.h"\
+	"..\..\ace\Thread_Adapter.h"\
+	"..\..\ace\Thread_Adapter.inl"\
+	"..\..\ace\Thread_Control.h"\
+	"..\..\ace\Thread_Control.inl"\
+	"..\..\ace\Thread_Exit.h"\
+	"..\..\ace\Thread_Hook.h"\
+	"..\..\ace\Trace.h"\
+	".\CE_ARGV.h"\
+	".\CE_Screen_Output.h"\
+	".\FaCE.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.rc
+
+!IF  "$(CFG)" == "FaCE - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE x86) Release"
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE x86) Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Main.cpp
+
+!IF  "$(CFG)" == "FaCE - Win32 (WCE ARM) Release"
+
+DEP_CPP_MAIN_=\
+	".\FaCE.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MAIN_=\
+	".\FaCE.h"\
+	
+NODEP_CPP_MAIN_=\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE x86) Release"
+
+DEP_CPP_MAIN_=\
+	".\FaCE.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCE - Win32 (WCE x86) Debug"
+
+DEP_CPP_MAIN_=\
+	"..\..\ace\ACE_export.h"\
+	"..\..\ace\ace_wchar.h"\
+	"..\..\ace\ace_wchar.inl"\
+	"..\..\ace\Argv_Type_Converter.h"\
+	"..\..\ace\Argv_Type_Converter.inl"\
+	"..\..\ace\Base_Thread_Adapter.h"\
+	"..\..\ace\Base_Thread_Adapter.inl"\
+	"..\..\ace\Basic_Types.h"\
+	"..\..\ace\Basic_Types.i"\
+	"..\..\ace\CE_Screen_Output.h"\
+	"..\..\ace\config-all.h"\
+	"..\..\ace\config-cygwin32-common.h"\
+	"..\..\ace\config-cygwin32.h"\
+	"..\..\ace\config-g++-common.h"\
+	"..\..\ace\config-ghs-common.h"\
+	"..\..\ace\config-win32-borland.h"\
+	"..\..\ace\config-win32-common.h"\
+	"..\..\ace\config-win32-ghs.h"\
+	"..\..\ace\config-win32-mingw.h"\
+	"..\..\ace\config-win32-msvc-5.h"\
+	"..\..\ace\config-win32-msvc-6.h"\
+	"..\..\ace\config-win32-msvc-7.h"\
+	"..\..\ace\config-win32-msvc.h"\
+	"..\..\ace\config-win32-visualage.h"\
+	"..\..\ace\config-win32.h"\
+	"..\..\ace\config-WinCE.h"\
+	"..\..\ace\config.h"\
+	"..\..\ace\Default_Constants.h"\
+	"..\..\ace\Global_Macros.h"\
+	"..\..\ace\iosfwd.h"\
+	"..\..\ace\Log_Msg.h"\
+	"..\..\ace\Log_Msg_Callback.h"\
+	"..\..\ace\Log_Priority.h"\
+	"..\..\ace\Log_Record.h"\
+	"..\..\ace\Log_Record.i"\
+	"..\..\ace\Managed_Object.cpp"\
+	"..\..\ace\Managed_Object.h"\
+	"..\..\ace\Managed_Object.i"\
+	"..\..\ace\Min_Max.h"\
+	"..\..\ace\Object_Manager.h"\
+	"..\..\ace\Object_Manager.i"\
+	"..\..\ace\OS.h"\
+	"..\..\ace\OS.i"\
+	"..\..\ace\OS_Dirent.h"\
+	"..\..\ace\OS_Dirent.inl"\
+	"..\..\ace\OS_Errno.h"\
+	"..\..\ace\OS_Errno.inl"\
+	"..\..\ace\OS_Export.h"\
+	"..\..\ace\OS_Log_Msg_Attributes.h"\
+	"..\..\ace\OS_Log_Msg_Attributes.inl"\
+	"..\..\ace\OS_Memory.h"\
+	"..\..\ace\OS_Memory.inl"\
+	"..\..\ace\OS_String.h"\
+	"..\..\ace\OS_String.inl"\
+	"..\..\ace\OS_TLI.h"\
+	"..\..\ace\OS_TLI.inl"\
+	"..\..\ace\post.h"\
+	"..\..\ace\pre.h"\
+	"..\..\ace\streams.h"\
+	"..\..\ace\svc_export.h"\
+	"..\..\ace\Thread_Adapter.h"\
+	"..\..\ace\Thread_Adapter.inl"\
+	"..\..\ace\Thread_Control.h"\
+	"..\..\ace\Thread_Control.inl"\
+	"..\..\ace\Thread_Exit.h"\
+	"..\..\ace\Thread_Hook.h"\
+	"..\..\ace\Trace.h"\
+	".\CE_Screen_Output.h"\
+	".\FaCE.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\FaCE.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\newres.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\resource.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\ACE_Racer.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO.bmp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\License.txt
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReadMe.txt
+# End Source File
+# End Target
+# End Project
diff --git a/apps/FaCE/FaCE.vcw b/apps/FaCE/FaCE.vcw
new file mode 100644
index 00000000000..3ef52974f61
--- /dev/null
+++ b/apps/FaCE/FaCE.vcw
@@ -0,0 +1,29 @@
+Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "FaCE"=".\FaCE.vcp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/apps/FaCE/FaCENOACE.vcp b/apps/FaCE/FaCENOACE.vcp
new file mode 100644
index 00000000000..a6cabffe420
--- /dev/null
+++ b/apps/FaCE/FaCENOACE.vcp
@@ -0,0 +1,528 @@
+# Microsoft eMbedded Visual Tools Project File - Name="FaCENOACE" - Package Owner=<4>
+# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (WCE x86) Application" 0x8301
+# TARGTYPE "Win32 (WCE ARM) Application" 0x8501
+
+CFG=FaCENOACE - Win32 (WCE ARM) 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 "FaCENOACE.vcn".
+!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 "FaCENOACE.vcn" CFG="FaCENOACE - Win32 (WCE ARM) Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "FaCENOACE - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "FaCENOACE - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "FaCENOACE - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Application")
+!MESSAGE "FaCENOACE - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+# PROP ATL_Project 2
+
+!IF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ARMRel"
+# PROP BASE Intermediate_Dir "ARMRel"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ARMRelNOACE"
+# PROP Intermediate_Dir "ARMRelNOACE"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /D "ARM" /D "_ARM_" /D "NDEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /Oxs /M$(CECrtMT) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "ARMDbg"
+# PROP BASE Intermediate_Dir "ARMDbg"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "ARMDbgNOACE"
+# PROP Intermediate_Dir "ARMDbgNOACE"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /M$(CECrtMTDebug) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "X86Rel"
+# PROP BASE Intermediate_Dir "X86Rel"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "X86RelNOACE"
+# PROP Intermediate_Dir "X86RelNOACE"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /Oxs /c
+# ADD CPP /nologo /W3 /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "NDEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /Gs8192 /GF /Oxs /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "X86Dbg"
+# PROP BASE Intermediate_Dir "X86Dbg"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "X86DbgNOACE"
+# PROP Intermediate_Dir "X86DbgNOACE"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /Gs8192 /GF /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ENDIF 
+
+# Begin Target
+
+# Name "FaCENOACE - Win32 (WCE ARM) Release"
+# Name "FaCENOACE - Win32 (WCE ARM) Debug"
+# Name "FaCENOACE - Win32 (WCE x86) Release"
+# Name "FaCENOACE - Win32 (WCE x86) Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\CE_ARGV.CPP
+
+!IF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+DEP_CPP_CE_AR=\
+	".\CE_ARGV.H"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CE_AR=\
+	".\CE_ARGV.H"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+DEP_CPP_CE_AR=\
+	".\CE_ARGV.H"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+DEP_CPP_CE_AR=\
+	".\CE_ARGV.H"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\CE_Screen_Output.cpp
+
+!IF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+DEP_CPP_CE_SC=\
+	".\CE_Screen_Output.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CE_SC=\
+	".\CE_Screen_Output.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+DEP_CPP_CE_SC=\
+	".\CE_Screen_Output.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+DEP_CPP_CE_SC=\
+	".\CE_Screen_Output.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.cpp
+
+!IF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+DEP_CPP_FACE_=\
+	".\FaCE.h"\
+	".\StdAfx.h"\
+	
+NODEP_CPP_FACE_=\
+	".\ipapi.h"\
+	".\ygshell.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_FACE_=\
+	".\FaCE.h"\
+	".\StdAfx.h"\
+	
+NODEP_CPP_FACE_=\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ACE.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\CE_Screen_Output.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\
+	".\ipapi.h"\
+	".\ygshell.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+DEP_CPP_FACE_=\
+	".\FaCE.h"\
+	".\StdAfx.h"\
+	
+NODEP_CPP_FACE_=\
+	".\ipapi.h"\
+	".\ygshell.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+DEP_CPP_FACE_=\
+	".\CE_ARGV.H"\
+	".\CE_Screen_Output.h"\
+	".\FaCE.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.rc
+
+!IF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Main.cpp
+
+!IF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+DEP_CPP_MAIN_=\
+	".\FaCE.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MAIN_=\
+	".\FaCE.h"\
+	
+NODEP_CPP_MAIN_=\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\
+	"..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+DEP_CPP_MAIN_=\
+	".\FaCE.h"\
+	
+
+!ELSEIF  "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+DEP_CPP_MAIN_=\
+	".\CE_Screen_Output.h"\
+	".\FaCE.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\CE_ARGV.H
+# End Source File
+# Begin Source File
+
+SOURCE=.\CE_Screen_Output.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\newres.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\resource.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\ACE_Racer.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO.bmp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\License.txt
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReadMe.txt
+# End Source File
+# End Target
+# End Project
diff --git a/apps/FaCE/FaCENOACE.vcw b/apps/FaCE/FaCENOACE.vcw
new file mode 100644
index 00000000000..98a3b7e412a
--- /dev/null
+++ b/apps/FaCE/FaCENOACE.vcw
@@ -0,0 +1,29 @@
+Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "FaCENOACE"=".\FaCENOACE.vcp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/apps/Gateway/Gateway/Connection_Handler.cpp b/apps/Gateway/Gateway/Connection_Handler.cpp
index 1e603dc73b7..95212a7b2c7 100644
--- a/apps/Gateway/Gateway/Connection_Handler.cpp
+++ b/apps/Gateway/Gateway/Connection_Handler.cpp
@@ -2,7 +2,6 @@
 
 #define ACE_BUILD_SVC_DLL
 
-#include "ace/OS_NS_string.h"
 #include "Event_Channel.h"
 #include "Concrete_Connection_Handlers.h"
 
@@ -51,7 +50,8 @@ Connection_Handler::Connection_Handler (void)
 }
 
 Connection_Handler::Connection_Handler (const Connection_Config_Info &pci)
-  : local_addr_ (pci.local_port_),
+  : remote_addr_ (pci.remote_port_, pci.host_[0] == '\0' ? ACE_DEFAULT_SERVER_HOST : pci.host_),
+    local_addr_ (pci.local_port_),
     connection_id_ (pci.connection_id_),
     total_bytes_ (0),
     state_ (Connection_Handler::IDLE),
@@ -59,10 +59,6 @@ Connection_Handler::Connection_Handler (const Connection_Config_Info &pci)
     max_timeout_ (pci.max_retry_timeout_),
     event_channel_ (pci.event_channel_)
 {
-  if (ACE_OS::strlen (pci.host_) > 0)
-    this->remote_addr_.set (pci.remote_port_, pci.host_);
-  else
-    this->remote_addr_.set (pci.remote_port_, ACE_DEFAULT_SERVER_HOST);
   // Set the priority of the Proxy.
   this->priority (int (pci.priority_));
 }
diff --git a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp b/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
index 6382ed80220..a91d00f9e38 100644
--- a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
+++ b/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
@@ -15,7 +15,7 @@ int
 Connection_Handler_Connector::initiate_connection (Connection_Handler *connection_handler,
                                                    ACE_Synch_Options &synch_options)
 {
-  ACE_TCHAR addr_buf[MAXHOSTNAMELEN];
+  char addr_buf[MAXHOSTNAMELEN];
 
   // Mark ourselves as idle so that the various iterators will ignore
   // us until we are reconnected.
@@ -25,8 +25,8 @@ Connection_Handler_Connector::initiate_connection (Connection_Handler *connectio
   // addr_buf.
   if (connection_handler->local_addr ().addr_to_string (addr_buf, sizeof addr_buf) == -1
       || connection_handler->remote_addr ().addr_to_string (addr_buf, sizeof addr_buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
-                      ACE_TEXT ("can't obtain peer's address")), -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 (connection_handler,
@@ -37,22 +37,22 @@ Connection_Handler_Connector::initiate_connection (Connection_Handler *connectio
       if (errno != EWOULDBLOCK)
         {
           connection_handler->state (Connection_Handler::FAILED);
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %p on address %s\n"),
-                      ACE_TEXT ("connect"), addr_buf));
+          ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n",
+                      "connect", addr_buf));
           return -1;
         }
       else
         {
           connection_handler->state (Connection_Handler::CONNECTING);
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%t) in the process of connecting to %s\n"),
+                      "(%t) in the process of connecting to %s\n",
                       addr_buf));
         }
     }
   else
     {
       connection_handler->state (Connection_Handler::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) connected to %s on %d\n"),
+      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n",
                   addr_buf, connection_handler->get_handle ()));
     }
   return 0;
diff --git a/apps/Gateway/Gateway/File_Parser.cpp b/apps/Gateway/Gateway/File_Parser.cpp
index 20e29990ea8..8c065bbbf8a 100644
--- a/apps/Gateway/Gateway/File_Parser.cpp
+++ b/apps/Gateway/Gateway/File_Parser.cpp
@@ -22,9 +22,9 @@ typedef FP::Return_Type FP_RETURN_TYPE;
 // File_Parser stuff.
 
 template <class ENTRY> int
-File_Parser<ENTRY>::open (const ACE_TCHAR filename[])
+File_Parser<ENTRY>::open (const char filename[])
 {
-  this->infile_ = ACE_OS::fopen (filename, ACE_TEXT ("r"));
+  this->infile_ = ACE_OS::fopen (filename, "r");
   if (this->infile_ == 0)
     return -1;
   else
diff --git a/apps/Gateway/Gateway/File_Parser.h b/apps/Gateway/Gateway/File_Parser.h
index 1e8dd264809..8f09352fcd9 100644
--- a/apps/Gateway/Gateway/File_Parser.h
+++ b/apps/Gateway/Gateway/File_Parser.h
@@ -47,7 +47,7 @@ class File_Parser
   //     <Consumer_Map>.
 public:
   // = Open and Close the file specified
-  int open (const ACE_TCHAR filename[]);
+  int open (const char filename[]);
   int close (void);
 
   virtual FP::Return_Type read_entry (ENTRY &entry,
diff --git a/apps/Gateway/Gateway/Gateway.cpp b/apps/Gateway/Gateway/Gateway.cpp
index bbe748a0cd4..f69d03b1f72 100644
--- a/apps/Gateway/Gateway/Gateway.cpp
+++ b/apps/Gateway/Gateway/Gateway.cpp
@@ -23,13 +23,13 @@ class ACE_Svc_Export Gateway : public ACE_Service_Object
   //     for the <Gateway> routing.
 protected:
   // = Service configurator hooks.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
   // Perform initialization.
 
   virtual int fini (void);
   // Perform termination when unlinked dynamically.
 
-  virtual int info (ACE_TCHAR **, size_t) const;
+  virtual int info (char **, size_t) const;
   // Return info about this service.
 
   // = Configuration methods.
@@ -77,7 +77,7 @@ Gateway::handle_input (ACE_HANDLE h)
 }
 
 int
-Gateway::init (int argc, ACE_TCHAR *argv[])
+Gateway::init (int argc, char *argv[])
 {
   // Parse the "command-line" arguments.
   Options::instance ()->parse_args (argc, argv);
@@ -92,8 +92,8 @@ Gateway::init (int argc, ACE_TCHAR *argv[])
   if (ACE_Reactor::instance ()->register_handler (sig_set,
                                                   this) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) %p\n"),
-                       ACE_TEXT ("register_handler")),
+                       "(%t) %p\n",
+                       "register_handler"),
                       -1);
 
   // Register this handler to receive events on stdin.  We use this to
@@ -102,8 +102,8 @@ Gateway::init (int argc, ACE_TCHAR *argv[])
                                                  ACE_Reactor::instance (),
                                                  ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) %p\n"),
-                       ACE_TEXT ("register_stdin_handler")),
+                       "(%t) %p\n",
+                       "register_stdin_handler"),
                       -1);
 
   // If this->performance_window_ > 0 start a timer.
@@ -114,11 +114,11 @@ Gateway::init (int argc, ACE_TCHAR *argv[])
           (&this->event_channel_, 0,
            Options::instance ()->performance_window ()) == -1)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%t) %p\n"),
-                    ACE_TEXT ("schedule_timer")));
+                    "(%t) %p\n",
+                    "schedule_timer"));
       else
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("starting timer for %d seconds...\n"),
+                    "starting timer for %d seconds...\n",
                    Options::instance ()->performance_window ()));
     }
 
@@ -159,12 +159,12 @@ Gateway::fini (void)
 // Returns information on the currently active service.
 
 int
-Gateway::info (ACE_TCHAR **strp, size_t length) const
+Gateway::info (char **strp, size_t length) const
 {
-  ACE_TCHAR buf[BUFSIZ];
+  char buf[BUFSIZ];
 
-  ACE_OS::strcpy
-    (buf, ACE_TEXT ("Gateway daemon\t   # Application-level gateway\n"));
+  ACE_OS::sprintf (buf, "%s\t %s", "Gateway daemon",
+             "# Application-level gateway\n");
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -185,7 +185,7 @@ Gateway::parse_connection_config_file (void)
 
   if (connection_file.open (Options::instance ()->connection_config_file ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) %p\n"),
+                       "(%t) %p\n",
                        Options::instance ()->connection_config_file ()),
                       -1);
 
@@ -208,12 +208,12 @@ Gateway::parse_connection_config_file (void)
 
           if (pci.connection_id_ != 1)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("(%t) warning, the first connection id should be 1 not %d\n"),
+                        "(%t) warning, the first connection id should be 1 not %d\n",
                         pci.connection_id_));
         }
       else if (previous_connection_id + 1 != pci.connection_id_)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) warning, connection ids should keep increasing by 1 and %d + 1 != %d\n"),
+                    "(%t) warning, connection ids should keep increasing by 1 and %d + 1 != %d\n",
                     previous_connection_id,
                     pci.connection_id_));
 
@@ -223,13 +223,13 @@ Gateway::parse_connection_config_file (void)
 
       if (Options::instance ()->enabled (Options::DEBUG))
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) conn id = %d, ")
-                    ACE_TEXT ("host = %s, ")
-                    ACE_TEXT ("remote port = %d, ")
-                    ACE_TEXT ("proxy role = %c, ")
-                    ACE_TEXT ("max retry timeout = %d, ")
-                    ACE_TEXT ("local port = %d, ")
-                    ACE_TEXT ("priority = %d\n"),
+                    "(%t) conn id = %d, "
+                    "host = %s, "
+                    "remote port = %d, "
+                    "proxy role = %c, "
+                    "max retry timeout = %d, "
+                    "local port = %d, "
+                    "priority = %d\n",
                     pci.connection_id_,
                     pci.host_,
                     pci.remote_port_,
@@ -257,7 +257,7 @@ Gateway::parse_connection_config_file (void)
 
   if (file_empty)
     ACE_ERROR ((LM_WARNING,
-               ACE_TEXT ("warning: connection connection_handler configuration file was empty\n")));
+               "warning: connection connection_handler configuration file was empty\n"));
   return 0;
 }
 
@@ -271,7 +271,7 @@ Gateway::parse_consumer_config_file (void)
 
   if (consumer_file.open (Options::instance ()->consumer_config_file ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) %p\n"),
+                       "(%t) %p\n",
                        Options::instance ()->consumer_config_file ()),
                       -1);
 
@@ -285,15 +285,15 @@ Gateway::parse_consumer_config_file (void)
       if (Options::instance ()->enabled (Options::DEBUG))
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%t) connection id = %d, payload = %d, ")
-                      ACE_TEXT ("number of consumers = %d\n"),
+                      "(%t) connection id = %d, payload = %d, "
+                      "number of consumers = %d\n",
                       cci_entry.connection_id_,
                       cci_entry.type_,
                       cci_entry.total_consumers_));
 
           for (int i = 0; i < cci_entry.total_consumers_; i++)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("(%t) destination[%d] = %d\n"),
+                        "(%t) destination[%d] = %d\n",
                         i,
                         cci_entry.consumers_[i]));
         }
@@ -318,7 +318,7 @@ Gateway::parse_consumer_config_file (void)
             dispatch_set->insert (connection_handler);
           else
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%t) not found: destination[%d] = %d\n"),
+                        "(%t) not found: destination[%d] = %d\n",
                         i,
                         cci_entry.consumers_[i]));
         }
@@ -328,7 +328,7 @@ Gateway::parse_consumer_config_file (void)
 
   if (file_empty)
     ACE_ERROR ((LM_WARNING,
-               ACE_TEXT ("warning: consumer map configuration file was empty\n")));
+               "warning: consumer map configuration file was empty\n"));
   return 0;
 }
 
diff --git a/apps/Gateway/Gateway/Options.h b/apps/Gateway/Gateway/Options.h
index b5971b35c88..ba39d2f1034 100644
--- a/apps/Gateway/Gateway/Options.h
+++ b/apps/Gateway/Gateway/Options.h
@@ -106,6 +106,10 @@ public:
   // The connector port number, i.e., the one that we use to actively
   // establish connections with a gatewayd and create a Consumer.
 
+  const char *connector_host (void) const;
+  // Our connector port host, i.e., the host running the gatewayd
+  // process.
+
   const ACE_TCHAR *connection_config_file (void) const;
   // Name of the connection configuration file.
 
diff --git a/apps/Gateway/Gateway/gateway.mpc b/apps/Gateway/Gateway/gateway.mpc
index 9403ba858b1..64e5ec6288b 100644
--- a/apps/Gateway/Gateway/gateway.mpc
+++ b/apps/Gateway/Gateway/gateway.mpc
@@ -18,7 +18,7 @@ project(Gateway) : acelib {
 }
 
 project(gatewayd) : aceexe {
-  exename = gatewayd
+
   after += Gateway
   libs  += Gateway
 
diff --git a/apps/Gateway/Gateway/gatewayd.cpp b/apps/Gateway/Gateway/gatewayd.cpp
index bda60fe7d3f..8c698f4414b 100644
--- a/apps/Gateway/Gateway/gatewayd.cpp
+++ b/apps/Gateway/Gateway/gatewayd.cpp
@@ -29,7 +29,7 @@ ACE_RCSID (Gateway,
            "$Id$")
 
 int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+main (int argc, char *argv[])
 {
   if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0)
     {
@@ -38,14 +38,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       if (sp->init (argc - 1, argv + 1) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("init")),
+                           "%p\n",
+                           "init"),
                           1);
 
       // Run forever, performing the configured services until we
       // are shut down by a SIGINT/SIGQUIT signal.
 
-      ACE_Reactor::instance ()->run_reactor_event_loop ();
+      ACE_Reactor::run_event_loop ();
 
       // Destructor of <ACE_Service_Object_Ptr> automagically call
       // <fini>.
@@ -54,15 +54,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       if (ACE_Service_Config::open (argc, argv) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("open")),
+                           "%p\n",
+                           "open"),
                           1);
       else // Use dynamic linking.
 
         // Run forever, performing the configured services until we are
         // shut down by a signal (e.g., SIGINT or SIGQUIT).
 
-        ACE_Reactor::instance ()->run_reactor_event_loop ();
+        ACE_Reactor::run_event_loop ();
     }
   return 0;
 }
diff --git a/apps/Gateway/Gateway/svc.conf b/apps/Gateway/Gateway/svc.conf
index 3698b0e3e13..9b35a7dcbd6 100644
--- a/apps/Gateway/Gateway/svc.conf
+++ b/apps/Gateway/Gateway/svc.conf
@@ -1,3 +1,3 @@
 #static Svc_Manager "-d -p 2913"
-dynamic Gateway Service_Object * Gateway:_make_Gateway() active "-b -d -c C|S -a C|S -P connection_config -C consumer_config"
+dynamic Gateway Service_Object * ./Gateway:_make_Gateway() active "-b -d -c C|S -a C|S -P connection_config -C consumer_config"
 
diff --git a/apps/Gateway/Peer/Options.cpp b/apps/Gateway/Peer/Options.cpp
index 0b33552e629..b1b057f33ca 100644
--- a/apps/Gateway/Peer/Options.cpp
+++ b/apps/Gateway/Peer/Options.cpp
@@ -19,7 +19,7 @@ void
 Options::print_usage_and_die (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n")));
+              "%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n"));
   ACE_OS::exit (1);
 }
 
@@ -93,7 +93,7 @@ Options::supplier_connector_port (void) const
   return this->supplier_connector_port_;
 }
 
-const ACE_TCHAR *
+const char *
 Options::connector_host (void) const
 {
   return this->connector_host_;
@@ -106,9 +106,9 @@ Options::enabled (int option) const
 }
 
 void
-Options::parse_args (int argc, ACE_TCHAR *argv[])
+Options::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:c:C:h:m:t:v"), 0);
+  ACE_Get_Opt get_opt (argc, argv, "a:c:C:h:m:t:v", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -118,11 +118,10 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
           {
             // Become an Acceptor.
 
-            for (ACE_TCHAR *flag = ACE_OS::strtok (get_opt.opt_arg (),
-                                                   ACE_TEXT ("|"));
+            for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|");
                  flag != 0;
-                 flag = ACE_OS::strtok (0, ACE_TEXT ("|")))
-              if (ACE_OS::strncasecmp (flag, ACE_TEXT ("C"), 1) == 0)
+                 flag = ACE_OS::strtok (0, "|"))
+              if (ACE_OS::strncasecmp (flag, "C", 1) == 0)
                 {
                   ACE_SET_BITS (this->options_,
                                 Options::CONSUMER_ACCEPTOR);
@@ -130,7 +129,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
                     // Set the Consumer Acceptor port number.
                     this->consumer_acceptor_port_ = ACE_OS::atoi (flag + 2);
                 }
-              else if (ACE_OS::strncasecmp (flag, ACE_TEXT ("S"), 1) == 0)
+              else if (ACE_OS::strncasecmp (flag, "S", 1) == 0)
                 {
                   ACE_SET_BITS (this->options_,
                                 Options::SUPPLIER_ACCEPTOR);
@@ -145,11 +144,10 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
           {
             // Become a Connector.
 
-            for (ACE_TCHAR *flag = ACE_OS::strtok (get_opt.opt_arg (),
-                                                   ACE_TEXT ("|"));
+            for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|");
                  flag != 0;
-                 flag = ACE_OS::strtok (0, ACE_TEXT ("|")))
-              if (ACE_OS::strncasecmp (flag, ACE_TEXT ("C"), 1) == 0)
+                 flag = ACE_OS::strtok (0, "|"))
+              if (ACE_OS::strncasecmp (flag, "C", 1) == 0)
                 {
                   ACE_SET_BITS (this->options_,
                                 Options::CONSUMER_CONNECTOR);
@@ -157,7 +155,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
                     // Set the Consumer Connector port number.
                     this->consumer_connector_port_ = ACE_OS::atoi (flag + 2);
                 }
-              else if (ACE_OS::strncasecmp (flag, ACE_TEXT ("S"), 1) == 0)
+              else if (ACE_OS::strncasecmp (flag, "S", 1) == 0)
                 {
                   ACE_SET_BITS (this->options_,
                                 Options::SUPPLIER_CONNECTOR);
diff --git a/apps/Gateway/Peer/Options.h b/apps/Gateway/Peer/Options.h
index bc872fe7df4..371b043deac 100644
--- a/apps/Gateway/Peer/Options.h
+++ b/apps/Gateway/Peer/Options.h
@@ -39,7 +39,7 @@ public:
   static Options *instance (void);
   // Return Singleton.
 
-  void parse_args (int argc, ACE_TCHAR *argv[]);
+  void parse_args (int argc, char *argv[]);
   // Parse the arguments and set the options.
 
   // = Accessor methods.
@@ -64,7 +64,7 @@ public:
   // The connector port number, i.e., the one that we use to actively
   // establish connections with a gatewayd and create a Consumer.
 
-  const ACE_TCHAR *connector_host (void) const;
+  const char *connector_host (void) const;
   // Our connector port host, i.e., the host running the gatewayd
   // process.
 
@@ -119,7 +119,7 @@ private:
   // The connector port number, i.e., the one that we use to actively
   // establish connections with a gatewayd and create a Consumer.
 
-  const ACE_TCHAR *connector_host_;
+  const char *connector_host_;
   // Our connector host, i.e., where the gatewayd process is running.
 
   long timeout_;
diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp
index 074d1479c61..bd0c4db4de4 100644
--- a/apps/Gateway/Peer/Peer.cpp
+++ b/apps/Gateway/Peer/Peer.cpp
@@ -4,7 +4,6 @@
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
-#include "ace/OS_NS_unistd.h"
 #include "ace/Signal.h"
 #include "Peer.h"
 
@@ -28,21 +27,21 @@ int
 Peer_Handler::open (void *a)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("handle = %d\n"),
+              "handle = %d\n",
               this->peer ().get_handle ()));
 
   // Call down to the base class to activate and register this handler
   // with an <ACE_Reactor>.
   if (this->inherited::open (a) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("open")),
+                       "%p\n",
+                       "open"),
                       -1);
 
   if (this->peer ().enable (ACE_NONBLOCK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("enable")),
+                       "%p\n",
+                       "enable"),
                       -1);
 
   ACE_Time_Value timeout (Options::instance ()->timeout ());
@@ -52,8 +51,8 @@ Peer_Handler::open (void *a)
   if (ACE_Reactor::instance ()->schedule_timer
       (this, 0, timeout) == -1)
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("%p\n"),
-                ACE_TEXT ("schedule_timer")));
+                "%p\n",
+                "schedule_timer"));
 
   // If there are events left in the queue, make sure we enable the
   // <ACE_Reactor> appropriately to get them sent out.
@@ -61,8 +60,8 @@ Peer_Handler::open (void *a)
       && ACE_Reactor::instance ()->schedule_wakeup
           (this, ACE_Event_Handler::WRITE_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("schedule_wakeup")),
+                       "%p\n",
+                       "schedule_wakeup"),
                       -1);
 
   // First action is to wait to be notified of our connection id.
@@ -93,12 +92,12 @@ Peer_Handler::transmit (ACE_Message_Block *mb,
     {
       if (errno == EWOULDBLOCK) // The queue has filled up!
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%p\n"),
-                    ACE_TEXT ("gateway is flow controlled, so we're dropping events")));
+                    "%p\n",
+                    "gateway is flow controlled, so we're dropping events"));
       else
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%p\n"),
-                    ACE_TEXT ("transmission failure in transmit()"))); // Function name fixed.
+                    "%p\n",
+                    "transmission failure in transmit()")); // Function name fixed.
       // Caller is responsible for freeing a ACE_Message_Block
       // if failures occur.
       mb->release ();
@@ -132,7 +131,7 @@ Peer_Handler::transmit_stdin (void)
         {
         case 0:
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("stdin closing down\n")));
+                      "stdin closing down\n"));
 
           // Take stdin out of the ACE_Reactor so we stop trying to
           // send events.
@@ -146,8 +145,8 @@ Peer_Handler::transmit_stdin (void)
         case -1:
           mb->release ();
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%p\n"),
-                      ACE_TEXT ("read")));
+                      "%p\n",
+                      "read"));
           result = 0; //
           break;
           /* NOTREACHED */
@@ -164,7 +163,7 @@ Peer_Handler::transmit_stdin (void)
   else
   {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Must transmit over an opened channel.\n")));
+              "Must transmit over an opened channel.\n"));
     result = -1; // Save return value at here, return at exit of function.
   }
   // If transmit error, the stdin-thread will be cancelled, so should
@@ -197,7 +196,7 @@ Peer_Handler::nonblk_put (ACE_Message_Block *mb)
     {
       // We didn't manage to send everything, so requeue.
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("queueing activated on handle %d to connection id %d\n"),
+                  "queueing activated on handle %d to connection id %d\n",
                  this->get_handle (),
                   this->connection_id_));
 
@@ -206,15 +205,15 @@ Peer_Handler::nonblk_put (ACE_Message_Block *mb)
           (mb,
            (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("enqueue_head")),
+                           "%p\n",
+                           "enqueue_head"),
                           -1);
       // Tell ACE_Reactor to call us back when we can send again.
       if (ACE_Reactor::instance ()->schedule_wakeup
           (this, ACE_Event_Handler::WRITE_MASK) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("schedule_wakeup")),
+                           "%p\n",
+                           "schedule_wakeup"),
                           -1);
       return 0;
     }
@@ -231,7 +230,7 @@ Peer_Handler::handle_output (ACE_HANDLE)
   ACE_Message_Block *mb = 0;
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("in handle_output\n")));
+              "in handle_output\n"));
 
   if (this->msg_queue ()->dequeue_head
       (mb,
@@ -249,8 +248,8 @@ Peer_Handler::handle_output (ACE_HANDLE)
           // failures occur.
           mb->release ();
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%p\n"),
-                      ACE_TEXT ("transmission failure in handle_output")));
+                      "%p\n",
+                      "transmission failure in handle_output"));
           /* FALLTHROUGH */
         default: // Sent the whole thing.
           // If we succeed in writing the entire event (or we did not
@@ -262,15 +261,15 @@ Peer_Handler::handle_output (ACE_HANDLE)
           if (this->msg_queue ()->is_empty ())
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("queue now empty on handle %d to connection id %d\n"),
+                          "queue now empty on handle %d to connection id %d\n",
                           this->get_handle (),
                           this->connection_id_));
 
               if (ACE_Reactor::instance ()->cancel_wakeup
                   (this, ACE_Event_Handler::WRITE_MASK) == -1)
                 ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("%p\n"),
-                            ACE_TEXT ("cancel_wakeup")));
+                            "%p\n",
+                            "cancel_wakeup"));
             }
         }
       return 0;
@@ -278,8 +277,8 @@ Peer_Handler::handle_output (ACE_HANDLE)
   else
     // If the list is empty there's a bug!
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("dequeue_head")),
+                       "%p\n",
+                       "dequeue_head"),
                       0);
 }
 
@@ -325,7 +324,7 @@ Peer_Handler::send (ACE_Message_Block *mb)
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("sent %d bytes, total bytes sent = %d\n"),
+              "sent %d bytes, total bytes sent = %d\n",
               n,
               this->total_bytes_));
   return n;
@@ -359,10 +358,10 @@ Peer_Handler::recv (ACE_Message_Block *&mb)
           || header_received == 0  /* EOF */)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%p\n"),
-                      ACE_TEXT ("Recv error during header read")));
+                      "%p\n",
+                      "Recv error during header read"));
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("attempted to read %d bytes\n"),
+                      "attempted to read %d bytes\n",
                       header_bytes_left_to_read));
           this->msg_frag_ = this->msg_frag_->release ();
           return header_received;
@@ -375,8 +374,8 @@ Peer_Handler::recv (ACE_Message_Block *&mb)
       if (this->msg_frag_->length () < HEADER_SIZE)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Partial header received: only %d bytes\n"),
-                      this->msg_frag_->length ()));
+                      "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;
@@ -391,7 +390,7 @@ Peer_Handler::recv (ACE_Message_Block *&mb)
           // This data_ payload is too big!
           errno = EINVAL;
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Data payload is too big (%d bytes)\n"),
+                      "Data payload is too big (%d bytes)\n",
                       event->header_.len_));
           return -1;
         }
@@ -456,13 +455,13 @@ Peer_Handler::recv (ACE_Message_Block *&mb)
         }
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) connection id = %d, cur len = %d, total bytes read = %d\n"),
+                  "(%t) connection id = %d, cur len = %d, total bytes read = %d\n",
                   event->header_.connection_id_,
                   event->header_.len_,
                   data_received + header_received));
       if (Options::instance ()->enabled (Options::VERBOSE))
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("data_ = %*s\n"),
+                    "data_ = %*s\n",
                     event->header_.len_ - 2,
                     event->data_));
       return data_received + header_received;
@@ -476,7 +475,7 @@ int
 Peer_Handler::handle_input (ACE_HANDLE sd)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("in handle_input, sd = %d\n"),
+              "in handle_input, sd = %d\n",
               sd));
   if (sd == ACE_STDIN) // Handle event from stdin.
     return this->transmit_stdin ();
@@ -498,12 +497,12 @@ Peer_Handler::await_connection_id (void)
     {
       if (n == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("gatewayd has closed down unexpectedly\n")),
+                           "gatewayd has closed down unexpectedly\n"),
                           -1);
       else
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p, bytes received on handle %d = %d\n"),
-                           ACE_TEXT ("recv"),
+                           "%p, bytes received on handle %d = %d\n",
+                          "recv",
                            this->get_handle (),
                            n),
                           -1);
@@ -512,7 +511,7 @@ Peer_Handler::await_connection_id (void)
     {
       this->connection_id_ = ntohl (this->connection_id_);
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("assigned connection id %d\n"),
+                  "assigned connection id %d\n",
                   this->connection_id_));
     }
 
@@ -538,8 +537,8 @@ Peer_Handler::await_connection_id (void)
            ACE_Reactor::instance (),
            ACE_Thread_Manager::instance ()) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("(%t) %p\n"),
-                           ACE_TEXT ("register_stdin_handler")),
+                           "(%t) %p\n",
+                           "register_stdin_handler"),
                           -1);
 
       // Next time in await_connection_id(), I'll don't call
@@ -579,7 +578,7 @@ Peer_Handler::await_events (void)
     {
     case 0:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("gatewayd has closed down\n")),
+                         "gatewayd has closed down\n"),
                         -1);
       /* NOTREACHED */
     case -1:
@@ -588,8 +587,8 @@ Peer_Handler::await_events (void)
         return 0;
       else
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("recv")),
+                           "%p\n",
+                           "recv"),
                           -1);
       /* NOTREACHED */
     default:
@@ -601,13 +600,13 @@ Peer_Handler::await_events (void)
         this->total_bytes_ += mb->length ();
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("route id = %d, cur len = %d, total len = %d\n"),
+                    "route id = %d, cur len = %d, total len = %d\n",
                     event->header_.connection_id_,
                     event->header_.len_,
                     this->total_bytes_));
         if (Options::instance ()->enabled (Options::VERBOSE))
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("data_ = %*s\n"),
+                      "data_ = %*s\n",
                       event->header_.len_ - 2,
                       event->data_));
         mb->release ();
@@ -641,8 +640,8 @@ Peer_Handler::handle_close (ACE_HANDLE,
   if (this->get_handle () != ACE_INVALID_HANDLE)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("shutting down Peer on handle %d\n"),
-                  this->get_handle ()));
+                  "shutting down Peer on handle %d\n",
+                 this->get_handle ()));
 
       ACE_Reactor_Mask mask =
         ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK;
@@ -658,9 +657,9 @@ Peer_Handler::handle_close (ACE_HANDLE,
       if (ACE_Reactor::instance ()->remove_handler
           (this, mask) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("handle = %d: %p\n"),
+                           "handle = %d: %p\n",
                            this->get_handle (),
-                           ACE_TEXT ("remove_handler")),
+                           "remove_handler"),
                           -1);
       // Close down the peer.
       this->peer ().close ();
@@ -678,23 +677,23 @@ Peer_Acceptor::start (u_short port)
   this->addr_.set (port);
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("opening acceptor at port %d\n"),
+              "opening acceptor at port %d\n",
               port));
 
   // Call down to the <Acceptor::open> method.
   if (this->inherited::open (this->addr_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("open")),
+                       "%p\n",
+                       "open"),
                       -1);
   else if (this->acceptor ().get_local_addr (this->addr_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("get_local_addr")),
+                       "%p\n",
+                       "get_local_addr"),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("accepting at port %d\n"),
+                "accepting at port %d\n",
                 this->addr_.get_port_number ()));
   return 0;
 }
@@ -740,18 +739,18 @@ Peer_Connector::open_connector (Peer_Handler *&peer_handler,
                       Options::instance ()->connector_host ());
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("connecting to %s:%d\n"),
+              "connecting to %s:%d\n",
               addr.get_host_name (),
               addr.get_port_number ()));
 
   if (this->connect (peer_handler, addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("connect")),
+                       "%p\n",
+                       "connect"),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("connected to %C:%d\n"),
+                "connected to %s:%d\n",
                 addr.get_host_name (),
                 addr.get_port_number ()));
   return 0;
@@ -782,8 +781,8 @@ Peer_Factory::handle_signal (int signum, siginfo_t *, ucontext_t *)
   if (signum != SIGPIPE)
   {
     // Shut down the main event loop.
-    ACE_DEBUG((LM_NOTICE, ACE_TEXT ("Exit case signal\n"))); // Why do I exit?
-    ACE_Reactor::instance ()->end_reactor_event_loop();
+    ACE_DEBUG((LM_NOTICE, "Exit case signal\n")); // Why do I exit?
+    ACE_Reactor::end_event_loop();
   }
 
   return 0;
@@ -792,11 +791,11 @@ Peer_Factory::handle_signal (int signum, siginfo_t *, ucontext_t *)
 // Returns information on the currently active service.
 
 int
-Peer_Factory::info (ACE_TCHAR **strp, size_t length) const
+Peer_Factory::info (char **strp, size_t length) const
 {
-  ACE_TCHAR buf[BUFSIZ];
-  ACE_TCHAR consumer_addr_str[BUFSIZ];
-  ACE_TCHAR supplier_addr_str[BUFSIZ];
+  char buf[BUFSIZ];
+  char consumer_addr_str[BUFSIZ];
+  char supplier_addr_str[BUFSIZ];
 
   ACE_INET_Addr addr;
 
@@ -811,12 +810,13 @@ Peer_Factory::info (ACE_TCHAR **strp, size_t length) const
                                 sizeof addr) == -1)
     return -1;
 
-  ACE_OS::strcpy (buf, ACE_TEXT ("peerd\t C:"));
-  ACE_OS::strcat (buf, consumer_addr_str);
-  ACE_OS::strcat (buf, ACE_TEXT ("|S:"));
-  ACE_OS::strcat (buf, supplier_addr_str);
-  ACE_OS::strcat
-    (buf, ACE_TEXT ("/tcp # Gateway traffic generator and data sink\n"));
+  ACE_OS::sprintf (buf,
+                   "%s\t C:%s|S:%s/%s %s",
+                   "peerd",
+                   consumer_addr_str,
+                   supplier_addr_str,
+                   "tcp",
+                   "# Gateway traffic generator and data sink\n");
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -840,7 +840,7 @@ Peer_Factory::fini (void)
 // the peer.
 
 int
-Peer_Factory::init (int argc, ACE_TCHAR *argv[])
+Peer_Factory::init (int argc, char *argv[])
 {
   Options::instance ()->parse_args (argc, argv);
 
@@ -856,28 +856,28 @@ Peer_Factory::init (int argc, ACE_TCHAR *argv[])
   if (ACE_Reactor::instance ()->register_handler (sig_set,
                                                   this) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("register_handler")),
+                       "%p\n",
+                       "register_handler"),
                       -1);
 
   if (Options::instance ()->enabled (Options::SUPPLIER_ACCEPTOR)
       && this->supplier_acceptor_.start
       (Options::instance ()->supplier_acceptor_port ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("Acceptor::open")),
+                       "%p\n",
+                       "Acceptor::open"),
                       -1);
   else if (Options::instance ()->enabled (Options::CONSUMER_ACCEPTOR)
            && this->consumer_acceptor_.start
            (Options::instance ()->consumer_acceptor_port ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("Acceptor::open")),
+                       "%p\n",
+                       "Acceptor::open"),
                       -1);
   else if (this->connector_.open () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("Connector::open")),
+                       "%p\n",
+                       "Connector::open"),
                       -1);
   return 0;
 }
diff --git a/apps/Gateway/Peer/Peer.h b/apps/Gateway/Peer/Peer.h
index 0723882a243..34bf856f8c1 100644
--- a/apps/Gateway/Peer/Peer.h
+++ b/apps/Gateway/Peer/Peer.h
@@ -227,13 +227,13 @@ class ACE_Svc_Export Peer_Factory : public ACE_Service_Object
 public:
   // = Dynamic initialization and termination hooks from <ACE_Service_Object>.
 
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
   // Initialize the acceptor and connector.
 
   virtual int fini (void);
   // Perform termination activities.
 
-  virtual int info (ACE_TCHAR **, size_t) const;
+  virtual int info (char **, size_t) const;
   // Return info about this service.
 
   virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
diff --git a/apps/Gateway/Peer/peerd.cpp b/apps/Gateway/Peer/peerd.cpp
index f4abd599322..94df916851e 100644
--- a/apps/Gateway/Peer/peerd.cpp
+++ b/apps/Gateway/Peer/peerd.cpp
@@ -18,46 +18,45 @@
 //
 // ============================================================================
 
-#include "ace/OS_NS_unistd.h"
 #include "Peer.h"
 
 ACE_RCSID(Peer, peerd, "$Id$")
 
 int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+main (int argc, char *argv[])
 {
-  if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0)
+  if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0) 
     {
       // Use static linking.
       ACE_Service_Object_Ptr sp = ACE_SVC_INVOKE (Peer_Factory);
 
       if (sp->init (argc - 1, argv + 1) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("init")),
+                           "%p\n",
+                           "init"),
                           1);
 
       // Run forever, performing the configured services until we are
       // shut down by a SIGINT/SIGQUIT signal.
 
-      ACE_Reactor::instance ()->run_reactor_event_loop ();
+      ACE_Reactor::run_event_loop ();
 
       // Destructor of <ACE_Service_Object_Ptr> automagically call
       // <fini>.
     }
-  else
+  else 
     {
-      if (ACE_Service_Config::open (argc, argv) == -1)
+      if (ACE_Service_Config::open (argc, argv) == -1) 
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("open")),
+                           "%p\n",
+                           "open"),
                           1);
       else // Use dynamic linking.
 
         // Run forever, performing the configured services until we
         // are shut down by a signal (e.g., SIGINT or SIGQUIT).
 
-        ACE_Reactor::instance ()->run_reactor_event_loop ();
+        ACE_Reactor::run_event_loop ();
     }
   return 0;
 }
diff --git a/apps/Gateway/Peer/svc.conf b/apps/Gateway/Peer/svc.conf
index 707f457da2f..c27eb06cec8 100644
--- a/apps/Gateway/Peer/svc.conf
+++ b/apps/Gateway/Peer/svc.conf
@@ -1,2 +1,2 @@
 #static Svc_Manager "-d -p 291"
-dynamic Peer1 Service_Object * Gateway_Peer:_make_Peer_Factory() active "-a C|S"
+dynamic Peer1 Service_Object * ./Peer:_make_Peer_Factory() active "-a C|S"
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog
index 3b8e95edbdb..0b8c3274945 100644
--- a/apps/JAWS/ChangeLog
+++ b/apps/JAWS/ChangeLog
@@ -1,10 +1,3 @@
-Thu Aug 26 08:13:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * clients/Caching/http_client.cpp:
-        * server/HTTP_Response.cpp:
-          Added include of ace/os_include/os_ctype.h to fix compile problems
-          in our daily builds.
-
 Tue Feb 25 18:58:26 2003  Carlos O'Ryan  <coryan@atdesk.com>
 
 	* clients/WebSTONE/src/cgi-send:
@@ -51,19 +44,19 @@ Mon Aug 13 14:04:44 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
 	  1) Allow a static libHTTPU.a to be built when
              "make static_libs_only=1" is used.
-
+ 
           2) When I try to build both JAWS and JAWS2 with the same
              ACE_ROOT, the libJAWS.* that is built and installed first
 	     prevents the other JAWS from properly compiling.  This
 	     resolves this problem by renaming the JAWS2 library to
 	     libJAWS2.*.
-
+ 
           3) The JAWS2 subdirectory is now descended into by
-	     apps/Makefile.
-
+	     apps/Makefile.	
+  
           4) The Makefile in JAWS2 now descends into HTTPU and JAWS to
              build those libraries.
-
+  
 Tue Jun 12 20:35:26 2001  Krishnakumar B  <kitty@cs.wustl.edu>
 
 	* clients/Blobby/Blob_Handler.cpp:
diff --git a/apps/JAWS/clients/Caching/http_client.cpp b/apps/JAWS/clients/Caching/http_client.cpp
index afbc38a2513..6022cb289f2 100644
--- a/apps/JAWS/clients/Caching/http_client.cpp
+++ b/apps/JAWS/clients/Caching/http_client.cpp
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    apps/JAWS/clients/Caching
-//
+// 
 // = FILENAME
 //    http_client.cpp
 //
@@ -14,11 +14,9 @@
 //
 // = AUTHOR
 //    James Hu
-//
+// 
 // ============================================================================
 
-#include "ace/OS_NS_stdio.h"
-#include "ace/os_include/os_ctype.h"
 #include "http_handler.h"
 
 ACE_RCSID(Caching, http_client, "$Id$")
@@ -52,8 +50,8 @@ main (int, char *[])
 
       if (*s == '!')
         {
-          do
-	    s++;
+          do 
+	    s++; 
 	  while (isspace (*s));
 
           // Shell command.
diff --git a/apps/JAWS/clients/Caching/http_handler.cpp b/apps/JAWS/clients/Caching/http_handler.cpp
index 0d879af7173..36bd8343d34 100644
--- a/apps/JAWS/clients/Caching/http_handler.cpp
+++ b/apps/JAWS/clients/Caching/http_handler.cpp
@@ -13,7 +13,6 @@
 //
 // ============================================================================
 
-#include "ace/OS_NS_string.h"
 #include "ace/Filecache.h"
 #include "http_handler.h"
 
diff --git a/apps/JAWS/server/HTTP_Response.cpp b/apps/JAWS/server/HTTP_Response.cpp
index e187ba10934..50c14604253 100644
--- a/apps/JAWS/server/HTTP_Response.cpp
+++ b/apps/JAWS/server/HTTP_Response.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/os_ctype.h"
 #include "ace/Process.h"
 #include "ace/Mem_Map.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
 
 #include "HTTP_Response.h"
 #include "HTTP_Request.h"
diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp
index 99aa97e71ff..9aaa4b920d4 100644
--- a/apps/JAWS/server/HTTP_Server.cpp
+++ b/apps/JAWS/server/HTTP_Server.cpp
@@ -4,7 +4,6 @@
 #define ACE_BUILD_SVC_DLL
 #endif /* ACE_BUILD_SVC_DLL */
 
-#include "ace/OS_NS_string.h"
 #include "ace/Get_Opt.h"
 #include "ace/Asynch_Acceptor.h"
 #include "ace/LOCK_SOCK_Acceptor.h"
diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h
index a81f34d244e..a9e630acedd 100644
--- a/apps/JAWS/server/HTTP_Server.h
+++ b/apps/JAWS/server/HTTP_Server.h
@@ -17,12 +17,12 @@
 #ifndef HTTP_SERVER_H
 #define HTTP_SERVER_H
 
+#include "ace/Service_Object.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
-#include "ace/Service_Object.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Acceptor.h"
 #include "ace/LOCK_SOCK_Acceptor.h"
diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp
index 63267987b81..5594c713b54 100644
--- a/apps/JAWS/server/IO.cpp
+++ b/apps/JAWS/server/IO.cpp
@@ -1,13 +1,12 @@
 // $Id$
 
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_sys_uio.h"
-#include "ace/OS_NS_sys_socket.h"
 #include "ace/Message_Block.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Filecache.h"
 #include "IO.h"
 #include "HTTP_Helpers.h"
+#include "ace/OS_NS_sys_uio.h"
+#include "ace/OS_NS_sys_socket.h"
 
 ACE_RCSID(server, IO, "$Id$")
 
diff --git a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
index 966f99a0e55..96a7bfc4114 100644
--- a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
+++ b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
@@ -62,8 +62,6 @@ private:
         ACE_Reactor::instance ()->schedule_timer (this, 0, this->tv_);
   }
 
-public: // needed for destructor due to "aCC: HP ANSI C++ B3910B A.03.39" compiler bug
-
   ~JAWS_IO_Reactive_Handler (void)
   {
     if (this->timer_id_ != -1)
diff --git a/apps/JAWS3/jaws3/Task_Timer.cpp b/apps/JAWS3/jaws3/Task_Timer.cpp
index a429a3fcf8e..c3775020193 100644
--- a/apps/JAWS3/jaws3/Task_Timer.cpp
+++ b/apps/JAWS3/jaws3/Task_Timer.cpp
@@ -4,8 +4,6 @@
 #define JAWS_BUILD_DLL
 #endif
 
-#include "ace/OS_NS_sys_time.h"
-
 #include "jaws3/Task_Timer.h"
 #include "jaws3/Timer_Helpers.h"
 
diff --git a/apps/JAWS3/jaws3/Templates.cpp b/apps/JAWS3/jaws3/Templates.cpp
index 4d51c3fab9c..32bd4642109 100644
--- a/apps/JAWS3/jaws3/Templates.cpp
+++ b/apps/JAWS3/jaws3/Templates.cpp
@@ -97,19 +97,4 @@ template class JAWS_SYMBOL_TABLE_ITERATOR_BASE;
 template class JAWS_SYMBOL_TABLE_ITERATOR;
 template class JAWS_SYMBOL_TABLE_REVERSE_ITERATOR;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template ACE_Singleton<ACE_Message_Block, ACE_Null_Mutex> *ACE_Singleton<ACE_Message_Block, ACE_Null_Mutex>::singleton_;
-template ACE_Singleton<JAWS_Asynch_IO, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Asynch_IO, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Concurrency, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_IO, ACE_Thread_Mutex> *ACE_Singleton<JAWS_IO, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_Options, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Options, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_Reactive_IO, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Reactive_IO, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_Signal_Task, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Signal_Task, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_Synch_IO, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Synch_IO, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_THYBRID_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_THYBRID_Concurrency, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_TPOOL_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_TPOOL_Concurrency, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_TPR_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_TPR_Concurrency, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_Task_Timer, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Task_Timer, ACE_Thread_Mutex>::singleton_;
-template ACE_Singleton<JAWS_Timer, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Timer, ACE_Thread_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/drwho/File_Manager.cpp b/apps/drwho/File_Manager.cpp
index 5f138fe70fc..7ee34489523 100644
--- a/apps/drwho/File_Manager.cpp
+++ b/apps/drwho/File_Manager.cpp
@@ -173,7 +173,8 @@ template class ACE_Singleton<File_Manager,ACE_Null_Mutex>;
 
 #pragma instantiate ACE_Singleton<File_Manager,ACE_Null_Mutex>
 
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+
 template ACE_Singleton<File_Manager, ACE_Null_Mutex> *
   ACE_Singleton<File_Manager, ACE_Null_Mutex>::singleton_;
 
diff --git a/apps/drwho/Rwho_DB_Manager.h b/apps/drwho/Rwho_DB_Manager.h
index 2dd8bf73128..ff1dde83a65 100644
--- a/apps/drwho/Rwho_DB_Manager.h
+++ b/apps/drwho/Rwho_DB_Manager.h
@@ -17,7 +17,6 @@
 #ifndef _RWHO_DB_MANAGER_H
 #define _RWHO_DB_MANAGER_H
 
-#include <sys/types.h>
 #include <protocols/rwhod.h>
 #include "ace/Dirent.h"
 
diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index af7bb6444ce..ee1c95132bc 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,11 +1,3 @@
-Fri Aug  5 15:30:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * apps/gperf/tests/gperf_test.mpb
-        * apps/gperf/tests/tests.mpc
-
-          gperf is not built on cross compiled targets, thus tests will not run!
-          Therefore added the dependancy to the build of these test.
-
 Fri Apr 23 21:18:17 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* src/Options.h (operator !=):
diff --git a/apps/gperf/tests/gperf_test.mpb b/apps/gperf/tests/gperf_test.mpb
index c4615b1adc4..8a786383c8f 100644
--- a/apps/gperf/tests/gperf_test.mpb
+++ b/apps/gperf/tests/gperf_test.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: aceexe, crosscompile {
+project: aceexe {
   after += gperf
   Define_Custom(GPERF) {
     command          = $(ACE_ROOT)/bin/gperf
diff --git a/apps/gperf/tests/tests.mpc b/apps/gperf/tests/tests.mpc
index cf6f1506133..c90648dad84 100644
--- a/apps/gperf/tests/tests.mpc
+++ b/apps/gperf/tests/tests.mpc
@@ -7,12 +7,10 @@ project(cinset): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: cout$(EXEEXT)
+    runtests: cout
     "	@echo "Testing cout"
     "	./cout -v < c.gperf > cout.out
     "	-diff -b c.exp cout.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
@@ -31,12 +29,10 @@ project(adainset): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: aout$(EXEEXT)
+    runtests: aout
     "	@echo "Testing aout"
     "	./aout -v < ada.gperf > aout.out
     "	-diff -b ada-res.exp aout.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
@@ -55,12 +51,10 @@ project(cppinset): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: cppout$(EXEEXT)
+    runtests: cppout
     "	@echo "Testing cppout"
     "	./cppout -v < cpp.gperf > cppout.out
     "	-diff -b cpp-res.exp cppout.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
@@ -79,12 +73,10 @@ project(preinset): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: preout$(EXEEXT)
+    runtests: preout
     "	@echo "Testing preout"
     "	./preout -v < adadefs.gperf > preout.out
     "	-diff -b ada-pred.exp preout.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
@@ -103,12 +95,10 @@ project(m3inset): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: m3out$(EXEEXT)
+    runtests: m3out
     "	@echo "Testing m3out"
     "	./m3out -v < modula3.gperf > m3out.out
     "	-diff -b modula.exp m3out.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
@@ -127,12 +117,10 @@ project(pinset): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: pout$(EXEEXT)
+    runtests: pout
     "	@echo "Testing pout"
     "	./pout -v < pascal.gperf > pout.out
     "	-diff -b pascal.exp pout.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
@@ -151,12 +139,10 @@ project(iinset): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: iout$(EXEEXT)
+    runtests: iout
     "	@echo "Testing iout"
     "	./iout -v < idl.gperf > iout.out
     "	-diff -b idl.exp iout.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
@@ -176,12 +162,10 @@ project(iinset2): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: iout2$(EXEEXT)
+    runtests: iout2
     "	@echo "Testing iout2"
     "	./iout2 -v < idl.gperf > iout2.out
     "	-diff -b idl.exp iout2.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
@@ -200,12 +184,10 @@ project(tinset): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: tout$(EXEEXT)
+    runtests: tout
     "	@echo "Testing tout"
     "	./tout -v < corba.gperf > tout.out
     "	-diff -b corba.exp tout.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
@@ -224,12 +206,10 @@ project(taoinset): gperf_test {
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: taoout$(EXEEXT)
+    runtests: taoout
     "	@echo "Testing taoout"
     "	./taoout -v < tao.gperf > taoout.out
     "	-diff -b tao.exp taoout.out"
-
-    endif # CROSS-COMPILE
   }
 
   GPERF_Files {
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb
index ff74f4e334e..b26d925ef49 100644
--- a/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -9,10 +9,6 @@ project: ace_qt, zzip {
   // Support the alternative Borland Make project type
   specific(bmake) {
     unicode_flags += -DACE_USES_WCHAR
-    macros += ACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\\"$(LIBMODIFIER)\\")
-  }
-
-  specific(automake) {
-    includes += $(ACE_BUILDDIR)
+    macros += ACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\\"$(LIB_MODIFIER)\\")
   }
 }
diff --git a/bin/MakeProjectCreator/config/amh.mpb b/bin/MakeProjectCreator/config/amh.mpb
index 56648343ec1..905b651b3dc 100644
--- a/bin/MakeProjectCreator/config/amh.mpb
+++ b/bin/MakeProjectCreator/config/amh.mpb
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoidldefaults, messaging {
+project: taoidldefaults {
+  requires += ami // There is no separate 
   idlflags += -GH
 }
diff --git a/bin/MakeProjectCreator/config/ami.mpb b/bin/MakeProjectCreator/config/ami.mpb
index 9735a3b293d..00d02724a03 100644
--- a/bin/MakeProjectCreator/config/ami.mpb
+++ b/bin/MakeProjectCreator/config/ami.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taoidldefaults, messaging {
+project : messaging {
   requires += ami
   idlflags += -GC
-}
+}
+\ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
index 180daf23682..69d7b3ca163 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib_with_idl {
+project : portableserver,taoidldefaults {
   after += Deployment_stub
-  libs  += CIAO_Deployment_stub
-  includes += $(CIAO_ROOT)/DAnCE
-  idlflags += -I$(CIAO_ROOT)/DAnCE -Sc
+  libs  += Deployment_stub
+  includes += $(CIAO_ROOT)/DAnCE/ciao $(CIAO_ROOT)/DAnCE
+  idlflags += -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -Sc
 }
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
index 48293d29fa4..07c94af6152 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project : portableserver, ciao_deployment_stub, ciao_client_dnc {
+project : portableserver, taoidldefaults {
   after += Deployment_svnt
-  libs  += CIAO_Deployment_svnt 
-  includes += $(CIAO_ROOT)/DAnCE/ciao 
-  idlflags += -I$(CIAO_ROOT)/DAnCE -Sc
+  libs  += Deployment_svnt
+  includes += $(CIAO_ROOT)/DAnCE/ciao $(CIAO_ROOT)/DAnCE
+  idlflags += -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -Sc
 }
diff --git a/bin/MakeProjectCreator/config/ciao_servant.mpb b/bin/MakeProjectCreator/config/ciao_servant.mpb
index 54c71d843f6..adb1b89819b 100644
--- a/bin/MakeProjectCreator/config/ciao_servant.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant.mpb
@@ -9,7 +9,7 @@ project : ciao_component {
     automatic         = 0
     dependent         = 1
     command           = $(CIAO_ROOT)/bin/cidlc
-    commandflags      = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
+    commandflags      = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao --
     inputext          = .cidl
     source_outputext  = _svnt.cpp
     generic_outputext = E.idl
diff --git a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
index c4d66b64e3c..a42f2f90d3a 100644
--- a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
@@ -9,7 +9,7 @@ project : ciao_component_dnc {
     automatic         = 0
     dependent         = 1
     command           = $(CIAO_ROOT)/bin/cidlc
-    commandflags      = -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
+    commandflags      = -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao --
     inputext          = .cidl
     source_outputext  = _svnt.cpp
     generic_outputext = E.idl
diff --git a/bin/MakeProjectCreator/config/ciao_server.mpb b/bin/MakeProjectCreator/config/ciao_server.mpb
index 9e48aa8fbf2..2b620d68906 100644
--- a/bin/MakeProjectCreator/config/ciao_server.mpb
+++ b/bin/MakeProjectCreator/config/ciao_server.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_component, utils {
+project : ciao_component {
   after += CIAO_Server
   libs    += CIAO_Server
 }
diff --git a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
index 7edba9f68fc..2daf0dbf2d9 100644
--- a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_component_dnc, utils {
+project : ciao_component_dnc {
   after += CIAO_DnC_Server
-  libs    += CIAO_DnC_Server CIAO_Deployment_stub CIAO_Deployment_svnt
+  libs    += CIAO_DnC_Server
 }
diff --git a/bin/MakeProjectCreator/config/core.mpb b/bin/MakeProjectCreator/config/core.mpb
index d718009002d..7939d3fe923 100644
--- a/bin/MakeProjectCreator/config/core.mpb
+++ b/bin/MakeProjectCreator/config/core.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project {
-  specific {
+  verbatim(borland, macros) {
     INSTALL_THIS_TARGET = 1
   }
 }
diff --git a/bin/MakeProjectCreator/config/dseventlogadmin.mpb b/bin/MakeProjectCreator/config/dseventlogadmin.mpb
index 031be774f43..343e83d8841 100644
--- a/bin/MakeProjectCreator/config/dseventlogadmin.mpb
+++ b/bin/MakeProjectCreator/config/dseventlogadmin.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, dslogadmin, event {
+project : dslogadmin, event {
   after      += DsEventLogAdmin
   libs       += TAO_DsEventLogAdmin
 }
diff --git a/bin/MakeProjectCreator/config/dslogadmin.mpb b/bin/MakeProjectCreator/config/dslogadmin.mpb
index 94516c7133f..9311ba4235c 100644
--- a/bin/MakeProjectCreator/config/dslogadmin.mpb
+++ b/bin/MakeProjectCreator/config/dslogadmin.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib {
+project : svc_utils, etcl, dynamicany {
   after      += DsLogAdmin
   libs       += TAO_DsLogAdmin
 }
diff --git a/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb b/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
index fcd49678617..3fa171ab476 100644
--- a/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
+++ b/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, dslogadmin, dseventlogadmin, event, notification {
+project : dseventlogadmin, notification, naming {
   after      += DsNotifyLogAdmin
   libs       += TAO_DsNotifyLogAdmin
 }
diff --git a/bin/MakeProjectCreator/config/ec_use_typed_events.mpb b/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
index 5d0d9adef6f..a306db273d3 100644
--- a/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
+++ b/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
@@ -1,6 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-feature(ec_typed_events) {
+feature(ec_typed_events)  {
   macros  += TAO_HAS_TYPED_EVENT_CHANNEL
+  libs    += TAO_IFR_Client TAO_DynamicInterface
+  after   += IFR_Client DynamicInterface
 }
diff --git a/bin/MakeProjectCreator/config/event.mpb b/bin/MakeProjectCreator/config/event.mpb
index 10968e61645..8604669c7fe 100644
--- a/bin/MakeProjectCreator/config/event.mpb
+++ b/bin/MakeProjectCreator/config/event.mpb
@@ -1,7 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, ec_use_typed_events, minimum_corba {
+project : messaging, ec_use_typed_events, naming {
   after     += CosEvent
   libs      += TAO_CosEvent
+  tagchecks += CosEvent
+  avoids    += minimum_corba
 }
diff --git a/bin/MakeProjectCreator/config/ftorbutils.mpb b/bin/MakeProjectCreator/config/ftorbutils.mpb
index 2698ffa36cf..427a8d1b45b 100644
--- a/bin/MakeProjectCreator/config/ftorbutils.mpb
+++ b/bin/MakeProjectCreator/config/ftorbutils.mpb
@@ -1,8 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project : iormanip, portableserver, orbsvcslib, minimum_corba {
+project : iormanip, portableserver {
   after     += FTORB_Utils 
   libs      += TAO_FTORB_Utils 
   tagchecks += FTORB_Utils
+  avoids    += minimum_corba
 }
+
diff --git a/bin/MakeProjectCreator/config/ftrtevent.mpb b/bin/MakeProjectCreator/config/ftrtevent.mpb
index 50a843d8d27..e10e4903c68 100644
--- a/bin/MakeProjectCreator/config/ftrtevent.mpb
+++ b/bin/MakeProjectCreator/config/ftrtevent.mpb
@@ -1,8 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project : ftorbutils, rtevent, naming, messaging, minimum_corba {
+project : ftorbutils, rtevent, naming {
   after     += FtRtEvent
   libs      += TAO_FtRtEvent
   tagchecks += FtRtEvent
+  avoids    += minimum_corba
 }
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index d77e608c9ca..d7860e05620 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -1,6 +1,6 @@
 // The global features file contains the default feature settings.
 // By default, if a feature isn't listed here then it is enabled.
-// If it is listed, then the value assigned to the feature is interpreted
+// If it is listed, then the value assigned to the feature is enterpreted
 // as a boolean value.  You really shouldn't have to edit this file except
 // to change the defaults.  If you want to override these values you can do
 // one of two things.
@@ -31,4 +31,3 @@ sctp 	      = 0
 xt_reactor    = 0
 dummy_label   = 0
 cidl          = 0
-wince         = 0
diff --git a/bin/MakeProjectCreator/config/iorinterceptor.mpb b/bin/MakeProjectCreator/config/iorinterceptor.mpb
index 43310026ccd..208e574c7ad 100644
--- a/bin/MakeProjectCreator/config/iorinterceptor.mpb
+++ b/bin/MakeProjectCreator/config/iorinterceptor.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib, portableserver, objreftemplate, valuetype {
+project : taolib, objreftemplate, valuetype {
   after += IORInterceptor
   libs  += TAO_IORInterceptor
 }
diff --git a/bin/MakeProjectCreator/config/lifecycle.mpb b/bin/MakeProjectCreator/config/lifecycle.mpb
index db47576564a..ecfb0e7bee6 100644
--- a/bin/MakeProjectCreator/config/lifecycle.mpb
+++ b/bin/MakeProjectCreator/config/lifecycle.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : naming, portableserver {
+project : naming {
   libs      += TAO_CosLifeCycle
   after     += CosLifeCycle
   tagchecks += LifeCycle
diff --git a/bin/MakeProjectCreator/config/loadbalancing.mpb b/bin/MakeProjectCreator/config/loadbalancing.mpb
index 7ad4f78dd3a..f850b2fea74 100644
--- a/bin/MakeProjectCreator/config/loadbalancing.mpb
+++ b/bin/MakeProjectCreator/config/loadbalancing.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : messaging, naming, portablegroup, iorinterceptor {
+project : messaging, naming, portablegroup {
   libs      += TAO_CosLoadBalancing
   after     += CosLoadBalancing
   tagchecks += CosLoadBalancing
diff --git a/bin/MakeProjectCreator/config/naming.mpb b/bin/MakeProjectCreator/config/naming.mpb
index 807f3a0c35f..7258f1aaecb 100644
--- a/bin/MakeProjectCreator/config/naming.mpb
+++ b/bin/MakeProjectCreator/config/naming.mpb
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib {
+project : iortable, messaging, svc_utils {
   after     += CosNaming
   libs      += TAO_CosNaming
+  tagchecks += Naming
 }
diff --git a/bin/MakeProjectCreator/config/notification.mpb b/bin/MakeProjectCreator/config/notification.mpb
index 402df15a2e4..4a2eaf459a0 100644
--- a/bin/MakeProjectCreator/config/notification.mpb
+++ b/bin/MakeProjectCreator/config/notification.mpb
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, event {
+project : etcl, dynamicany, portableserver, svc_utils {
   after     += CosNotification
   libs      += TAO_CosNotification
+  tagchecks += Notify
 }
diff --git a/bin/MakeProjectCreator/config/notifytest.mpb b/bin/MakeProjectCreator/config/notifytest.mpb
index 932037d9ebb..30c1dc45c83 100644
--- a/bin/MakeProjectCreator/config/notifytest.mpb
+++ b/bin/MakeProjectCreator/config/notifytest.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: orbsvcsexe, notification, notification_skel, naming, svc_utils {
+project: orbsvcsexe, notification, naming {
   after    += NotifyTests_Lib
   libs     += TAO_NotifyTests
   includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib
diff --git a/bin/MakeProjectCreator/config/objreftemplate.mpb b/bin/MakeProjectCreator/config/objreftemplate.mpb
index e887919b2c7..78215f78863 100644
--- a/bin/MakeProjectCreator/config/objreftemplate.mpb
+++ b/bin/MakeProjectCreator/config/objreftemplate.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : portableserver, valuetype {
+project : valuetype {
   after += ObjRefTemplate
   libs  += TAO_ObjRefTemplate
 }
diff --git a/bin/MakeProjectCreator/config/orbsvcslib.mpb b/bin/MakeProjectCreator/config/orbsvcslib.mpb
index 0b63b7f61f1..5a7b2faf814 100644
--- a/bin/MakeProjectCreator/config/orbsvcslib.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcslib.mpb
@@ -3,6 +3,4 @@
 
 project : taolib_with_idl, orbsvcs_output {
   tagname     = TAO_ORBSVCS
-  includes += $(TAO_ROOT)/orbsvcs
-  idlflags += -I$(TAO_ROOT)/orbsvcs
 }
diff --git a/bin/MakeProjectCreator/config/portablegroup.mpb b/bin/MakeProjectCreator/config/portablegroup.mpb
index 351cbcb67c1..4df490afdad 100644
--- a/bin/MakeProjectCreator/config/portablegroup.mpb
+++ b/bin/MakeProjectCreator/config/portablegroup.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : naming, messaging, minimum_corba, iormanip {
+project : naming, minimum_corba, iormanip {
   libs      += TAO_PortableGroup
   after     += PortableGroup
   tagchecks += PortableGroup
diff --git a/bin/MakeProjectCreator/config/portableserver.mpb b/bin/MakeProjectCreator/config/portableserver.mpb
index 484d7aa83c2..44cfd1d4814 100644
--- a/bin/MakeProjectCreator/config/portableserver.mpb
+++ b/bin/MakeProjectCreator/config/portableserver.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib {
+project : taolib, objreftemplate, valuetype, iorinterceptor {
   after   += PortableServer
   libs    += TAO_PortableServer
 }
diff --git a/bin/MakeProjectCreator/config/rtcorbacommon.mpb b/bin/MakeProjectCreator/config/rtcorbacommon.mpb
index 91125e0fdc8..4612e25c71e 100644
--- a/bin/MakeProjectCreator/config/rtcorbacommon.mpb
+++ b/bin/MakeProjectCreator/config/rtcorbacommon.mpb
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : portableserver, minimum_corba {
+project : portableserver {
+  avoids   += minimum_corba
   after    += RTCORBA_Common
   libs     += RTCORBA_Common
   includes += ../Common
diff --git a/bin/MakeProjectCreator/config/rtcosscheduling.mpb b/bin/MakeProjectCreator/config/rtcosscheduling.mpb
index 5f8caccf577..bb8aee78d2d 100644
--- a/bin/MakeProjectCreator/config/rtcosscheduling.mpb
+++ b/bin/MakeProjectCreator/config/rtcosscheduling.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : rtportableserver, orbsvcslib {
+project : rtportableserver {
   after     += RTCosScheduling
   libs      += TAO_RTCosScheduling
   tagchecks += RTCosScheduling
diff --git a/bin/MakeProjectCreator/config/rteventlogadmin.mpb b/bin/MakeProjectCreator/config/rteventlogadmin.mpb
index 9f9459ea40d..3e052d455d0 100644
--- a/bin/MakeProjectCreator/config/rteventlogadmin.mpb
+++ b/bin/MakeProjectCreator/config/rteventlogadmin.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dslogadmin_serv, rtoldevent {
+project : dslogadmin, rtoldevent {
   after      += RTEventLogAdmin
   libs       += TAO_RTEventLogAdmin
 }
diff --git a/bin/MakeProjectCreator/config/rtnotify.mpb b/bin/MakeProjectCreator/config/rtnotify.mpb
index 847b9deaad5..7bd52f4cca7 100644
--- a/bin/MakeProjectCreator/config/rtnotify.mpb
+++ b/bin/MakeProjectCreator/config/rtnotify.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : notification_serv, rtcorba {
+project : notification, rtcorba {
   after += RT_Notification
   libs  += TAO_RT_Notification
 }
diff --git a/bin/MakeProjectCreator/config/rtsched.mpb b/bin/MakeProjectCreator/config/rtsched.mpb
index bb435139cf7..148d376614d 100644
--- a/bin/MakeProjectCreator/config/rtsched.mpb
+++ b/bin/MakeProjectCreator/config/rtsched.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : naming, svc_utils {
+project : naming {
   after     += RTSched
   libs      += TAO_RTSched
   tagchecks += Sched
diff --git a/bin/MakeProjectCreator/config/security.mpb b/bin/MakeProjectCreator/config/security.mpb
index 41af3660e61..12228e7a0f6 100644
--- a/bin/MakeProjectCreator/config/security.mpb
+++ b/bin/MakeProjectCreator/config/security.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib {
+project : portableserver {
   after     += Security
   libs      += TAO_Security
   tagchecks += Security
diff --git a/bin/MakeProjectCreator/config/smart_proxies.mpb b/bin/MakeProjectCreator/config/smart_proxies.mpb
index 0e69cdfeed8..f99d3d5c6aa 100644
--- a/bin/MakeProjectCreator/config/smart_proxies.mpb
+++ b/bin/MakeProjectCreator/config/smart_proxies.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib {
+project : taolib_with_idl {
   after    += SmartProxies
   libs     += TAO_SmartProxies
   idlflags += -Gsp
diff --git a/bin/MakeProjectCreator/config/ssliop.mpb b/bin/MakeProjectCreator/config/ssliop.mpb
index e73be56e997..91a0e278230 100644
--- a/bin/MakeProjectCreator/config/ssliop.mpb
+++ b/bin/MakeProjectCreator/config/ssliop.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: interceptors, security, portableserver, ssl {
+project: security, portableserver, ssl {
     after     += SSLIOP
     libs      += TAO_SSLIOP
     tagchecks += SSLIOP
diff --git a/bin/MakeProjectCreator/config/svc_utils.mpb b/bin/MakeProjectCreator/config/svc_utils.mpb
index a38a4a962cc..fea86bd16e6 100644
--- a/bin/MakeProjectCreator/config/svc_utils.mpb
+++ b/bin/MakeProjectCreator/config/svc_utils.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : portableserver, orbsvcslib {
+project : portableserver, taolib_with_idl {
   after   += Svc_Utils
   libs    += TAO_Svc_Utils
 }
diff --git a/bin/MakeProjectCreator/config/taodefaults.mpb b/bin/MakeProjectCreator/config/taodefaults.mpb
index 781b2d43d5b..cc3b876c7e6 100644
--- a/bin/MakeProjectCreator/config/taodefaults.mpb
+++ b/bin/MakeProjectCreator/config/taodefaults.mpb
@@ -5,8 +5,4 @@ project {
   staticflags += TAO_AS_STATIC_LIBS
   includes    += $(TAO_ROOT)
   libpaths    += $(ACE_ROOT)/lib
-
-  specific(automake) {
-	includes += $(TAO_BUILDDIR)
-  }
 }
diff --git a/bin/MakeProjectCreator/config/taolib.mpb b/bin/MakeProjectCreator/config/taolib.mpb
index ae9910d4e14..7a0a92a034f 100644
--- a/bin/MakeProjectCreator/config/taolib.mpb
+++ b/bin/MakeProjectCreator/config/taolib.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : acelib, taoversion, tao_output, taodefaults, pidl {
+project : acelib, taoversion, tao_output, taodefaults {
   after += TAO
   libs  += TAO
 }
diff --git a/bin/MakeProjectCreator/config/time.mpb b/bin/MakeProjectCreator/config/time.mpb
index a7787744a5e..a1270ad37a0 100644
--- a/bin/MakeProjectCreator/config/time.mpb
+++ b/bin/MakeProjectCreator/config/time.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, portableserver {
+project : naming {
   after     += CosTime
   libs      += TAO_CosTime
   tagchecks += Time
diff --git a/bin/MakeProjectCreator/config/trading.mpb b/bin/MakeProjectCreator/config/trading.mpb
index d5cb48b46e4..e12229b3167 100644
--- a/bin/MakeProjectCreator/config/trading.mpb
+++ b/bin/MakeProjectCreator/config/trading.mpb
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib {
+project : dynamicany, portableserver {
   after     += CosTrading 
   libs      += TAO_CosTrading
+  tagchecks += Trader
 }
diff --git a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
index df10ae17ab1..6d14f0661e0 100644
--- a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
@@ -39,7 +39,7 @@ sub fill_value {
   if (defined $names{$name}) {
     my(%dirnames) = ();
     foreach my $file ($self->get_component_list($names{$name}, 1)) {
-      my($dirname) = $self->mpc_dirname($file);
+      my($dirname) = dirname($file);
       if ($dirname eq '') {
         $dirname = '.';
       }
@@ -52,41 +52,6 @@ sub fill_value {
     ## Sort the directories to ensure that '.' comes first
     $value = join(';', sort keys %dirnames);
   }
-  elsif ($name eq 'relwd') {
-    my($expenv) = $self->get_expand_env();
-    my($rel)    = ($expenv ? \%ENV : $self->get_relative());
-    $value = $self->getcwd();
-
-    foreach my $key (keys %$rel) {
-      ## Do not use PWD or CD if we are expanding environment variables.
-      ## They could conflict with the "real" values we're looking for.
-      if ($expenv && ($key eq 'PWD' || $key eq 'CD')) {
-        next;
-      }
-
-      ## Get the relative replacement value and convert back-slashes
-      my($val) = $$rel{$key};
-      $val =~ s/\\/\//g;
-
-      ## We only need to check for reverse replacement if the length
-      ## of the string is less than or equal to the length of our
-      ## replacement value or the string has a slash at the position
-      ## of the length of the replacement value
-      my($vlen) = length($val);
-      if (length($value) <= $vlen || substr($value, $vlen, 1) eq '/') {
-        ## Cut the string down by the length of the replacement value
-        my($lval) = substr($value, 0, $vlen);
-
-        ## Here we make an assumption that we
-        ## have a case-insensitive file system.
-        if (lc($lval) eq lc($val)) {
-          substr($value, 0, length($val) + 1) = '';
-          last;
-        }
-      }
-    }
-    $value = $self->slash_to_backslash($value);
-  }
 
   return $value;
 }
diff --git a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
index 851239663ea..2a593b21681 100644
--- a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
@@ -25,7 +25,12 @@ use vars qw(@ISA);
 
 sub workspace_file_name {
   my($self) = shift;
-  return $self->get_modified_workspace_name('Makefile', '.bor');
+  if ($self->make_coexistence()) {
+    return $self->get_modified_workspace_name('Makefile', '.bor');
+  }
+  else {
+    return $self->get_modified_workspace_name('Makefile', '');
+  }
 }
 
 
@@ -63,7 +68,7 @@ sub write_project_targets {
   my($crlf)   = $self->crlf();
 
   foreach my $project (@$list) {
-    my($dir)    = $self->mpc_dirname($project);
+    my($dir)    = dirname($project);
     my($chdir)  = 0;
     my($back)   = '';
 
diff --git a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
index 456c6512139..e44dc9ef6f8 100644
--- a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
@@ -75,7 +75,7 @@ sub fill_value {
       my($comps) = $$names{$name};
       foreach my $key (keys %$comps) {
         foreach my $item (@{$$comps{$key}}) {
-          my($dname) = $self->relative($self->mpc_dirname($item));
+          my($dname) = $self->relative(dirname($item));
           if ($dname ne '.' && $dname !~ /^\.\.\//) {
             $vpath{$dname} = 1;
           }
diff --git a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
index a2c19cf6d14..d7f0c7b4b1a 100644
--- a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
@@ -154,7 +154,7 @@ sub write_comps {
       print $fh $crlf,
                 "\t\$(KEEP_GOING)\@";
       if (defined $dirprj{$project}) {
-        print $fh "cd ", $self->mpc_dirname($project),
+        print $fh "cd ", dirname($project),
                   " && \$(MAKE) -f ", basename($project), $crlf;
       }
       else {
@@ -162,13 +162,10 @@ sub write_comps {
       }
     }
     print $fh $crlf,
-              'REMAINING_TARGETS := ',
-              '$(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)',
-              $crlf;
+              "REMAINING_TARGETS := \$(subst all, , \$(TARGETS_NESTED:.nested=))$crlf",
   }
   else {
-    print $fh 'REMAINING_TARGETS := $(TARGETS_NESTED:.nested=) ',
-              '$(CUSTOM_TARGETS)', $crlf;
+    print $fh "REMAINING_TARGETS := \$(TARGETS_NESTED:.nested=)$crlf",
   }
 
   ## Print out the remaing targets.
@@ -177,7 +174,7 @@ sub write_comps {
   foreach my $project (@lprj) {
     print $fh "\t\$(KEEP_GOING)\@";
     if (defined $dirprj{$project}) {
-      print $fh "cd ", $self->mpc_dirname($project),
+      print $fh "cd ", dirname($project),
                 " && \$(MAKE) -f ", basename($project), " \$(\@)", $crlf;
     }
     else {
diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd
index 4e1c101e100..10563c42392 100644
--- a/bin/MakeProjectCreator/templates/bor.mpd
+++ b/bin/MakeProjectCreator/templates/bor.mpd
@@ -143,10 +143,6 @@ realclean: customclean_<%custom_type%>_<%forcount(custom_type->input_files)%>
 #
 # Override defaults in outputdir.bor
 #
-<%if(INSTALL_THIS_TARGET)%>
-INSTALL_THIS_TARGET = 1
-
-<%endif%>
 <%marker(macros)%>
 STATIC_DIR=.
 DEBUG_DIR=.
@@ -177,10 +173,10 @@ BINDIR = <%libout%>
 
 !include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
 <%endif%>
-<%if(header_files || template_files || inline_files || idl_files || pidl_files)%>
+<%if(header_files || template_files || inline_files || idl_files)%>
 
 includes_install: $(INCLUDES)
-<%foreach(header_files template_files inline_files idl_files pidl_files)%>
+<%foreach(header_files template_files inline_files idl_files)%>
 	-@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\<%dirname(header_file)%> mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\<%dirname(header_file)%>
 	-&copy /Y <%header_file%> $(INSTALL_DIR)\include\$(INCDIR_NAME)\<%header_file%> 1> NUL
 <%endfor%>
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index d127c32620b..e024ed2824d 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -133,7 +133,7 @@ else
   ifeq ($(findstring k, $(MAKEFLAGS)),k)
     LIBCHECK = 1
   else
-    LIBCHECK ?= $(filter-out $(foreach lib,<%libs%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> /usr/lib $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%libs%>)
+    LIBCHECK ?= $(filter-out $(foreach lib,<%libs%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%libs%>)
     ifeq ($(LIBCHECK),)
       LIBCHECK = 1
     endif
@@ -257,7 +257,7 @@ ifeq ($(<%require%>),1)
 ifneq ($(<%avoid%>),1)
 <%endfor%>
 ifeq ($(LIBCHECK), 1)
-BIN    = $(BIN_UNCHECKED)$(EXEEXT)
+BIN    = $(BIN_UNCHECKED)
 else
   all: lib_warning
 endif
@@ -290,8 +290,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 <%if(install && exename)%>
 
 ifneq ($(OUTPUT_DIRECTORY),.)
-  INSTALL = $(VBIN:%=$(INSBIN)/%)
-  CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%)
+  INSTALL = $(VBIN:%=$(INSBIN)/%$(EXEEXT))
+  CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(EXEEXT))
 endif
 
 <%endif%>
diff --git a/bin/PerlACE/Run_Test.pm b/bin/PerlACE/Run_Test.pm
index e40d0c15721..50a41484e3d 100644
--- a/bin/PerlACE/Run_Test.pm
+++ b/bin/PerlACE/Run_Test.pm
@@ -101,31 +101,6 @@ sub check_n_cleanup_files
   }
 }
 
-sub generate_test_file
-{
-  my $file = shift;
-  my $size = shift;
-
-  while ( -e $file ) {
-    $file = $file."X";
-  }
-
-  my $data = "abcdefghijklmnopqrstuvwxyz";
-  $data = $data.uc($data)."0123456789";
-
-  open( INPUT, "> $file" ) || die( "can't create input file: $file" );
-  for($i=62; $i < $size ; $i += 62 ) {
-    print INPUT $data;
-  }
-  $i -= 62;
-  if ($i < $size) {
-    print INPUT substr($data, 0, $size-$i);
-  }
-  close(INPUT);
-
-  return $file;
-}
-
 $sleeptime = 5;
 
 1;
diff --git a/bin/auto_run_tests.pl b/bin/auto_run_tests.pl
index af7edf90721..a65843ab892 100755
--- a/bin/auto_run_tests.pl
+++ b/bin/auto_run_tests.pl
@@ -32,15 +32,7 @@ if (!getopts ('ados:t') || $opt_h) {
     print "    -t          TAO tests (other than ORB tests) only\n";
     print "    -Config cfg Run the tests for the <cfg> configuration\n";
     print "\n";
-    $ace_config_list = new PerlACE::ConfigList;
-    $ace_config_list->load ($ACE_ROOT."/bin/ace_tests.lst");
-    print "ACE Test Configs: " . $ace_config_list->list_configs () . "\n";
-    $orb_config_list = new PerlACE::ConfigList;
-    $orb_config_list->load ($ACE_ROOT."/bin/tao_orb_tests.lst");
-    print "ORB Test Configs: " . $orb_config_list->list_configs () . "\n";
-    $tao_config_list = new PerlACE::ConfigList;
-    $tao_config_list->load ($ACE_ROOT."/bin/tao_other_tests.lst");
-    print "TAO Test Configs: " . $tao_config_list->list_configs () . "\n";
+    print "Configs: " . $config_list->list_configs () . "\n";
     exit (1);
 }
 
@@ -66,82 +58,73 @@ push (@file_list, "/bin/tao_other_tests.lst");
 
 foreach my$test_lst (@file_list) {
 
-    my $config_list = new PerlACE::ConfigList;
-    $config_list->load ($ACE_ROOT.$test_lst);
+my $config_list = new PerlACE::ConfigList;
+$config_list->load ($ACE_ROOT.$test_lst);
 
-    # Insures that we search for stuff in the current directory.
-    $PATH .= $Config::Config{path_sep} . '.';
+# Insures that we search for stuff in the current directory.
+$PATH .= $Config::Config{path_sep} . '.';
 
-    foreach $test ($config_list->valid_entries ()) {
-        my $directory = ".";
-        my $program = ".";
+foreach $test ($config_list->valid_entries ()) {
+    my $directory = ".";
+    my $program = ".";
 
-        if ($test =~ /(.*)\/([^\/]*)$/) {
-            $directory = $1;
-            $program = $2;
-        }
-        else {
-            $program = $test;
-        }
-
-        # this is to ensure that we dont print out the time for tests/run_test.pl
-        # that test prints out the times for each of the ace tests individually
-        my $is_ace_test = ($directory eq "tests");
+    if ($test =~ /(.*)\/([^\/]*)$/) {
+        $directory = $1;
+        $program = $2;
+    }
+    else {
+        $program = $test;
+    }
 
-        if (! $is_ace_test) {
-            print "auto_run_tests: $test\n";
-        }
+    print "auto_run_tests: $test\n";
 
-        chdir ($ACE_ROOT."/$directory")
-            || die "Error: Cannot chdir to $ACE_ROOT/$directory";
+    chdir ($ACE_ROOT."/$directory")
+        || die "Error: Cannot chdir to $ACE_ROOT/$directory";
 
-        if ($program =~ /(.*?) (.*)/) {
-            if (! -e $1) {
-                print STDERR "Error: $directory.$1 does not exist\n";
-                next;
-              }
+    if ($program =~ /(.*?) (.*)/)
+      {
+        if (! -e $1)
+          {
+            print STDERR "Error: $directory.$1 does not exist\n";
+            next;
           }
-        else {
-            if (! -e $program) {
-                print STDERR "Error: $directory.$program does not exist\n";
-                next;
-              }
+      }
+    else
+      {
+        if (! -e $program)
+          {
+            print STDERR "Error: $directory.$program does not exist\n";
+            next;
           }
+      }
+
+    ### Genrate the -ExeSubDir and -Config options
+    my $inherited_options = " -ExeSubDir $PerlACE::Process::ExeSubDir ";
 
-        ### Genrate the -ExeSubDir and -Config options
-        my $inherited_options = " -ExeSubDir $PerlACE::Process::ExeSubDir ";
-
-        foreach my $config ($config_list->my_config_list ()) {
-             $inherited_options .= " -Config $config ";
-        }
-
-        $cmd = '';
-        if ($opt_s) {
-            $cmd = "$opt_s \"perl $program $inherited_options\"";
-        }
-        else {
-            $cmd = $program.$inherited_options;
-        }
-
-
-        my $result = 0;
-
-        if (defined $opt_d) {
-            print "Running: $cmd\n";
-        }
-        else {
-            $start_time = time();
-            $result = system ($cmd);
-            $time = time() - $start_time;
-
-            # see note about tests/run_test.pl printing reports for ace tests individually
-            if (! $is_ace_test) {    
-                if ($result > 0) {
-                    print "Error: $test returned with status $result\n";
-                }
-
-                print "\nauto_run_tests_finished: $test Time:$time"."s Result:$result\n";
-            }
-        }
+    foreach my $config ($config_list->my_config_list ()) {
+         $inherited_options .= " -Config $config ";
     }
+
+    $cmd = '';
+    if ($opt_s) {
+        $cmd = "$opt_s \"perl $program $inherited_options\"";
+    }
+    else {
+        $cmd = $program.$inherited_options;
+    }
+
+
+    my $result = 0;
+
+    if (defined $opt_d) {
+        print "Running: $cmd\n";
+    }
+    else {
+        $result = system ($cmd);
+    }
+
+    if ($result > 0) {
+        print "Error: $test returned with status $result\n";
+    }
+}
 }
diff --git a/bin/footprint_stats.sh b/bin/footprint_stats.sh
index 74b4d003d8f..d8f1184b9b8 100755
--- a/bin/footprint_stats.sh
+++ b/bin/footprint_stats.sh
@@ -17,24 +17,24 @@ BINS="TAO/tests/ORB_init/ORB_init TAO/tests/ORB_destroy/ORB_destroy"
 
 LIBS="ace/libACE.a \
     TAO/tao/libTAO.a \
-    TAO/tao/libTAO_PortableServer.a \
-    TAO/tao/libTAO_Strategies.a \
-    TAO/tao/libTAO_SmartProxies.a \
-    TAO/tao/libTAO_DynamicAny.a \
-    TAO/tao/libTAO_DynamicInterface.a \
-    TAO/tao/libTAO_IFR_Client.a \
-    TAO/tao/libTAO_BiDirGIOP.a \
-    TAO/tao/libTAO_Domain.a \
-    TAO/tao/libTAO_IORManip.a \
-    TAO/tao/libTAO_IORTable.a \
-    TAO/tao/libTAO_TypeCodeFactory.a \
-    TAO/tao/libTAO_RTCORBA.a \
-    TAO/tao/libTAO_IORInterceptor.a \
-    TAO/tao/libTAO_Messaging.a \
-    TAO/tao/libTAO_ObjRefTemplate.a \
-    TAO/tao/libTAO_Valuetype.a \
-    TAO/tao/libTAO_RTScheduler.a \
-    TAO/tao/libTAO_RTPortableServer.a"
+    TAO/tao/PortableServer/libTAO_PortableServer.a \
+    TAO/tao/Strategies/libTAO_Strategies.a \
+    TAO/tao/SmartProxies/libTAO_SmartProxies.a \
+    TAO/tao/DynamicAny/libTAO_DynamicAny.a \
+    TAO/tao/DynamicInterface/libTAO_DynamicInterface.a \
+    TAO/tao/IFR_Client/libTAO_IFR_Client.a \
+    TAO/tao/BiDir_GIOP/libTAO_BiDirGIOP.a \
+    TAO/tao/Domain/libTAO_Domain.a \
+    TAO/tao/IORManipulation/libTAO_IORManip.a \
+    TAO/tao/IORTable/libTAO_IORTable.a \
+    TAO/tao/TypeCodeFactory/libTAO_TypeCodeFactory.a \
+    TAO/tao/RTCORBA/libTAO_RTCORBA.a \
+    TAO/tao/IORInterceptor/libTAO_IORInterceptor.a \
+    TAO/tao/Messaging/libTAO_Messaging.a \
+    TAO/tao/ObjRefTemplate/libTAO_ObjRefTemplate.a \
+    TAO/tao/Valuetype/libTAO_Valuetype.a \
+    TAO/tao/RTScheduling/libTAO_RTScheduler.a \
+    TAO/tao/RTPortableServer/libTAO_RTPortableServer.a"
 
 cd $ACE_ROOT
 
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index 31969e73652..920a952482c 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -1290,7 +1290,11 @@ print "--------------------Configuration: Fuzz - Level ",$opt_l,
       "--------------------\n";
 
 check_for_noncvs_files () if ($opt_l >= 1);
-check_for_streams_include () if ($opt_l >= 6);
+# Commenting out the following checks for short while before BFO. We
+# don't want to have noise that we cannot fix for the time being.
+check_for_synch_include () if ($opt_l >= 1);
+check_for_OS_h_include () if ($opt_l >= 1);
+check_for_streams_include () if ($opt_l >= 1);
 check_for_dependency_file () if ($opt_l >= 1);
 check_for_makefile_variable () if ($opt_l >= 1);
 check_for_inline_in_cpp () if ($opt_l >= 2);
@@ -1298,8 +1302,6 @@ check_for_id_string () if ($opt_l >= 1);
 check_for_newline () if ($opt_l >= 1);
 check_for_inline () if ($opt_l >= 2);
 check_for_math_include () if ($opt_l >= 3);
-check_for_synch_include () if ($opt_l >= 6);
-check_for_OS_h_include () if ($opt_l >= 6);
 check_for_line_length () if ($opt_l >= 8);
 check_for_preprocessor_comments () if ($opt_l >= 7);
 check_for_tchar () if ($opt_l >= 4);
diff --git a/bin/make_release b/bin/make_release
index 8ac8d9b01c3..4432d9d2bf9 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -777,14 +777,14 @@ sub generate_makefiles () {
     #
     # Need todo a common chmod on the file lists!
     my $here = Cwd::getcwd();
-
+    
     my $exclude_option = '-exclude TAO/TAOACE.mwc,TAO/CIAO/CIAOTAO.mwc';
-    my $tmp_mpc_option =
-        '-recurse -hierarchy -relative ACE_ROOT=';
+    my $tmp_mpc_option = 
+        '-recurse -hierarchy -relative ACE_ROOT='; 
 
     my $mpc_option = $tmp_mpc_option.$here.'/ACE_wrappers';
-
-    my $tmp_static_option =
+    
+    my $tmp_static_option = 
         '-static -name_modifier *_Static -apply_project -exclude TAO/CIAO,TAO/TAOACE.mwc ';
 
     my $static_option = $tmp_static_option.$mpc_option;
@@ -810,7 +810,6 @@ sub generate_makefiles () {
         "// \$Id\$\n" .
         "// This is an automatically generated file.\n\n" .
         "ssl=0\n" .
-        "qos=1\n" .
         "cidl=0\n" .
         "rwho=0\n" .
         "sctp=0\n";
diff --git a/bin/mpc.pl b/bin/mpc.pl
index 56dd7152891..3ce48b22888 100755
--- a/bin/mpc.pl
+++ b/bin/mpc.pl
@@ -14,7 +14,6 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 
 use strict;
 use Cwd;
-use Config;
 use File::Basename;
 
 if ( $^O eq 'VMS' ) {
@@ -22,7 +21,7 @@ if ( $^O eq 'VMS' ) {
   import VMS::Filespec qw(unixpath);
 }
 
-my($basePath) = getExecutePath($0) . '/MakeProjectCreator';
+my($basePath) = getExecutePath($0) . 'MakeProjectCreator';
 unshift(@INC, $basePath . '/modules');
 
 my($mpcroot) = $ENV{MPC_ROOT};
@@ -61,23 +60,31 @@ my(@creators) = ('GNUACEProjectCreator',
 # Subroutine Section
 # ************************************************************
 
-sub getBasePath {
-  return $mpcpath;
-}
-
-
 sub which {
-  my($prog) = shift;
-  my($exec) = $prog;
-
-  if (defined $ENV{'PATH'}) {
-    my($part)   = '';
-    my($envSep) = $Config{'path_sep'};
-    foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-      $part .= "/$prog";
-      if ( -x $part ) {
-        $exec = $part;
-        last;
+  my($prog)   = shift;
+  my($exec)   = $prog;
+  my($part)   = '';
+  if ( $^O eq 'VMS' ) {
+    my($envSep) = ';';
+    if (defined $ENV{'PATH'}) {
+      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
+        $part .= "$prog";
+        if ( -x $part ) {
+          $exec = $part;
+          last;
+        }
+      }
+    }
+  }
+  else  {
+    my($envSep) = ($^O eq 'MSWin32' ? ';' : ':');
+    if (defined $ENV{'PATH'}) {
+      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
+        $part .= "/$prog";
+        if ( -x $part ) {
+          $exec = $part;
+          last;
+        }
       }
     }
   }
@@ -90,33 +97,51 @@ sub getExecutePath {
   my($prog) = shift;
   my($loc)  = '';
 
-  if ($prog ne basename($prog)) {
-    my($dir) = ($^O eq 'VMS' ? unixpath(dirname($prog)) : dirname($prog));
-    if ($prog =~ /^[\/\\]/ ||
-        $prog =~ /^[A-Za-z]:[\/\\]?/) {
-      $loc = $dir;
+  if ( $^O eq 'VMS' ) {
+    if ($prog ne basename($prog)) {
+      my($dir) = unixpath( dirname($prog) );
+      if ($prog =~ /^[\/\\]/) {
+        $loc = $dir;
+      }
+      else {
+        $loc = unixpath(getcwd()) . $dir;
+      }
     }
     else {
-      $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()) . '/' . $dir;
+      $loc = unixpath( dirname(which($prog)) );
     }
-  }
-  else {
-    $loc = dirname(which($prog));
-    if ($^O eq 'VMS') {
-      $loc = unixpath($loc);
+
+    if ($loc eq '.') {
+      $loc = unixpath( getcwd() );
     }
-  }
+  } else {
+    if ($prog ne basename($prog)) {
+      if ($prog =~ /^[\/\\]/ ||
+          $prog =~ /^[A-Za-z]:[\/\\]?/) {
+        $loc = dirname($prog);
+      }
+      else {
+        $loc = getcwd() . '/' . dirname($prog);
+      }
+    }
+    else {
+      $loc = dirname(which($prog));
+    }
+
+    $loc =~ s/\/\.$//;
 
-  $loc =~ s/\/\.$//;
+    if ($loc eq '.') {
+      $loc = getcwd();
+    }
 
-  if ($loc eq '.') {
-    $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd());
+    if ($loc ne '') {
+      $loc .= '/';
+    }
   }
 
   return $loc;
 }
 
-
 # ************************************************************
 # Main Section
 # ************************************************************
diff --git a/bin/msvc_mpc_auto_compile.pl b/bin/msvc_mpc_auto_compile.pl
index f2daff0bd8f..d6f70671339 100755
--- a/bin/msvc_mpc_auto_compile.pl
+++ b/bin/msvc_mpc_auto_compile.pl
@@ -30,7 +30,7 @@ else {
                   "$ACE_ROOT\\TAO\\TAO_IDL",
                   "$ACE_ROOT\\TAO\\tests");
 
-@ciao_core_dirs = ("$ACE_ROOT\\TAO\\orbsvcs\\orbsvcs", # CIAO dependancy
+@ciao_core_dirs = ("$ACE_ROOT\\TAO\\orbsvcs\\orbsvcs", # CIAO dependancy 
                    "$ACE_ROOT\\TAO\\CIAO");
 
 $debug = 0;
@@ -47,34 +47,16 @@ $vc7 = 0;
 
 # Build_Config takes in a string of the type "project--configuration" and
 # runs msdev to build it.
-# sub Build_Config ($)
-#{
-#    my ($arg) = @_;
-#    my ($project, $config) = split /--/, $arg;
-#
-#    return Build ($project, $config);
-#}
-
-# Build
-sub Build ($$)
+sub Build_Config ($)
 {
-  my ($project, $config) = @_;
-
-  if ($debug == 1) {
-    print "$project\n";
-    return 0;
-  }
-  else {
-    print "Auto_compiling $project : $config\n";
-
-    print "Building $project $config\n" if $verbose;
+    my ($arg) = @_;
+    my ($project, $config) = split /--/, $arg;
 
-    return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd $useenv");
-  }
+    return Build ($project, $config);
 }
 
 # Build
-sub Build_VC7 ($$)
+sub Build ($$)
 {
   my ($project, $config) = @_;
 
@@ -87,7 +69,7 @@ sub Build_VC7 ($$)
 
     print "Building $project $config\n" if $verbose;
 
-    return system ("devenv.com $project $Build_Cmd $config $useenv");
+    return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd $useenv");
   }
 }
 
@@ -95,34 +77,19 @@ sub Find_Dsw (@)
 {
     my (@dir) = @_;
     @array = ();
+    my @config_array = ();
 
-    sub wanted_dsw {
-        $array[++$#array] =
+    sub wanted {
+        $array[++$#array] = 
             $File::Find::name if ($File::Find::name =~ /\.dsw$/i);
     }
-
-    find (\&wanted_dsw, @dir);
-
+    
+    find (\&wanted, @dir);
+    
     print "List of dsw's \n" if ($verbose == 1);
     return @array;
 }
 
-sub Find_Sln (@)
-{
-    my (@dir) = @_;
-    @array = ();
-
-    sub wanted_sln {
-        $array[++$#array] =
-            $File::Find::name if ($File::Find::name =~ /\.sln$/i);
-    }
-
-    find (\&wanted_sln, @dir);
-
-    print "List of sln's \n" if ($verbose == 1);
-    return @array;
-}
-
 # Only builds the core libraries.
 sub Build_Custom ()
 {
@@ -135,7 +102,7 @@ sub Build_Custom ()
     print "\n" if ($verbose);
 
     my @custom_list = Find_Dsw (@directories);
-
+    
     print "List now is @custom_list \n";
     foreach $c (@custom_list) {
         print "List now is $c \n";
@@ -156,10 +123,10 @@ sub Build_All ()
     push @directories, @ace_core_dirs;
     push @directories, @tao_core_dirs;
     push @directories, @ciao_core_dirs;
-
+    
     print STDERR "First pass (libraries)\n" if ($print_status == 1);
     print "\nmsvc_auto_compile: First Pass CORE (libraries)\n";
-
+    
     Build_Custom ();
 
     my @new_directory_search = "$ACE_ROOT";
@@ -183,65 +150,6 @@ sub Build_All ()
 }
 
 
-# Only builds the core libraries.
-sub Build_Custom_VC7 ()
-{
-    print STDERR "Building Custom\n";
-    print "Building Custom directories specified\n";# if ($verbose == 1);
-
-    print "Build " if ($verbose);
-    print "Debug " if ($verbose) && ($Build_Debug);
-    print "Release " if ($verbose) && ($Build_Release);
-    print "\n" if ($verbose);
-
-    my @custom_list = Find_Sln (@directories);
-
-    print "List now is @custom_list \n";
-    foreach $c (@custom_list) {
-        print "List now is $c \n";
-        if ($Build_Debug) {
-            $Status = Build_VC7 ($c, "debug");
-            return if $Status != 0 && !$Ignore_errors;
-        }
-        if ($Build_Release) {
-            $Status = Build_VC7 ($c, "release");
-            return if $Status != 0 && !$Ignore_errors;
-        }
-    }
-}
-
-# Build all examples and directories
-sub Build_All_VC7 ()
-{
-    push @directories, @ace_core_dirs;
-    push @directories, @tao_core_dirs;
-    push @directories, @ciao_core_dirs;
-
-    print STDERR "First pass (libraries)\n" if ($print_status == 1);
-    print "\nmsvc_auto_compile: First Pass CORE (libraries)\n";
-
-    Build_Custom_VC7 ();
-
-    my @new_directory_search = "$ACE_ROOT";
-
-    my @configurations = Find_Sln (@new_directory_search);
-
-    print STDERR "Second pass (for other things)\n" if ($print_status == 1);
-    print "\nmsvc_mpc_auto_compile: Second  Pass (rest of the stuff)\n";
-
-    foreach $c (@configurations) {
-        print "\nUsing $c for compilation\n";
-        if ($Build_Debug) {
-            $Status = Build_VC7 ($c, "debug");
-            return if $Status != 0 && !$Ignore_errors;
-        }
-        if ($Build_Release) {
-            $Status = Build_VC7 ($c, "release");
-            return if $Status != 0 && !$Ignore_errors;
-        }
-    }
-}
-
 ## Parse command line argument
 while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^(-|\/)/ )
 {
@@ -252,14 +160,6 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^(-|\/)/ )
     elsif ($ARGV[0] =~ /^-d$/i) {       # debug
         $debug = 1;
     }
-    elsif ($ARGV[0] =~ '-vc7') {    # Use VC7 project and solution files.
-        print "Using VC7 files\n" if ( $verbose );
-        $vc7 = 1;
-    }
-    elsif ($ARGV[0] =~ '-vc8') {    # Use VC8 project and solution files.
-        print "Using VC8 files\n" if ( $verbose );
-        $vc7 = 1; # vc8 is like vc7
-    }
     elsif ($ARGV[0] =~ '-v') {          # verbose mode
         $verbose = 1;
     }
@@ -278,22 +178,22 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^(-|\/)/ )
     elsif ($ARGV[0] =~ '-TAO') {# Build TAO and its tests
         print "Building TAO\n" if ( $verbose );
         $use_custom_dir = 1;
-	push @directories, @ace_core_dirs;
+	push @directories, @ace_core_dirs;        
 	push @directories, @tao_core_dirs;
     }
     elsif ($ARGV[0] =~ '-CIAO') {# Build the CIAO and related
-                                 # libraries
+                                 # libraries 
         print "Building only CIAO\n" if ( $verbose );
         $use_custom_dir = 1;
-        push @directories, @ace_core_dirs;
+        push @directories, @ace_core_dirs;        
 	push @directories, @tao_core_dirs;
         push @directories, @ciao_core_dirs;
-    }
+    } 
     elsif ($ARGV[0] =~ '-ALL') {# Build the CIAO and related
-                                 # libraries
+                                 # libraries 
         print "Building ALL \n" if ( $verbose );
         $build_all = 1;
-    }
+    }    
     elsif ($ARGV[0] =~ '-dir') {        # Compile only a specific directory
         shift;
         print "Adding directory $ARGV[0]\n" if ( $verbose );
@@ -316,6 +216,10 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^(-|\/)/ )
         print "Building Release Version\n" if ( $verbose );
         $Build_Release = 1;
     }
+    elsif ($ARGV[0] =~ '-vc7') {    # Use VC7 project and solution files.
+        print "Using VC7 files\n" if ( $verbose );
+        $vc7 = 1;
+    }
     elsif ($ARGV[0] =~ '-(\?|h)') {     # Help information
         print "Options\n";
         print "-d         = Debug (only print out projects)\n";
@@ -323,8 +227,6 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^(-|\/)/ )
         print "-v         = Script verbose Mode\n";
         print "-s         = Print status messages to STDERR\n";
         print "-u         = Tell MSVC to use the environment\n";
-        print "-vc7       = Use MSVC 7 toolset\n";
-        print "-vc8       = Use MSVC 8 toolset\n";
         print "\n";
         print "-CORE      = Build ACE+TAO+CIAO core \n";
         print "-ACE       = Build ACE and its tests\n";
@@ -350,13 +252,7 @@ if (!$Build_Debug && !$Build_Release) {
 }
 
 print "MPC version of msvc_mpc_auto_compile: Begin\n";
-if ($vc7) {
-    Build_All_VC7 if ($build_all && !$use_custom_dir);
-    Build_Custom_VC7 if $use_custom_dir;
-}
-else {
-    Build_All if ($build_all && !$use_custom_dir);
-    Build_Custom if $use_custom_dir;
-}
+Build_All if ($build_all && !$use_custom_dir);
+Build_Custom if $use_custom_dir;
 print "msvc_mpc_auto_compile: End\n";
 print STDERR "End\n" if ($print_status == 1);
diff --git a/bin/msvc_static_compile.pl b/bin/msvc_static_compile.pl
index 38531cb0563..e9c5d545269 100755
--- a/bin/msvc_static_compile.pl
+++ b/bin/msvc_static_compile.pl
@@ -42,31 +42,72 @@ $build_core_only = 0;
 $Build_Cmd = "/BUILD";
 $use_custom_dir = 0;
 $useenv = '';
-$vc7 = 0;
-$name_mod = '';
-$mod_name = 0;
-$proj_ext = '.dsp';
 
-# Build
-sub Build ($$)
+# Find_dsp will search a directory for *.dsp files and return a list
+# of strings that include the project name and the configuration
+sub Find_dsp (@)
 {
-  my ($project, $config) = @_;
+    my (@dir) = @_;
+    @array = ();
+    my @config_array = ();
 
-  if ($debug == 1) {
-    print "$project\n";
-    return 0;
-  }
-  else {
-    print "Auto_compiling $project : $config\n";
+    # wanted is only used for the File::Find
+    sub wanted
+    {
+        $array[++$#array] = $File::Find::name if ($File::Find::name =~ /\.dsp$/i);
+    }
 
-    print "Building $project $config\n" if $verbose;
+    # get_config grabs the configurations out of a dsp file.
+    sub get_config ($)
+    {
+        my ($file) = @_;
+        my @configs = ();
 
-    return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd $useenv");
-  }
+        print "Looking at $file\n" if ($verbose);
+
+        open (DSP, "< $file") || die $!;
+
+        while (<DSP>)
+        {
+            push @configs, $1 if (/# Name \"([^\"]+)\"/);
+        }
+
+        close (DSP);
+        return @configs;
+    }
+
+    unshift @dir, (\&wanted);
+
+    find @dir;
+
+    for ($i = 0; $i <= $#array; ++$i) {
+        my $filename = "$array[$i]";
+
+        $filename =~ s@/./@/@g;
+        $filename =~ s@/@\\@g;
+        my @dsp_configs = get_config ($array[$i]);
+
+        for ($j = 0; $j <= $#dsp_configs; ++$j) {
+          push @config_array, "$filename--$dsp_configs[$j]";
+        }
+    }
+
+    return @config_array;
+}
+
+
+# Build_Config takes in a string of the type "project--configuration" and
+# runs msdev to build it.
+sub Build_Config ($)
+{
+    my ($arg) = @_;
+    my ($project, $config) = split /--/, $arg;
+
+    return Build ($project, $config);
 }
 
 # Build
-sub Build_VC7 ($$)
+sub Build ($$)
 {
   my ($project, $config) = @_;
 
@@ -79,47 +120,15 @@ sub Build_VC7 ($$)
 
     print "Building $project $config\n" if $verbose;
 
-    return system ("devenv.com $project $Build_Cmd $config $useenv");
+    return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd $useenv");
   }
 }
 
-sub Find_Dsw (@)
-{
-    my (@dir) = @_;
-    @array = ();
-
-    sub wanted_dsw {
-        $array[++$#array] =
-            $File::Find::name if ($File::Find::name =~ /\.dsw$/i);
-    }
-
-    find (\&wanted_dsw, @dir);
-
-    print "List of dsw's \n" if ($verbose == 1);
-    return @array;
-}
-
-sub Find_Sln (@)
-{
-    my (@dir) = @_;
-    @array = ();
-
-    sub wanted_sln {
-        $array[++$#array] =
-            $File::Find::name if ($File::Find::name =~ /\.sln$/i);
-    }
-
-    find (\&wanted_sln, @dir);
-
-    print "List of sln's \n" if ($verbose == 1);
-    return @array;
-}
-
 # Only builds the core libraries.
 sub Build_Core ()
 {
     print STDERR "Building Core of ACE/TAO\n" if ($print_status == 1);
-    print "\nmsvc_static_compile: Building Core of ACE/TAO\n";
+    print "Building Core of ACE/TAO\n" if ($verbose == 1);
 
     print "Build \n" if ($verbose);
     print "Debug " if ($verbose) && ($Build_Debug);
@@ -137,87 +146,53 @@ sub Build_Core ()
         $config_list->load ($ACE_ROOT.$test_lst);
 
         foreach $test ($config_list->valid_entries ()) {
-          if ($mod_name) {
-            @plist = split(/\//, $test);
-            $fname = pop @plist;
-	    $fname_mod = $name_mod;
-            $fname_mod =~ s/\*/$fname/;
-	    push @plist,($fname_mod);
-            push (@core_list, join('/', @plist) . $proj_ext);
-          }
-          else {
-            push (@core_list, $test . $proj_ext);
+            push (@core_list, $test);
           }
-        }
-      }
-
-
-      if ( $vc7 ) {
-          foreach $c (@core_list) {
-              if ($Build_Debug) {
-                  $Status = Build_VC7 ($c, "debug");
-                  return if $Status != 0 && !$Ignore_errors;
-              }
-              if ($Build_Release) {
-                  $Status = Build_VC7 ($c, "release");
-                  return if $Status != 0 && !$Ignore_errors;
-              }
+      } 
+
+
+      foreach $c (@core_list) {
+          if ($Build_Debug) {
+              $Status = Build ($c, "ALL - Win32 Debug");
+              return if $Status != 0 && !$Ignore_errors;
           }
-      }
-      else {
-          foreach $c (@core_list) {
-              if ($Build_Debug) {
-                  $Status = Build ($c, "ALL - Win32 Debug");
-                  return if $Status != 0 && !$Ignore_errors;
-              }
-              if ($Build_Release) {
-                  $Status = Build ($c, "ALL - Win32 Release");
-                  return if $Status != 0 && !$Ignore_errors;
-              }
+          if ($Build_Release) {
+              $Status = Build ($c, "ALL - Win32 Release");
+              return if $Status != 0 && !$Ignore_errors;
           }
-      }
+        }
     }
 }
 
 sub Build_All ()
 {
-    my @configurations = Find_Dsw (@directories);
+    my @configurations = Find_dsp (@directories);
 
-    print STDERR "Building selected projects\n" if ($print_status == 1);
-    print "\nmsvc_static_compile: Building selected projects\n";
+    print STDERR "First pass (libraries)\n" if ($print_status == 1);
+    print "\nmsvc_auto_compile: First Pass (libraries)\n";
 
-    $count = 0;
     foreach $c (@configurations) {
-        print STDERR "Configuration ".$count++." of ".$#configurations."\n" if ($print_status == 1);
-        if ($Build_Debug) {
-            $Status = Build ($c, "ALL - Win32 Debug");
-            return if $Status != 0 && !$Ignore_errors;
-        }
-        if ($Build_Release) {
-            $Status = Build ($c, "ALL - Win32 Release");
-            return if $Status != 0 && !$Ignore_errors;
+        if ($Build_All
+            || ($Build_LIB && $Build_Debug && $c =~ /Win32 Debug/)
+            || ($Build_LIB && $Build_Release && $c =~ /Win32 Release/))
+        {
+            my $Status = 0;
+            $Status = Build_Config ($c)
+                if (($c =~ /Library/) || ($c =~ / DLL /) || ($c =~ / LIB /));
+            return if ($Status != 0 && !$Ignore_errors);
         }
     }
-}
 
-sub Build_All_VC7 ()
-{
-    my @configurations = Find_Sln (@directories);
 
-    print STDERR "Building selected projects\n" if ($print_status == 1);
-    print "\nmsvc_static_compile: Building selected projects\n";
+    print STDERR "Second pass \n" if ($print_status == 1);
+    print "\nmsvc_auto_compile: Second Pass\n";
 
     $count = 0;
     foreach $c (@configurations) {
         print STDERR "Configuration ".$count++." of ".$#configurations."\n" if ($print_status == 1);
-        if ($Build_Debug) {
-            $Status = Build_VC7 ($c, "debug");
-            return if $Status != 0 && !$Ignore_errors;
-        }
-        if ($Build_Release) {
-            $Status = Build_VC7 ($c, "release");
-            return if $Status != 0 && !$Ignore_errors;
-        }
+        Build_Config ($c)
+        if (($Build_LIB && $Build_Debug && $c =~ /Win32 Debug/)
+           || ($Build_LIB && $Build_Release && $c =~ /Win32 Release/));
     }
 }
 
@@ -232,25 +207,9 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^(-|\/)/ )
     elsif ($ARGV[0] =~ /^-d$/i) {       # debug
         $debug = 1;
     }
-    elsif ($ARGV[0] =~ '-vc7') {    # Use VC7 project and solution files.
-        print "Using VC7 files\n" if ( $verbose );
-        $vc7 = 1;
-        $proj_ext = '.vcproj';
-    }
-    elsif ($ARGV[0] =~ '-vc8') {    # Use VC8 project and solution files.
-        print "Using VC8 files\n" if ( $verbose );
-        $vc7 = 1; # VC8 is like VC7
-        $proj_ext = '.vcproj';
-    }
     elsif ($ARGV[0] =~ '-v') {          # verbose mode
         $verbose = 1;
     }
-    elsif ($ARGV[0] =~ '-name_modifier') {          # use MPC name_modifier for project
-        shift;
-        print "Setting name_modifier $ARGV[0]\n" if ( $verbose );
-        $name_mod = $ARGV[0];
-        $mod_name = 1;
-    }
     elsif ($ARGV[0] =~ '-s') {          # status messages
         $print_status = 1;
     }
@@ -270,7 +229,7 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^(-|\/)/ )
     elsif ($ARGV[0] =~ '-TAO') {       # Build TAO and its programs
         print "Building TAO\n" if ( $verbose );
         $use_custom_dir = 1;
-	# Other tests depend on the lib in this dir so we need to force it
+	# Other tests depend on the lib in this dir so we need to force it 
 	# to the front of the build list. This is pretty ugly.
 	push @directories, ("$ACE_ROOT\\TAO\\orbsvcs\\tests\\Notify\\lib");
 	push @directories, ("$ACE_ROOT\\TAO");
@@ -311,9 +270,6 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^(-|\/)/ )
         print "-v         = Script verbose Mode\n";
         print "-s         = Print status messages to STDERR\n";
         print "-u         = Tell MSVC to use the environment\n";
-        print "-vc7       = Use MSVC 7 toolset\n";
-        print "-vc8       = Use MSVC 8 toolset\n";
-        print "-name_modifier <mod> = Use MPC name_modifier to match projects\n";
         print "\n";
         print "-CORE      = Build the Core libraries\n";
         print "-ACE       = Build ACE and its programs\n";
@@ -348,16 +304,11 @@ if ($#directories < 0) {
     @directories = ($ACE_ROOT);
 }
 
-print "msvc_static_compile: Begin\n";
+print "msvc_auto_compile: Begin\n";
 print STDERR "Beginning Core Build\n" if ($print_status == 1);
 Build_Core if (!$use_custom_dir || $build_core_only);
 print STDERR "Beginning Full Build\n" if ($print_status == 1);
-if ( $vc7 ) {
-    Build_All_VC7 if !$build_core_only;
-}
-else {
-    Build_All if !$build_core_only;
-}
+Build_All if !$build_core_only;
 
-print "msvc_static_compile: End\n";
+print "msvc_auto_compile: End\n";
 print STDERR "End\n" if ($print_status == 1);
diff --git a/bin/msvc_static_order.lst b/bin/msvc_static_order.lst
index 1e0d66ae568..178750c49e4 100644
--- a/bin/msvc_static_order.lst
+++ b/bin/msvc_static_order.lst
@@ -3,88 +3,80 @@
 # This file lists the project files that must be build first in a static
 # build using msvc_static_compile.pl
 
-ace/ace
-Kokyu/Kokyu
-ACEXML/parser/parser/ACEXML_Parser
-ACEXML/common/ACEXML
-apps/gperf/src/gperf
-TAO/TAO_IDL/TAO_IDL_BE
-TAO/TAO_IDL/TAO_IDL_FE
-TAO/TAO_IDL/TAO_IDL_EXE
-TAO/tao/TAO
-TAO/tao/Valuetype
-TAO/tao/IORInterceptor
-TAO/tao/ObjRefTemplate
-TAO/tao/PortableServer
-TAO/tao/DynamicAny
-TAO/tao/IORManipulation
-TAO/tao/IORTable
-TAO/tao/Messaging
-TAO/tao/DynamicInterface
-TAO/tao/Strategies
-TAO/tao/RTCORBA
-TAO/tao/RTPortableServer
-TAO/tao/Utils
-TAO/tao/RTScheduler
-TAO/tao/IFR_Client
-TAO/tao/TypeCodeFactory
-TAO/orbsvcs/orbsvcs/Svc_Utils
-TAO/orbsvcs/orbsvcs/CosNaming
-TAO/orbsvcs/orbsvcs/CosNaming_Serv
-TAO/orbsvcs/orbsvcs/CosNaming_Skel
-TAO/orbsvcs/orbsvcs/CosProperty
-TAO/orbsvcs/orbsvcs/CosTrading
-TAO/orbsvcs/orbsvcs/CosTrading_Serv
-TAO/orbsvcs/orbsvcs/CosTrading_Skel
-TAO/orbsvcs/orbsvcs/AV
-TAO/orbsvcs/orbsvcs/ETCL
-TAO/orbsvcs/orbsvcs/RTCosScheduling
-TAO/orbsvcs/orbsvcs/RTEvent
-TAO/orbsvcs/orbsvcs/RTSched
-TAO/orbsvcs/orbsvcs/RTSchedEvent
-TAO/orbsvcs/orbsvcs/RTOLDEvent
-TAO/orbsvcs/orbsvcs/CosEvent
-TAO/orbsvcs/orbsvcs/CosEvent_Serv
-TAO/orbsvcs/orbsvcs/CosEvent_Skel
-TAO/orbsvcs/orbsvcs/RTKokyuEvent
-TAO/orbsvcs/orbsvcs/CosConcurrency
-TAO/orbsvcs/orbsvcs/CosLifeCycle
-TAO/orbsvcs/orbsvcs/CosTime
-TAO/orbsvcs/orbsvcs/CosNotification
-TAO/orbsvcs/orbsvcs/CosNotification_Skel
-TAO/orbsvcs/orbsvcs/DsLogAdmin
-TAO/orbsvcs/orbsvcs/DsEventLogAdmin
-TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin
-TAO/orbsvcs/orbsvcs/FTORB_Utils
-TAO/orbsvcs/orbsvcs/FT_ClientORB
-TAO/orbsvcs/orbsvcs/FT_ServerORB
-TAO/orbsvcs/orbsvcs/FtRtEvent
-TAO/orbsvcs/orbsvcs/PortableGroup
-TAO/orbsvcs/orbsvcs/FaultTolerance
-TAO/orbsvcs/orbsvcs/CosLoadBalancing
-TAO/orbsvcs/orbsvcs/IFRService
-TAO/orbsvcs/orbsvcs/RTCORBAEvent
-TAO/orbsvcs/orbsvcs/RT_Notification
-TAO/orbsvcs/Naming_Service/Naming_Service
-TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Lib
-TAO/orbsvcs/orbsvcs/FTRT_ClientORB
-TAO/orbsvcs/tests/Event/lib/Event_Test_Lib
-TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib
-TAO/orbsvcs/tests/Trading/Trading_Test_Lib
-TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib
-TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf
-TAO/tests/Smart_Proxies/Collocation/SP_Collocation_TestStubsLib
-TAO/tests/Collocation/Collocation_Test_Stub
-TAO/examples/POA/Generic_Servant/POA_Generic_Servant_Lib
-TAO/examples/Simple/time-date/Simple_Time_Date_Lib
-TAO/docs/tutorials/Quoter/idl/Quoter_Idl_Lib
-TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common
-tests/Test_Output
-performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib
-examples/Service_Configurator/Misc/Service_Configurator_Misc_Timer
-examples/Timer_Queue/Timer_Queue_Library
-ASNMP/asnmp/asnmp_lib
-netsvcs/lib/netsvcs
-netsvcs/clients/Naming/Client/Netsvsc_Client_Test_Lib
-netsvcs/clients/Naming/Dump_Restore/Netsvcs_Dump_Restore_Lib
-websvcs/lib/websvcs
+ace/ace.dsp
+Kokyu/Kokyu.dsp
+ACEXML/parser/parser/ACEXML_Parser.dsp
+ACEXML/common/ACEXML.dsp
+apps/gperf/src/gperf.dsp
+TAO/TAO_IDL/TAO_IDL_BE.dsp
+TAO/TAO_IDL/TAO_IDL_FE.dsp
+TAO/TAO_IDL/TAO_IDL_EXE.dsp
+TAO/tao/TAO.dsp
+TAO/tao/Valuetype.dsp
+TAO/tao/IORInterceptor.dsp
+TAO/tao/ObjRefTemplate.dsp
+TAO/tao/PortableServer.dsp
+TAO/tao/DynamicAny.dsp
+TAO/tao/IORManipulation.dsp
+TAO/tao/IORTable.dsp
+TAO/tao/Messaging.dsp
+TAO/tao/DynamicInterface.dsp
+TAO/tao/Strategies.dsp
+TAO/tao/RTCORBA.dsp
+TAO/tao/RTPortableServer.dsp
+TAO/tao/Utils.dsp
+TAO/tao/RTScheduler.dsp
+TAO/tao/IFR_Client.dsp
+TAO/tao/TypeCodeFactory.dsp
+TAO/orbsvcs/orbsvcs/Svc_Utils.dsp
+TAO/orbsvcs/orbsvcs/CosNaming.dsp
+TAO/orbsvcs/orbsvcs/CosProperty.dsp
+TAO/orbsvcs/orbsvcs/CosTrading.dsp
+TAO/orbsvcs/orbsvcs/AV.dsp
+TAO/orbsvcs/orbsvcs/ETCL.dsp
+TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp
+TAO/orbsvcs/orbsvcs/RTEvent.dsp
+TAO/orbsvcs/orbsvcs/RTSched.dsp
+TAO/orbsvcs/orbsvcs/RTSchedEvent.dsp
+TAO/orbsvcs/orbsvcs/RTOLDEvent.dsp
+TAO/orbsvcs/orbsvcs/CosEvent.dsp
+TAO/orbsvcs/orbsvcs/RTKokyuEvent.dsp
+TAO/orbsvcs/orbsvcs/CosConcurrency.dsp
+TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp
+TAO/orbsvcs/orbsvcs/CosTime.dsp
+TAO/orbsvcs/orbsvcs/CosNotification.dsp
+TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
+TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp
+TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp
+TAO/orbsvcs/orbsvcs/FTORB_Utils.dsp
+TAO/orbsvcs/orbsvcs/FT_ClientORB.dsp
+TAO/orbsvcs/orbsvcs/FT_ServerORB.dsp
+TAO/orbsvcs/orbsvcs/FtRtEvent.dsp
+TAO/orbsvcs/orbsvcs/PortableGroup.dsp
+TAO/orbsvcs/orbsvcs/FaultTolerance.dsp
+TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp
+TAO/orbsvcs/orbsvcs/IFRService.dsp
+TAO/orbsvcs/orbsvcs/RTCORBAEvent.dsp
+TAO/orbsvcs/orbsvcs/RT_Notification.dsp
+TAO/orbsvcs/Naming_Service/Naming_Service.dsp
+TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Lib.dsp
+TAO/orbsvcs/orbsvcs/FTRT_ClientORB.dsp
+TAO/orbsvcs/tests/Event/lib/Event_Test_Lib.dsp
+TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.dsp
+TAO/orbsvcs/tests/Trading/Trading_Test_Lib.dsp
+TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.dsp
+TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.dsp
+TAO/tests/Smart_Proxies/Collocation/SP_Collocation_TestStubsLib.dsp
+TAO/tests/Collocation/Collocation_Test_Stub.dsp
+TAO/examples/POA/Generic_Servant/POA_Generic_Servant_Lib.dsp
+TAO/examples/Simple/time-date/Simple_Time_Date_Lib.dsp
+TAO/docs/tutorials/Quoter/idl/Quoter_Idl_Lib.dsp
+TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common.dsp
+tests/Test_Output.dsp
+performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp
+examples/Service_Configurator/Misc/Service_Configurator_Misc_Timer.dsp
+ASNMP/asnmp/asnmp_lib.dsp
+netsvcs/lib/netsvcs.dsp
+netsvcs/clients/Naming/Client/Netsvsc_Client_Test_Lib.dsp
+netsvcs/clients/Naming/Dump_Restore/Netsvcs_Dump_Restore_Lib.dsp
+websvcs/lib/websvcs.dsp
diff --git a/bin/mwc.pl b/bin/mwc.pl
index 688d278b513..0715e948b99 100755
--- a/bin/mwc.pl
+++ b/bin/mwc.pl
@@ -14,7 +14,6 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 
 use strict;
 use Cwd;
-use Config;
 use File::Basename;
 
 if ( $^O eq 'VMS' ) {
@@ -22,7 +21,7 @@ if ( $^O eq 'VMS' ) {
   import VMS::Filespec qw(unixpath);
 }
 
-my($basePath) = getExecutePath($0) . '/MakeProjectCreator';
+my($basePath) = getExecutePath($0) . 'MakeProjectCreator';
 unshift(@INC, $basePath . '/modules');
 
 my($mpcroot) = $ENV{MPC_ROOT};
@@ -61,23 +60,31 @@ my(@creators) = ('GNUACEWorkspaceCreator',
 # Subroutine Section
 # ************************************************************
 
-sub getBasePath {
-  return $mpcpath;
-}
-
-
 sub which {
-  my($prog) = shift;
-  my($exec) = $prog;
-
-  if (defined $ENV{'PATH'}) {
-    my($part)   = '';
-    my($envSep) = $Config{'path_sep'};
-    foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-      $part .= "/$prog";
-      if ( -x $part ) {
-        $exec = $part;
-        last;
+  my($prog)   = shift;
+  my($exec)   = $prog;
+  my($part)   = '';
+  if ( $^O eq 'VMS' ) {
+    my($envSep) = ';';
+    if (defined $ENV{'PATH'}) {
+      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
+        $part .= "$prog";
+        if ( -x $part ) {
+          $exec = $part;
+          last;
+        }
+      }
+    }
+  }
+  else  {
+    my($envSep) = ($^O eq 'MSWin32' ? ';' : ':');
+    if (defined $ENV{'PATH'}) {
+      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
+        $part .= "/$prog";
+        if ( -x $part ) {
+          $exec = $part;
+          last;
+        }
       }
     }
   }
@@ -90,33 +97,51 @@ sub getExecutePath {
   my($prog) = shift;
   my($loc)  = '';
 
-  if ($prog ne basename($prog)) {
-    my($dir) = ($^O eq 'VMS' ? unixpath(dirname($prog)) : dirname($prog));
-    if ($prog =~ /^[\/\\]/ ||
-        $prog =~ /^[A-Za-z]:[\/\\]?/) {
-      $loc = $dir;
+  if ( $^O eq 'VMS' ) {
+    if ($prog ne basename($prog)) {
+      my($dir) = unixpath( dirname($prog) );
+      if ($prog =~ /^[\/\\]/) {
+        $loc = $dir;
+      }
+      else {
+        $loc = unixpath(getcwd()) . $dir;
+      }
     }
     else {
-      $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()) . '/' . $dir;
+      $loc = unixpath( dirname(which($prog)) );
     }
-  }
-  else {
-    $loc = dirname(which($prog));
-    if ($^O eq 'VMS') {
-      $loc = unixpath($loc);
+
+    if ($loc eq '.') {
+      $loc = unixpath( getcwd() );
     }
-  }
+  } else {
+    if ($prog ne basename($prog)) {
+      if ($prog =~ /^[\/\\]/ ||
+          $prog =~ /^[A-Za-z]:[\/\\]?/) {
+        $loc = dirname($prog);
+      }
+      else {
+        $loc = getcwd() . '/' . dirname($prog);
+      }
+    }
+    else {
+      $loc = dirname(which($prog));
+    }
+
+    $loc =~ s/\/\.$//;
 
-  $loc =~ s/\/\.$//;
+    if ($loc eq '.') {
+      $loc = getcwd();
+    }
 
-  if ($loc eq '.') {
-    $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd());
+    if ($loc ne '') {
+      $loc .= '/';
+    }
   }
 
   return $loc;
 }
 
-
 # ************************************************************
 # Main Section
 # ************************************************************
diff --git a/bin/tao_orb_tests.lst b/bin/tao_orb_tests.lst
index b4617dc690f..5036aa1fd6e 100644
--- a/bin/tao_orb_tests.lst
+++ b/bin/tao_orb_tests.lst
@@ -20,8 +20,8 @@ TAO/tests/Collocation_Opportunities/run_test.pl: !ST
 TAO/tests/OctetSeq/run_test.pl
 TAO/tests/OctetSeq/run_test1.pl: !STATIC
 TAO/tests/OctetSeq/run_test2.pl: !STATIC
-TAO/tests/BiDirectional/run_test.pl: !MINIMUM !GIOP10 !DISABLE_BIDIR
-TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10 !DISABLE_BIDIR
+TAO/tests/BiDirectional/run_test.pl: !MINIMUM !GIOP10
+TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10
 TAO/tests/Leader_Followers/run_test.pl: !ST
 TAO/tests/Leader_Followers/run_test_mt.pl: !ST
 TAO/tests/Multiple_Inheritance/run_test.pl
@@ -69,7 +69,7 @@ TAO/tests/Cache_Growth_Test/run_test.pl
 TAO/tests/Muxing/run_test.pl: !ST
 TAO/tests/Muxed_GIOP_Versions/run_test.pl: !ST
 TAO/tests/MT_Client/run_test.pl: !ST
-TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !GIOP10 !DISABLE_BIDIR
+TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !GIOP10
 TAO/tests/File_IO/run_test.pl: !ST !MINIMUM
 TAO/tests/MT_Server/run_test.pl: !ST
 TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM
diff --git a/bin/tao_other_tests.lst b/bin/tao_other_tests.lst
index f9fcc6fb19b..4b31a2fe859 100644
--- a/bin/tao_other_tests.lst
+++ b/bin/tao_other_tests.lst
@@ -30,7 +30,7 @@ TAO/performance-tests/Throughput/run_test.pl
 TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl
 TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM
 TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM !SUNCC5_1
-TAO/examples/POA/POA_BiDir/run_test.pl: !MINIMUM !DISABLE_BIDIR
+TAO/examples/POA/POA_BiDir/run_test.pl: !MINIMUM
 TAO/examples/POA/DSI/run_test.pl: !MINIMUM
 TAO/examples/POA/Default_Servant/run_test.pl: !MINIMUM
 TAO/examples/POA/Explicit_Activation/run_test.pl: !MINIMUM
@@ -48,8 +48,8 @@ TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING
 TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING
 TAO/examples/Quoter/run_test.pl: !MINIMUM
 TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !SUNCC5_1
-TAO/examples/PluggableUDP/tests/Basic/run_test.pl: !STATIC !ST !NO_DIOP
-TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl: !NO_DIOP
+TAO/examples/PluggableUDP/tests/Basic/run_test.pl: !STATIC !ST
+TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl
 TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM
 TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM
 TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP
@@ -63,7 +63,7 @@ TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p TCP,UDP,RTP
 TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP
 TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM
 TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM
+TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM 
 TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING
 TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !NO_MESSAGING
 TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM
@@ -78,12 +78,12 @@ TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: SANDBOX
 TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM
 TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC
 TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !MINIMUM
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !MINIMUM 
 TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING
 TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING 
+TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING 
+TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING
 TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING
 TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING
 TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING
diff --git a/configure.ac b/configure.ac
index a6b69ea6be6..4cb93c3bcad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ AC_INIT([ACE],
 AC_REVISION([$Id$])
 
 AC_COPYRIGHT([ACE(TM) and TAO(TM) are copyrighted by Douglas C. Schmidt and
-his research group at Vanderbilt University, Washington University, and
-University of California, Irvine.  Copyright (c) 1993-2004, all rights
+his research group at Washington University, University of California,
+Irvine, and Vanderbilt University Copyright (c) 1993-2004, all rights
 reserved.  Since ACE and TAO are open-source, free software, you are
 free to use, modify, and distribute the ACE and TAO source code and
 object code produced from the source, as long as you include this
@@ -52,8 +52,9 @@ AC_CONFIG_MACRO_DIR([m4])
 dnl Check what platform we are running on.
 AC_CANONICAL_TARGET([])
 
-dnl Initialize GNU Automake, and require Automake 1.9 or better.
-AM_INIT_AUTOMAKE([1.9])
+dnl Initialize GNU Automake, and require Automake 1.7 or better.
+AM_INIT_AUTOMAKE([1.7])
+
 
 dnl Add maintainer mode option to the option list.
 dnl AM_MAINTAINER_MODE
@@ -428,6 +429,12 @@ AS_IF([test "$ac_cv_header_dirent_dirent_h" = yes ||
 dnl Check for sys/wait.h Posix.1 compliance
 AC_HEADER_SYS_WAIT
 
+AS_IF([test "$ac_cv_cygwin" = yes],
+  [
+   AC_CHECK_HEADER([cygwin32/socket.h],
+                   [AC_DEFINE([ACE_HAS_CYGWIN32_SOCKET_H])],)
+  ],[])
+
 AC_CHECK_HEADER([dlfcn.h],
   [
    dnl We already checked for dlopen in the previous library checks however,
@@ -442,9 +449,28 @@ AC_CHECK_HEADER([dlfcn.h],
     ],[])
   ],)
 
-ACE_CHECK_LACKS_HEADERS(inttypes.h malloc.h memory.h stdint.h)
+AC_CHECK_HEADER([malloc.h],
+  ,
+  [AC_DEFINE([ACE_LACKS_MALLOC_H])])
+
+AC_CHECK_HEADER([memory.h],
+  ,
+  [AC_DEFINE([ACE_LACKS_MEMORY_H])])
+
+AC_CHECK_HEADER([stdint.h],
+  ,
+  [AC_DEFINE(ACE_LACKS_STDINT_H)])
+
+AC_CHECK_HEADER([inttypes.h],
+  ,
+  [AC_DEFINE(ACE_LACKS_INTTYPES_H)])
+
+AC_CHECK_HEADER([bytesex.h],
+  [AC_DEFINE([ACE_HAS_BYTESEX_H])])
 
-ACE_CHECK_HAS_HEADERS(bytesex.h)
+dnl We don't need to explicitly include this on linux.
+dnl AC_CHECK_HEADER([features.h],
+dnl  [AC_DEFINE([ACE_HAS_FEATURES_H])])
 
 AC_CHECK_HEADER([sys/msg.h],
   [
@@ -492,12 +518,16 @@ AC_CHECK_HEADER([sys/msg.h],
 AC_CHECK_HEADER([sys/sem.h],,)
 AC_CHECK_HEADER([sys/shm.h],,)
 
-ACE_CHECK_LACKS_HEADERS(sys/param.h)
+AC_CHECK_HEADER([sys/param.h],
+  [],
+  [AC_DEFINE([ACE_LACKS_PARAM_H])])
 
 AC_CHECK_HEADER([sys/priocntl.h],[],[])
 
 dnl Check for <ucontext.h> _before_ <sys/procfs.h>
-ACE_CHECK_LACKS_HEADERS(ucontext.h)
+AC_CHECK_HEADER([ucontext.h],
+  [],
+  [AC_DEFINE([ACE_LACKS_UCONTEXT_H])])
 
 AC_CHECK_HEADER([sys/procfs.h],
   [
@@ -529,83 +559,36 @@ AC_CHECK_HEADER([sys/procfs.h],
      ])
   ],)
 
-ACE_CHECK_LACKS_HEADERS(arpa/inet.h)
-
-ACE_CHECK_LACKS_HEADERS(dirent.h)
-
-ACE_CHECK_LACKS_HEADERS(dlfcn.h)
-
-ACE_CHECK_LACKS_HEADERS(errno.h)
-
-ACE_CHECK_LACKS_HEADERS(fcntl.h)
-
-ACE_CHECK_LACKS_HEADERS(search.h)
-
-ACE_CHECK_HAS_HEADERS(select.h)
-
-ACE_CHECK_LACKS_HEADERS(semaphore.h)
-
-ACE_CHECK_LACKS_HEADERS(signal.h)
-
-ACE_CHECK_LACKS_HEADERS(stdlib.h)
-
-ACE_CHECK_LACKS_HEADERS(string.h)
-
-ACE_CHECK_LACKS_HEADERS(strings.h)
-
-ACE_CHECK_LACKS_HEADERS(netdb.h)
-
-ACE_CHECK_LACKS_HEADERS(netinet/in.h)
-
-ACE_CHECK_LACKS_HEADERS(netinet/tcp.h)
-
-ACE_CHECK_LACKS_HEADERS(net/if.h)
-
-ACE_CHECK_HAS_HEADERS(sys/filio.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/ioctl.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/ipc.h)
-
-ACE_CHECK_HAS_HEADERS(sys/loadavg.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/mman.h)
+AC_CHECK_HEADER([select.h],
+  [AC_DEFINE([ACE_HAS_SELECT_H])])
 
-ACE_CHECK_HAS_HEADERS(sys/pstat.h)
+AC_CHECK_HEADER([sys/select.h],
+  [],
+  [AC_DEFINE([ACE_LACKS_SYS_SELECT_H])])
 
-ACE_CHECK_LACKS_HEADERS(sys/resource.h)
+AC_CHECK_HEADER([netinet/tcp.h],
+  [],
+  [AC_DEFINE([ACE_LACKS_TCP_H])])
 
-ACE_CHECK_LACKS_HEADERS(sys/sem.h)
+AC_CHECK_HEADER([sys/sockio.h],
+  [AC_DEFINE([ACE_HAS_SOCKIO_H])])
 
-ACE_CHECK_LACKS_HEADERS(sys/shm.h)
+AC_CHECK_HEADER([sysent.h],
+  [AC_DEFINE([ACE_HAS_SYSENT_H])],)
 
-ACE_CHECK_LACKS_HEADERS(sys/select.h)
-
-ACE_CHECK_HAS_HEADERS(sys/sockio.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/socket.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/stat.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/time.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/types.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/uio.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/un.h)
-
-ACE_CHECK_LACKS_HEADERS(sys/wait.h)
-
-ACE_CHECK_HAS_HEADERS(sysent.h)
-
-ACE_CHECK_LACKS_HEADERS(time.h)
+AC_CHECK_HEADER([sys/systeminfo.h],[],[])
 
-ACE_CHECK_LACKS_HEADERS(termios.h)
+AC_CHECK_HEADER([sys/filio.h],
+  [AC_DEFINE([ACE_HAS_SYS_FILIO_H])],)
 
+AC_CHECK_HEADER([sys/uio.h],,)
 
+AC_CHECK_HEADER([sys/ioctl.h],
+   [AC_DEFINE([ACE_HAS_SYS_IOCTL_H])],)
 
-AC_CHECK_HEADER([sys/systeminfo.h],[],[])
+AC_CHECK_HEADER([sys/types.h],
+  ,
+  [AC_DEFINE([ACE_LACKS_SYS_TYPES_H])])
 
 AC_CHECK_HEADER([sys/termios.h],
   [
@@ -613,7 +596,7 @@ AC_CHECK_HEADER([sys/termios.h],
       [
 #include <sys/termios.h>
 
-#if !defined (ACE_LACKS_SYS_IOCTL_H)
+#if defined (ACE_HAS_SYS_IOCTL_H)
 # include <sys/ioctl.h>
 #endif
 
@@ -894,12 +877,15 @@ AC_CHECK_HEADER([strings.h],
      ],)
   ],)
 
-ACE_CHECK_HAS_HEADERS(sys/syscall.h)
+AC_CHECK_HEADER([sys/syscall.h],
+  [AC_DEFINE([ACE_HAS_SYSCALL_H])],)
 
 AC_CHECK_HEADER([poll.h],
   [AC_DEFINE([ACE_HAS_POLL])],)
 
-ACE_CHECK_LACKS_HEADERS(pwd.h)
+dnl We want AC_CHECK_HEADERS so that "HAVE_PWD_H" gets defined if we have it.
+dnl "HAVE_PWD_H" is used in one of the tests later on.
+AC_CHECK_HEADERS([pwd.h],,)
 
 AC_CHECK_HEADER([regexpr.h],
   [AC_DEFINE([ACE_HAS_REGEX])],)
@@ -908,27 +894,40 @@ AC_CHECK_HEADER([stropts.h],
   [AC_DEFINE([ACE_HAS_STREAMS])],
   [AC_DEFINE([ACE_LACKS_STROPTS_H])])
 
-ACE_CHECK_LACKS_HEADERS(siginfo.h)
+AC_CHECK_HEADER([siginfo.h],
+  ,
+  [AC_DEFINE([ACE_LACKS_SIGINFO_H])])
+
+AC_CHECK_HEADER([unistd.h],
+  ,
+  [AC_DEFINE([ACE_LACKS_UNISTD_H])])
 
-ACE_CHECK_LACKS_HEADERS(unistd.h)
+AC_CHECK_HEADER([utime.h],
+  [AC_DEFINE([ACE_HAS_UTIME])],)
 
-ACE_CHECK_LACKS_HEADERS(utime.h)
+dnl This check will be disabled until we can get ACE to compile when it
+dnl ACE_HAS_WCHAR is defined on UN*X systems
+dnl AC_CHECK_HEADER([wchar.h],
+dnl   [AC_DEFINE([ACE_HAS_WCHAR])],)
 
-ACE_CHECK_LACKS_HEADERS(wchar.h)
+AC_CHECK_HEADER([libc.h],
+  [AC_DEFINE([ACE_HAS_LIBC_H])])
 
-AC_CHECK_HEADER([wchar.h],
-  [AC_DEFINE([ACE_HAS_WCHAR])],)
+AC_CHECK_HEADER([osfcn.h],
+  [AC_DEFINE([ACE_HAS_OSFCN_H])])
 
 AC_CHECK_HEADER([new],
   [AC_DEFINE([ACE_HAS_NEW_NO_H])],
   [
-   ACE_CHECK_HAS_HEADERS([new.h])
+   AC_CHECK_HEADER([new.h],
+    [AC_DEFINE([ACE_HAS_NEW_H])])
   ])
 
 AC_CHECK_HEADER([stdexcept],
   [AC_DEFINE([ACE_HAS_STDEXCEPT_NO_H])],
   [
-   ACE_CHECK_HAS_HEADERS([exception.h])
+   AC_CHECK_HEADER([exception.h],
+     [AC_DEFINE([ACE_HAS_EXCEPTION_H])])
   ])
 
 dnl ace/OS.i can #include <cstring>,not #include <cstring.h>
@@ -992,6 +991,23 @@ ACE_CACHE_CHECK([if sprintf() returns char*],
   ],[AC_DEFINE([ACE_HAS_CHARPTR_SPRINTF])],)
 ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
 
+dnl Check for getopt() prototype
+ACE_CACHE_CHECK([for getopt() prototype],[ace_cv_lib_getopt_proto],[
+  AC_EGREP_HEADER([getopt],[unistd.h],
+    [
+     ace_cv_lib_getopt_proto=yes
+    ],
+    [
+     AC_EGREP_HEADER([[^_]+getopt],[stdlib.h],
+       [
+        ace_cv_lib_getopt_proto=yes
+       ],
+       [
+        ace_cv_lib_getopt_proto=no
+       ])
+    ])
+],,[AC_DEFINE([ACE_LACKS_GETOPT_PROTO])])
+
 dnl Check for old malloc() prototype.
 ACE_CONVERT_WARNINGS_TO_ERRORS([
 ACE_CACHE_CHECK([for old malloc() prototype],
@@ -1013,55 +1029,66 @@ ACE_CACHE_CHECK([for old malloc() prototype],
   ],[AC_DEFINE([ACE_HAS_OLD_MALLOC])],)
 ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
 
-
-dnl Check for getopt() prototype
-AC_CHECK_DECL([getopt],
-              [],
-              [AC_DEFINE([ACE_LACKS_GETOPT_PROTOTYPE], 1,
-                         [Define to 1 if platform lacks the declaration
-                         of getopt().])],
-              [#include <stdlib.h>
-              #ifndef ACE_LACKS_UNISTD_H
-              # include <unistd.h>
-              #endif])
-
 dnl Check for *_timedwait() prototypes
 dnl TODO: We only check for one of the *_timedwait() prototypes.
 dnl       Is this enough?
-AC_CHECK_DECL([recv_timedwait],
-              [],
-              [AC_DEFINE([ACE_LACKS_TIMEDWAIT_PROTOTYPES], 1,
-                         [Define to 1 if platform lacks the declarations
-                         of recv_timedwait, send_timedwait, etc.])],
-              [#include <pthread.h>
-	       #include <fcntl.h>])
-
-dnl Check for ualarm prototype
-AC_CHECK_DECL([ualarm],
-              [],
-	      [AC_DEFINE([ACE_LACKS_UALARM_PROTOTYPE], 1,
-	                 [Define to 1 if platform lacks the declaration
-			 of ualarm().])],
-              [#include <unistd.h>])
+ACE_CACHE_CHECK([for *_timedwait() prototypes],[ace_cv_lib_timedwait_proto],[
+  AC_EGREP_HEADER([recv_timedwait],[pthread.h],
+    [
+     ace_cv_lib_timedwait_proto=yes
+    ],
+    [
+     AC_EGREP_HEADER([recv_timedwait],[fcntl.h],
+       [
+        ace_cv_lib_timedwait_proto=yes
+       ],
+       [
+        ace_cv_lib_timedwait_proto=no
+       ])
+    ])
+],,[AC_DEFINE([ACE_LACKS_TIMEDWAIT_PROTOTYPES])])
+
+dnl Check for ualarm prototype in unistd.h.
+dnl Most Unices seem to put it there (?)
+ACE_CACHE_CHECK([for ualarm() prototype],[ace_cv_lib_ualarm_proto],[
+   AC_EGREP_HEADER([ualarm],[unistd.h],
+                   [
+                    ace_cv_lib_ualarm_proto=yes
+                   ],
+                   [
+                    ace_cv_lib_ualarm_proto=no
+                   ])
+],,[AC_DEFINE([ACE_LACKS_UALARM_PROTOTYPE])])
 
 dnl Check for getrusage prototype in sys/resource.h
-AC_CHECK_DECL([getrusage],
-	      [AC_DEFINE([ACE_HAS_GETRUSAGE_PROTOTYPE], 1,
-			 [Define to 1 if platform has the declaration
-			 of getrusage().])],
-	      [],
-	      [#include <sys/resource.h>])
-
-dnl Check for {get,set}rlimit prototypes
-AC_CHECK_DECL([getrlimit],[],[],[#include <sys/resource.h>])
-AC_CHECK_DECL([setrlimit],[],[],[#include <sys/resource.h>])
-if test "$ac_cv_have_decl_getrlimit" != yes ||
-   test "$ac_cv_have_decl_setrlimit" != yes; then
-  AC_DEFINE([ACE_LACKS_RLIMIT_PROTOTYPE], 1,
-            [Define to 1 if platform lacks the declaration of
-            {get,set}rlimit().])
-fi
+ACE_CACHE_CHECK([for getrusage() in sys/resource.h],
+    [ace_cv_lib_has_getrusage_proto],[
+      AC_EGREP_HEADER([getrusage],[sys/resource.h],
+         [
+          ace_cv_lib_has_getrusage_proto=yes
+         ],
+         [
+          ace_cv_lib_has_getrusage_proto=no
+         ])
+],[AC_DEFINE([ACE_HAS_GETRUSAGE_PROTO])],)
 
+dnl Check for {get,set}rlimit prototypes in sys/resource.h
+ACE_CACHE_CHECK([for getrlimit() and setrlimit() in sys/resource.h],
+    [ace_cv_lib_has_getsetrlimit_proto],[
+      AC_EGREP_HEADER([getrlimit],[sys/resource.h],
+         [
+          AC_EGREP_HEADER([getrlimit],[sys/resource.h],
+             [
+              ace_cv_lib_has_getsetrlimit_proto=yes
+             ],
+             [
+              ace_cv_lib_has_getsetrlimit_proto=no
+             ])
+         ],
+         [
+          ace_cv_lib_has_getsetrlimit_proto=no
+         ])
+],,[AC_DEFINE([ACE_LACKS_RLIMIT_PROTOTYPE])])
 
 dnl Check for platforms that don't declare dl* functions
 dnl as extern "C" in dlfcn.h.
@@ -1103,7 +1130,7 @@ ACE_CHECK_TYPE([u_longlong_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_U_LONGLONG_T]
 ACE_CHECK_TYPE([pri_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_PRI_T])])
 
 dnl Some platforms define ucontext_t in <sys/ucontext.h>, but ACE
-dnl doesn't explicitly include that header.  However, it is very
+dnl doesn't explicitly include that header.  However, it is very 
 dnl likely that <signal.h> does, either directly or indirectly.
 AC_CHECK_TYPE([ucontext_t],
 	AC_DEFINE([ACE_HAS_UCONTEXT_T]),
@@ -1699,10 +1726,6 @@ if test "$cross_compiling" != yes; then
   dnl if test "$ac_cv_sizeof_char" != "0"; then
   dnl   AC_DEFINE([ACE_SIZEOF_CHAR],[SIZEOF_CHAR])
   dnl fi
-  AC_CHECK_SIZEOF([wchar_t])
-  if test "$ac_cv_sizeof_wchar_t" != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_WCHAR],[$ac_cv_sizeof_wchar_t])
-  fi
   AC_CHECK_SIZEOF([short])
   if test "$ac_cv_sizeof_short" != 0; then
     AC_DEFINE_UNQUOTED([ACE_SIZEOF_SHORT],[$ac_cv_sizeof_short])
@@ -1774,8 +1797,6 @@ fi dnl test "$cross_compiling" != yes
 
 dnl Other checks
 
-ACE_VAR_TIMEZONE
-
 
 dnl Check for istream operator>> for char, unsigned char and signed char
 ACE_CACHE_CHECK([for istream operator>> for char types],
@@ -2146,12 +2167,7 @@ ACE_CACHE_CHECK([for C++ typename keyword],
                    ],[
                     ace_cv_feature_posix_typename_keyword=no
                    ])
-  ],
-  [AC_DEFINE([ACE_HAS_TYPENAME_KEYWORD])],
-  [
-   AC_MSG_WARN([$CXX does not support the C++ \"typename\" keyword.
-ACE will require it in the near future.])
-  ])
+  ],[AC_DEFINE([ACE_HAS_TYPENAME_KEYWORD])],)
 
 dnl Check if platform supports placement new operator
 ACE_CACHE_CHECK([for C++ placement new operator],
@@ -2796,10 +2812,7 @@ Vector<void *> vpv;
       ],[
        ace_cv_feature_cxx_std_template_specialization=no
       ])
-  ],
-  [AC_DEFINE([ACE_HAS_STD_TEMPLATE_SPECIALIZATION])],
-  [AC_MSG_WARN([$CXX does not support standard full template specialization.
-ACE will require it in the near future.])])
+  ],[AC_DEFINE([ACE_HAS_STD_TEMPLATE_SPECIALIZATION])],)
 
 if test "$ace_cv_feature_cxx_std_template_specialization" = yes; then
 
@@ -2853,36 +2866,6 @@ Vector<void *>::operator[] (int i)
        ace_cv_feature_cxx_std_template_class_member_specialization=no
       ])
   ],[AC_DEFINE([ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION])],)
-
-
-dnl Check if platform supports partial template specialization
-ACE_CACHE_CHECK([for partial template specialization],
-  [ace_cv_feature_cxx_partial_template_specialization],[
-     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-template <bool C, typename Ta>
-struct Foo;
-
-template <typename Ta>
-struct Foo<true, Ta>
-{
-  typedef Ta result_type;
-};
-
-template <typename Ta>
-struct Foo<false, Ta>
-{
-  typedef void result_type;
-};
-       ]],[[
-  Foo<true, int>::result_type a = 2;
-       ]])],[
-        ace_cv_feature_cxx_partial_template_specialization=yes
-       ],[
-        ace_cv_feature_cxx_partial_template_specialization=no
-       ])
-  ],[],[AC_MSG_WARN([$CXX does not support partial template specialization.
-ACE will require it in the near future.])])
-
 fi  dnl test $ace_cv_feature_cxx_std_template_specialization = yes
 
 dnl Check if platform supports template typedefs
@@ -3178,52 +3161,29 @@ esac
 
 ACE_CHECK_LACKS_FUNCS(access)
 
+dnl Temporarily select C as the test language to work around a bug in
+dnl some versions of Autoconf when C++ is selected as the test
+dnl language.
+AC_LANG_PUSH([C])
 ACE_CHECK_LACKS_FUNCS(bsearch)
+AC_LANG_POP([C])
 
 ACE_CHECK_HAS_FUNCS(clock_gettime)
 
-ACE_CHECK_LACKS_FUNCS(difftime)
-
-ACE_CHECK_LACKS_FUNCS(fgetwc fcntl fsync)
-
-ACE_CHECK_LACKS_FUNCS(gethostent)
-
-ACE_CHECK_HAS_FUNCS(getifaddrs)
-
-ACE_CHECK_HAS_FUNCS(itoa)
-
+dnl Temporarily select C as the test language to work around a bug in
+dnl some versions of Autoconf when C++ is selected as the test
+dnl language.
+AC_LANG_PUSH([C])
 ACE_CHECK_LACKS_FUNCS(qsort)
-
-ACE_CHECK_HAS_FUNCS(strnlen)
-
-ACE_CHECK_LACKS_FUNCS(strchr)
-
-ACE_CHECK_LACKS_FUNCS(strcspn)
-
-ACE_CHECK_LACKS_FUNCS(strerror)
-
-ACE_CHECK_LACKS_FUNCS(strpbrk)
-
-ACE_CHECK_LACKS_FUNCS(strspn)
-
-ACE_CHECK_LACKS_FUNCS(strtod)
-
-ACE_CHECK_LACKS_FUNCS(strtol)
-
-ACE_CHECK_LACKS_FUNCS(strtoul)
-
-ACE_CHECK_LACKS_FUNCS(swab)
+AC_LANG_POP([C])
 
 dnl ACE uses execv, execvp and execve, so we don't bother to check
 dnl for the others (e.g. execl, execlp, execle)
-AC_CHECK_FUNC(execv)
-AC_CHECK_FUNC(execvp)
-AC_CHECK_FUNC(execve)
-if test "$ac_cv_func_execv" != yes &&
-   test "$ac_cv_func_execvp" != yes &&
-   test "$ac_cv_func_execve" != yes; then
-  AC_DEFINE([ACE_LACKS_EXEC])
-fi
+AC_CHECK_FUNCS([execv execvp execve],
+  ,
+  [AC_DEFINE([ACE_LACKS_EXEC])])
+
+ACE_CHECK_LACKS_FUNCS(fgetwc fcntl fsync)
 
 AC_CHECK_FUNC([getmsg],
   [
@@ -3232,9 +3192,9 @@ AC_CHECK_FUNC([getmsg],
 # include <unistd.h>
 #endif  /* !ACE_LACKS_UNISTD_H */
 
-#ifndef ACE_LACKS_SYS_IOCTL_H
+#ifdef ACE_HAS_SYS_IOCTL_H
 # include <sys/ioctl.h>
-#endif  /* ACE_LACKS_SYS_IOCTL_H */
+#endif  /* ACE_HAS_SYS_IOCTL_H */
 
 #ifdef ACE_HAS_STREAMS
 #  include <stropts.h>
@@ -3273,6 +3233,12 @@ main ()
 
 AC_CHECK_FUNC([gethostbyaddr],,)
 
+ACE_CHECK_LACKS_FUNCS(gethostent)
+
+ACE_CHECK_HAS_FUNCS(getifaddrs)
+
+ACE_CHECK_LACKS_FUNCS(difftime)
+
 dnl Check for 64 bit llseek() or lseek64()
 case "$host" in
   *UnixWare7*)
@@ -3460,12 +3426,15 @@ fi
 
 ACE_CHECK_LACKS_FUNCS(fork)
 
-AC_CHECK_FUNC([getrlimit])
-AC_CHECK_FUNC([setrlimit])
-if test "$ac_cv_func_getrlimit" != yes ||
-   test "$ac_cv_func_setrlimit" != yes; then
-  AC_DEFINE([ACE_LACKS_RLIMIT])
-fi
+AC_CHECK_FUNC([getrlimit],
+  [
+   AC_CHECK_FUNC([setrlimit],
+     ,
+     [AC_DEFINE([ACE_LACKS_RLIMIT])])
+  ],
+  [
+   AC_DEFINE([ACE_LACKS_RLIMIT])
+  ])
 
 AC_CHECK_FUNC([sysinfo],
   [
@@ -3480,79 +3449,82 @@ ACE_CHECK_LACKS_FUNCS(lstat readlink rename recvmsg sendmsg)
 
 ACE_CHECK_HAS_FUNCS(getrusage)
 
-ACE_CHECK_LACKS_FUNCS([getpgid])
-if test "$ac_cv_func_getpgid" = yes; then
-  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
-  dnl needed to make the getpgid() prototype visible.
-  ACE_CACHE_CHECK([for getpgid prototype],
-    [ace_cv_lib_has_getpgid_prototype],
-    [
-     ace_save_CPPFLAGS="$CPPFLAGS"
-     ace_no_xopen="-U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
-     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
-     AC_EGREP_HEADER([[^_]+getpgid], [unistd.h],
-       [
-        ace_cv_lib_has_getpgid_prototype=yes
-       ],
-       [
-        ace_cv_lib_has_getpgid_prototype=no
-       ])
-     dnl Reset the compiler flags
-     CPPFLAGS="$ace_save_CPPFLAGS"
-    ],, [AC_DEFINE([ACE_LACKS_GETPGID_PROTOTYPE])])
-  AH_TEMPLATE([ACE_LACKS_GETPGID_PROTOTYPE],
-  [Define to 1 if platform lacks getpgid() declaration in <unistd.h>.])
-fi
+AC_CHECK_FUNC([getpgid],
+  [
+   dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
+   dnl needed to make the getpgid() prototype visible.
+   ACE_CACHE_CHECK([for getpgid prototype],
+     [ace_cv_lib_has_getpgid_prototype],
+     [
+      ace_save_CPPFLAGS="$CPPFLAGS"
+      ace_no_xopen="-U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
+      CPPFLAGS="$CPPFLAGS $ace_no_xopen"
+      AC_EGREP_HEADER([[^_]+getpgid], [unistd.h],
+        [
+         ace_cv_lib_has_getpgid_prototype=yes
+        ],
+        [
+         ace_cv_lib_has_getpgid_prototype=no
+        ])
+      dnl Reset the compiler flags
+      CPPFLAGS="$ace_save_CPPFLAGS"
+     ],, [AC_DEFINE([ACE_LACKS_GETPGID_PROTOTYPE])])
+  ],
+  [
+   AC_DEFINE([ACE_LACKS_GETPGID])
+  ])
 
 ACE_CHECK_LACKS_FUNCS(getppid)
 
-ACE_CHECK_LACKS_FUNCS([setregid])
-if test "$ac_cv_func_setregid" = yes; then
-  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
-  dnl needed to make the setregid() prototype visible.
-  ACE_CACHE_CHECK([for setregid prototype],
-    [ace_cv_lib_has_setregid_prototype],
-    [
-     ace_save_CPPFLAGS="$CPPFLAGS"
-     ace_no_xopen="-U_BSD_SOURCE -U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
-     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
-     AC_EGREP_HEADER([[^_]+setregid], [unistd.h],
-       [
-        ace_cv_lib_has_setregid_prototype=yes
-       ],
-       [
-        ace_cv_lib_has_setregid_prototype=no
-       ])
-     dnl Reset the compiler flags
-     CPPFLAGS="$ace_save_CPPFLAGS"
-    ],, [AC_DEFINE([ACE_LACKS_SETREGID_PROTOTYPE])])
-  AH_TEMPLATE([ACE_LACKS_SETREGID_PROTOTYPE],
-  [Define to 1 if platform lacks setregid() declaration in <unistd.h>.])
-fi
+AC_CHECK_FUNC([setregid],
+  [
+   dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
+   dnl needed to make the setregid() prototype visible.
+   ACE_CACHE_CHECK([for setregid prototype],
+     [ace_cv_lib_has_setregid_prototype],
+     [
+      ace_save_CPPFLAGS="$CPPFLAGS"
+      ace_no_xopen="-U_BSD_SOURCE -U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
+      CPPFLAGS="$CPPFLAGS $ace_no_xopen"
+      AC_EGREP_HEADER([[^_]+setregid], [time.h],
+        [
+         ace_cv_lib_has_setregid_prototype=yes
+        ],
+        [
+         ace_cv_lib_has_setregid_prototype=no
+        ])
+      dnl Reset the compiler flags
+      CPPFLAGS="$ace_save_CPPFLAGS"
+     ],, [AC_DEFINE([ACE_LACKS_SETREGID_PROTOTYPE])])
+  ],
+  [
+   AC_DEFINE([ACE_LACKS_SETREGID])
+  ])
 
-ACE_CHECK_LACKS_FUNCS([setreuid])
-if test "$ac_cv_func_setreuid" = yes; then
-  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
-  dnl needed to make the setreuid() prototype visible.
-  ACE_CACHE_CHECK([for setreuid prototype],
-    [ace_cv_lib_has_setreuid_prototype],
-    [
-     ace_save_CPPFLAGS="$CPPFLAGS"
-     ace_no_xopen="-U_BSD_SOURCE -U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
-     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
-     AC_EGREP_HEADER([[^_]+setreuid], [unistd.h],
-       [
-        ace_cv_lib_has_setreuid_prototype=yes
-       ],
-       [
-        ace_cv_lib_has_setreuid_prototype=no
-       ])
-     dnl Reset the compiler flags
-     CPPFLAGS="$ace_save_CPPFLAGS"
-    ],, [AC_DEFINE([ACE_LACKS_SETREUID_PROTOTYPE])])
-  AH_TEMPLATE([ACE_LACKS_SETREUID_PROTOTYPE],
-  [Define to 1 if platform lacks setreuid() declaration in <unistd.h>.])
-fi
+AC_CHECK_FUNC([setreuid],
+  [
+   dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
+   dnl needed to make the setreuid() prototype visible.
+   ACE_CACHE_CHECK([for setreuid prototype],
+     [ace_cv_lib_has_setreuid_prototype],
+     [
+      ace_save_CPPFLAGS="$CPPFLAGS"
+      ace_no_xopen="-U_BSD_SOURCE -U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
+      CPPFLAGS="$CPPFLAGS $ace_no_xopen"
+      AC_EGREP_HEADER([[^_]+setreuid], [time.h],
+        [
+         ace_cv_lib_has_setreuid_prototype=yes
+        ],
+        [
+         ace_cv_lib_has_setreuid_prototype=no
+        ])
+      dnl Reset the compiler flags
+      CPPFLAGS="$ace_save_CPPFLAGS"
+     ],, [AC_DEFINE([ACE_LACKS_SETREUID_PROTOTYPE])])
+  ],
+  [
+   AC_DEFINE([ACE_LACKS_SETREUID])
+  ])
 
 AC_CHECK_FUNC([getpagesize],
   [AC_DEFINE([ACE_HAS_GETPAGESIZE])],
@@ -3560,7 +3532,12 @@ AC_CHECK_FUNC([getpagesize],
 
 ACE_CHECK_LACKS_FUNCS(msync mprotect mkfifo)
 
-ACE_CHECK_LACKS_FUNCS(mkstemp mktemp)
+dnl Temporarily select C as the test language to work around a bug in
+dnl some versions of Autoconf when C++ is selected as the test
+dnl language.
+AC_LANG_PUSH([C])
+ACE_CHECK_LACKS_FUNCS(mktemp)
+AC_LANG_POP([C])
 
 ACE_CHECK_LACKS_FUNCS(madvise)
 
@@ -3594,9 +3571,7 @@ fi dnl test "$ac_cv_header_sys_priocntl_h" = yes
 dnl FIXME:  How do we check for a working sbrk()?  Do we need to?
 ACE_CHECK_LACKS_FUNCS(sbrk)
 
-ACE_CHECK_HAS_FUNCS(vfwprintf vswprintf)
-
-ACE_CHECK_LACKS_FUNCS(fgetws fputws itow towlower towupper wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcsicmp wcslen wcsncat wcsncmp wcsncpy wcsnicmp wcspbrk wcsrchr wcsspn wcsstr wcstod wcstok wcstol wcstoul)
+ACE_CHECK_LACKS_FUNCS(wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcsicmp wcslen wcsncat wcsncmp wcsncpy wcsnicmp wcspbrk wcsrchr wcsspn wcsstr wcstod wcstok wcstol wcstoul)
 
 if test "$ac_cv_func_wcstok" = yes; then
 dnl The wcstok() function varies with standards. Check which one we have.
@@ -3626,7 +3601,7 @@ dnl Although Darwin/OS X does not implement any of the SysV IPC API,
 dnl its C library contains stubs for all the system calls (probably
 dnl left over from the BSD libc).  This causes false positives from
 dnl AC_CHECK_FUNC which results in configure reporting that SysV IPC
-dnl is supported.  We avoid this problem by avoiding the function
+dnl is supported.  We avoid this problem by avoiding the function 
 dnl checks if the cooresponding headers were not detected earlier.
 dnl
 if test "$ac_cv_header_sys_msg_h" = yes; then
@@ -4292,7 +4267,12 @@ ACE_CHECK_HAS_FUNCS(sigwait)
 
 dnl Check for reentrant functions
 if test "$ace_user_enable_reentrant_funcs" = yes; then
-  AC_CHECK_FUNC([rand_r])
+  dnl Temporarily select C as the test language to work around a bug in
+  dnl some versions of Autoconf when C++ is selected as the test
+  dnl language.
+  AC_LANG_PUSH([C])
+  AC_CHECK_FUNC([rand_r],,)
+  AC_LANG_POP([C])
 
   AC_CHECK_FUNC([strtok_r],
     [
@@ -4322,7 +4302,7 @@ if test "$ace_user_enable_reentrant_funcs" = yes; then
 #ifndef _REENTRANT
 # define _REENTRANT
 #endif
-#ifndef ACE_LACKS_PWD_H
+#ifdef HAVE_PWD_H
 # include <pwd.h>
 #endif
 #ifndef ACE_LACKS_SYS_TYPES_H
@@ -4378,7 +4358,7 @@ dnl    int comparator (const void * d1, const void * d2)
 dnl instead of:
 dnl    int comparator (const dirent ** d1, const dirent ** d2)
 dnl
-dnl ACE_CHECK_HAS_FUNCS([scandir])
+dnl AC_CHECK_FUNC([scandir], [AC_DEFINE([ACE_HAS_SCANDIR])], [])
 
 ACE_CHECK_LACKS_FUNCS(seekdir telldir)
 
@@ -4669,6 +4649,25 @@ dnl converts all warnings to errors, whenever we are compiling with
 dnl G++.
 dnl        -Ossama
 
+ACE_CONVERT_WARNINGS_TO_ERRORS(
+[
+dnl Check if setrlimit() takes a const pointer as 2nd argument
+ACE_CACHE_CHECK([if setrlimit() takes a const pointer as 2nd argument],
+  [ace_cv_lib_posix_setrlimit_const_2],[
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/time.h>
+#include <sys/resource.h>
+      ]], [[
+       const struct rlimit* rlp = 0;
+       setrlimit(RLIMIT_CPU, rlp);
+      ]])],[
+       ace_cv_lib_posix_setrlimit_const_2=yes
+      ],[
+       ace_cv_lib_posix_setrlimit_const_2=no
+      ])
+  ],, [AC_DEFINE([ACE_HAS_BROKEN_SETRLIMIT])])
+]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
+
 dnl Check if getrusage() takes an enum as 1st argument
 ACE_CHECK_GETRUSAGE_ENUM
 
@@ -4708,15 +4707,14 @@ ACE_CACHE_CHECK([if select takes a const fifth argument],
   ], , [AC_DEFINE([ACE_HAS_NONCONST_SELECT_TIMEVAL])])
 ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
 
-
 dnl Only run the following tests if the msghdr structure exists.
 if test "$ace_cv_struct_msghdr" = yes &&
    test "$ac_cv_func_sendmsg" = yes; then
  ACE_CONVERT_WARNINGS_TO_ERRORS(
  [
 dnl Check if sendmsg takes a const 2nd argument
- ACE_CACHE_CHECK([if sendmsg omits const qualifier from the msghdr argument],
-  [ace_cv_lib_nonconst_sendmsg],[
+ ACE_CACHE_CHECK([if sendmsg omits the const from the second argument],
+  [ace_cv_lib_broken_sendmsg],[
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifndef ACE_LACKS_SYS_TYPES_H
 # include <sys/types.h>
@@ -4731,69 +4729,13 @@ dnl Check if sendmsg takes a const 2nd argument
 
        result = (int) sendmsg(s, msg, flags);
       ]])],[
-       ace_cv_lib_nonconst_sendmsg=no
+       ace_cv_lib_broken_sendmsg=no
       ],[
-       ace_cv_lib_nonconst_sendmsg=yes
+       ace_cv_lib_broken_sendmsg=yes
       ])
-   ], [AC_DEFINE([ACE_HAS_NONCONST_SENDMSG])],)
+   ], [AC_DEFINE([ACE_HAS_BROKEN_SENDMSG])],)
  ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
-fi dnl "$ace_cv_struct_msghdr" = yes && $ac_cv_func_sendmsg = yes
-
-
-dnl Only run the following tests if the setrlimit function exists
-if test "$ac_cv_func_setrlimit" = yes; then
- ACE_CONVERT_WARNINGS_TO_ERRORS(
- [
-dnl Check if setrlimit() takes a const pointer as 2nd argument
- ACE_CACHE_CHECK([if setrlimit omits const qualifier from the rlimit argument],
-  [ace_cv_lib_nonconst_setrlimit],[
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <sys/time.h>
-#include <sys/resource.h>
-      ]], [[
-       const struct rlimit* rlp = 0;
-       setrlimit(RLIMIT_CPU, rlp);
-      ]])],[
-       ace_cv_lib_nonconst_setrlimit=no
-      ],[
-       ace_cv_lib_nonconst_setrlimit=yes
-      ])
-   ], [AC_DEFINE([ACE_HAS_NONCONST_SETRLIMIT])])
- ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
-fi dnl "$ac_cv_func_setrlimit" = yes; then
-
-
-dnl Only run the following tests if the readv function exists
-if test "$ac_cv_header_sys_uio_h" = yes &&
-   test "$ac_cv_func_readv" = yes; then
- ACE_CONVERT_WARNINGS_TO_ERRORS(
- [
-dnl Check if readv omits the const from the iovec argument
- ACE_CACHE_CHECK([if readv omits const qualifier from the iovec argument],
-  [ace_cv_lib_nonconst_readv],[
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#ifndef ACE_LACKS_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include <sys/uio.h>
-      ]], [[
-       int filedes = 0;
-       const struct iovec *vector = 0;
-       size_t count = 0;
-
-       int result = 0;
-
-       result = (int) readv(filedes, vector, count);
-      ]])],[
-       ace_cv_lib_nonconst_readv=no
-      ],[
-       ace_cv_lib_nonconst_readv=yes
-      ])
-   ], [AC_DEFINE([ACE_HAS_NONCONST_READV])],)
- ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
-fi dnl $ac_cv_header_sys_uio_h = yes && $ac_cv_func_writev = yes
-
+fi dnl test "$ace_cv_struct_msghdr" = yes
 
 dnl Only run the following tests if the writev function exists
 if test "$ac_cv_header_sys_uio_h" = yes &&
@@ -4801,8 +4743,8 @@ if test "$ac_cv_header_sys_uio_h" = yes &&
  ACE_CONVERT_WARNINGS_TO_ERRORS(
  [
 dnl Check if writev omits the const from the iovec argument
- ACE_CACHE_CHECK([if writev omits const qualifier from the iovec argument],
-  [ace_cv_lib_nonconst_writev],[
+ ACE_CACHE_CHECK([if writev omits the const from the iovec argument],
+  [ace_cv_lib_broken_writev],[
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifndef ACE_LACKS_UNISTD_H
 # include <unistd.h>
@@ -4818,11 +4760,11 @@ dnl Check if writev omits the const from the iovec argument
 
        result = (int) writev(filedes, vector, count);
       ]])],[
-       ace_cv_lib_nonconst_writev=no
+       ace_cv_lib_broken_writev=no
       ],[
-       ace_cv_lib_nonconst_writev=yes
+       ace_cv_lib_broken_writev=yes
       ])
-   ], [AC_DEFINE([ACE_HAS_NONCONST_WRITEV])],)
+   ], [AC_DEFINE([ACE_HAS_BROKEN_WRITEV])],)
  ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
 fi dnl $ac_cv_header_sys_uio_h = yes && $ac_cv_func_writev = yes
 
@@ -5897,7 +5839,7 @@ ACE_CACHE_CHECK([for reentrant function macros],
 # include <sys/time.h>
 #endif
 
-#if !defined (ACE_LACKS_PWD_H)
+#if defined (HAVE_PWD_H)
 # include <pwd.h>
 #endif
 
@@ -6832,8 +6774,6 @@ int main ()
 fi dnl test "$ace_user_enable_threads" = yes
 
 
-AC_CHECK_HEADER(libc.h)
-AC_CHECK_HEADER(osfcn.h)
 if test "$ac_cv_header_libc_h" != yes ||
    test "$ac_cv_header_osfcn_h" != yes; then
   AC_DEFINE([ACE_HAS_CPLUSPLUS_HEADERS])
diff --git a/etc/ace.doxygen b/etc/ace.doxygen
index 67ca357cfa5..2f7e8e3e831 100644
--- a/etc/ace.doxygen
+++ b/etc/ace.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/ace_man.doxygen b/etc/ace_man.doxygen
index 286a1e2d9f1..94c1ae59b68 100644
--- a/etc/ace_man.doxygen
+++ b/etc/ace_man.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = NO
 SOURCE_BROWSER        = NO
 INLINE_SOURCES        = NO
diff --git a/etc/ace_qos.doxygen b/etc/ace_qos.doxygen
index b1e2189c720..1b9f3143592 100644
--- a/etc/ace_qos.doxygen
+++ b/etc/ace_qos.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/ace_rmcast.doxygen b/etc/ace_rmcast.doxygen
index 459c43f1820..ca97723f090 100644
--- a/etc/ace_rmcast.doxygen
+++ b/etc/ace_rmcast.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/ace_ssl.doxygen b/etc/ace_ssl.doxygen
index 1914c8d6883..9a6f70108d6 100644
--- a/etc/ace_ssl.doxygen
+++ b/etc/ace_ssl.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/acexml.doxygen b/etc/acexml.doxygen
index 4cdfe131ce6..e4465dc79e9 100644
--- a/etc/acexml.doxygen
+++ b/etc/acexml.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/ciao.doxygen b/etc/ciao.doxygen
index 57fc2ca49ff..2de4ed61d57 100644
--- a/etc/ciao.doxygen
+++ b/etc/ciao.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/ciao_assembly_deployer.doxygen b/etc/ciao_assembly_deployer.doxygen
index 5b7550271af..10276018aa7 100644
--- a/etc/ciao_assembly_deployer.doxygen
+++ b/etc/ciao_assembly_deployer.doxygen
@@ -17,7 +17,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/ciao_componentserver.doxygen b/etc/ciao_componentserver.doxygen
index cbf1580e329..b3f15f6d745 100644
--- a/etc/ciao_componentserver.doxygen
+++ b/etc/ciao_componentserver.doxygen
@@ -17,7 +17,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/ciao_daemon.doxygen b/etc/ciao_daemon.doxygen
index 3b8693e0d00..a5f583c5ed5 100644
--- a/etc/ciao_daemon.doxygen
+++ b/etc/ciao_daemon.doxygen
@@ -17,7 +17,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/ciao_serveractivator.doxygen b/etc/ciao_serveractivator.doxygen
index b75344df177..157e1195113 100644
--- a/etc/ciao_serveractivator.doxygen
+++ b/etc/ciao_serveractivator.doxygen
@@ -17,7 +17,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/ciao_xml_helpers.doxygen b/etc/ciao_xml_helpers.doxygen
index 55fd145e607..0d8dd1b2b42 100644
--- a/etc/ciao_xml_helpers.doxygen
+++ b/etc/ciao_xml_helpers.doxygen
@@ -17,7 +17,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao.doxygen b/etc/tao.doxygen
index a1b094b5be6..61cf117db77 100644
--- a/etc/tao.doxygen
+++ b/etc/tao.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_av.doxygen b/etc/tao_av.doxygen
index 55bd43a7090..bd9d2ff6715 100644
--- a/etc/tao_av.doxygen
+++ b/etc/tao_av.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_cosevent.doxygen b/etc/tao_cosevent.doxygen
index b5221c38d5a..d7a1fbfea8d 100644
--- a/etc/tao_cosevent.doxygen
+++ b/etc/tao_cosevent.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_cosnaming.doxygen b/etc/tao_cosnaming.doxygen
index e37dc985d3a..ea88e888bbe 100644
--- a/etc/tao_cosnaming.doxygen
+++ b/etc/tao_cosnaming.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_cosnotification.doxygen b/etc/tao_cosnotification.doxygen
index 825abb9e60c..3741e3da0fd 100644
--- a/etc/tao_cosnotification.doxygen
+++ b/etc/tao_cosnotification.doxygen
@@ -15,10 +15,10 @@ HIDE_UNDOC_MEMBERS    = NO
 HIDE_UNDOC_CLASSES    = NO
 BRIEF_MEMBER_DESC     = YES
 REPEAT_BRIEF          = YES
-INTERNAL_DOCS         = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_costime.doxygen b/etc/tao_costime.doxygen
index 392c1bcb6d4..c1342d6923b 100644
--- a/etc/tao_costime.doxygen
+++ b/etc/tao_costime.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_costrader.doxygen b/etc/tao_costrader.doxygen
index 6a7af78162e..dfa200c6769 100644
--- a/etc/tao_costrader.doxygen
+++ b/etc/tao_costrader.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_dynamicany.doxygen b/etc/tao_dynamicany.doxygen
index 1242141103b..823459e053c 100644
--- a/etc/tao_dynamicany.doxygen
+++ b/etc/tao_dynamicany.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_dynamicinterface.doxygen b/etc/tao_dynamicinterface.doxygen
index 6249d6c5913..be2459e9a00 100644
--- a/etc/tao_dynamicinterface.doxygen
+++ b/etc/tao_dynamicinterface.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_esf.doxygen b/etc/tao_esf.doxygen
index 767f6bcb293..4f6ed48accf 100644
--- a/etc/tao_esf.doxygen
+++ b/etc/tao_esf.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_ifr.doxygen b/etc/tao_ifr.doxygen
index 8e7f91df830..f2aaeebbe8f 100644
--- a/etc/tao_ifr.doxygen
+++ b/etc/tao_ifr.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_implrepo.doxygen b/etc/tao_implrepo.doxygen
index abef8c6f381..38ab071004f 100644
--- a/etc/tao_implrepo.doxygen
+++ b/etc/tao_implrepo.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_iormanip.doxygen b/etc/tao_iormanip.doxygen
index ceb37a681ea..0f4764faef5 100644
--- a/etc/tao_iormanip.doxygen
+++ b/etc/tao_iormanip.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_iortable.doxygen b/etc/tao_iortable.doxygen
index 3ae785b6abc..fee2c30a8de 100644
--- a/etc/tao_iortable.doxygen
+++ b/etc/tao_iortable.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_portablegroup.doxygen b/etc/tao_portablegroup.doxygen
index e43483a91d0..d323a7faa26 100644
--- a/etc/tao_portablegroup.doxygen
+++ b/etc/tao_portablegroup.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_portableserver.doxygen b/etc/tao_portableserver.doxygen
index 552f4de6d1c..777f41a9946 100644
--- a/etc/tao_portableserver.doxygen
+++ b/etc/tao_portableserver.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_pss.doxygen b/etc/tao_pss.doxygen
index 26e69b5387f..fece409b601 100644
--- a/etc/tao_pss.doxygen
+++ b/etc/tao_pss.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_rtcorba.doxygen b/etc/tao_rtcorba.doxygen
index e28699ebea5..82aad5b90a4 100644
--- a/etc/tao_rtcorba.doxygen
+++ b/etc/tao_rtcorba.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_rtevent.doxygen b/etc/tao_rtevent.doxygen
index c7bb0bc3b8b..59c199c152a 100644
--- a/etc/tao_rtevent.doxygen
+++ b/etc/tao_rtevent.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_rtportableserver.doxygen b/etc/tao_rtportableserver.doxygen
index c92a6f6b57b..383624868b6 100644
--- a/etc/tao_rtportableserver.doxygen
+++ b/etc/tao_rtportableserver.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_security.doxygen b/etc/tao_security.doxygen
index fa14a015d52..d83e8679d3c 100644
--- a/etc/tao_security.doxygen
+++ b/etc/tao_security.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_smartproxies.doxygen b/etc/tao_smartproxies.doxygen
index 3c56862a1bc..861c00507db 100644
--- a/etc/tao_smartproxies.doxygen
+++ b/etc/tao_smartproxies.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_ssliop.doxygen b/etc/tao_ssliop.doxygen
index 1563a5e34d7..1e99cda18d8 100644
--- a/etc/tao_ssliop.doxygen
+++ b/etc/tao_ssliop.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/etc/tao_strategies.doxygen b/etc/tao_strategies.doxygen
index 92386ba148a..e787f770c12 100644
--- a/etc/tao_strategies.doxygen
+++ b/etc/tao_strategies.doxygen
@@ -18,7 +18,7 @@ REPEAT_BRIEF          = YES
 ALWAYS_DETAILED_SEC   = NO
 FULL_PATH_NAMES       = NO
 STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
+INTERNAL_DOCS         = NO
 CLASS_DIAGRAMS        = YES
 SOURCE_BROWSER        = YES
 INLINE_SOURCES        = YES
diff --git a/examples/APG/Processes/Spawn.cpp b/examples/APG/Processes/Spawn.cpp
index b7b51bde7d2..b3323ccfb8d 100644
--- a/examples/APG/Processes/Spawn.cpp
+++ b/examples/APG/Processes/Spawn.cpp
@@ -27,7 +27,7 @@ public:
     // Spawn the new process; prepare() hook is called first.
     ACE_Process_Options options;
     pid_t pid = this->spawn (options);
-    if (pid == ACE_INVALID_PID)
+    if (pid == -1)
       ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT ("%p\n"),
                         ACE_TEXT ("spawn")), -1);
 
diff --git a/examples/APG/Signals/SigAction.cpp b/examples/APG/Signals/SigAction.cpp
index b9d96c6b702..ccb484f7478 100644
--- a/examples/APG/Signals/SigAction.cpp
+++ b/examples/APG/Signals/SigAction.cpp
@@ -33,7 +33,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 1
 #if defined (ACE_HAS_SIG_C_FUNC)
-extern "C" {
+extern "C"
 #endif
 // Listing 3 code/ch11
 static void my_sighandler (int signo)
@@ -49,9 +49,6 @@ static void my_sighandler (int signo)
 
   ACE_OS::sleep (10);
 }
-#if defined (ACE_HAS_SIG_C_FUNC)
-}
-#endif
 // Listing 3
 // Listing 2 code/ch11
 static void register_actions ()
diff --git a/examples/DLL/test_dll.cpp b/examples/DLL/test_dll.cpp
index fce379da943..a0073158a2e 100644
--- a/examples/DLL/test_dll.cpp
+++ b/examples/DLL/test_dll.cpp
@@ -13,14 +13,14 @@ ACE_RCSID(DLL, test_dll, "$Id$")
 typedef Magazine* (*Magazine_Creator) (void);
 
 int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+main (int argc, char *argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
 
   ACE_DLL dll;
 
-  int retval = dll.open (ACE_TEXT("./") ACE_DLL_PREFIX ACE_TEXT("Today"));
+  int retval = dll.open ("./" ACE_DLL_PREFIX "Today");
 
   if (retval != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -29,7 +29,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                       -1);
   Magazine_Creator mc;
 
-  mc = (Magazine_Creator) dll.symbol (ACE_TEXT("create_magazine"));
+  mc = (Magazine_Creator) dll.symbol ("create_magazine");
 
   if (mc == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -46,7 +46,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   // The other library is now loaded on demand.
 
-  retval = dll.open (ACE_TEXT("./") ACE_DLL_PREFIX ACE_TEXT("Newsweek"));
+  retval = dll.open ("./" ACE_DLL_PREFIX "Newsweek");
 
   if (retval != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -54,7 +54,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                        "dll.open"),
                       -1);
 
-  mc = (Magazine_Creator) dll.symbol (ACE_TEXT("create_magazine"));
+  mc = (Magazine_Creator) dll.symbol ("create_magazine");
 
   if (mc == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/examples/Export/test.cpp b/examples/Export/test.cpp
index e447dbec3f5..69fe20158bf 100644
--- a/examples/Export/test.cpp
+++ b/examples/Export/test.cpp
@@ -3,8 +3,8 @@
 #include "dll.h"
 #include <iostream>
 
-int
-ACE_TMAIN (int, ACE_TCHAR *[])
+int 
+main (int, char *[])
 {
   int failure_count = 0;
   test_class my_test_class;
@@ -24,7 +24,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 
   // Test out the export of a function.  Like above,
   // I don't know how this can fail at runtime.
-
+  
   std::cout << "Function Test: ";
   if (test_function () != RETVAL)
     {
diff --git a/examples/IOStream/server/iostream_server.cpp b/examples/IOStream/server/iostream_server.cpp
index fa80036a3ab..bd54098ac2d 100644
--- a/examples/IOStream/server/iostream_server.cpp
+++ b/examples/IOStream/server/iostream_server.cpp
@@ -10,7 +10,6 @@
 #include "ace/Signal.h"
 
 #include "iostream_server.h"
-#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(server, iostream_server, "$Id$")
 
diff --git a/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc b/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
index d648c60da40..ca6b8ee6622 100644
--- a/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
+++ b/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
@@ -2,5 +2,4 @@
 // $Id$
 
 project : aceexe {
-  exename = file-reverse
 }
 \ No newline at end of file
diff --git a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
index 0ef3b353248..4005b40a25a 100644
--- a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
+++ b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(QOS, QoS_Util,"$Id$")
 
 // constructor.
 QoS_Util::QoS_Util (int argc,
-                    ACE_TCHAR *argv[])
+                    char *argv[])
   : argc_ (argc),
     argv_ (argv),
     source_port_ (SENDER_PORT),
@@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void)
 int
 QoS_Util::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "m:n:p:P:c");
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -50,10 +50,10 @@ QoS_Util::parse_args (void)
         this->dest_addr_->set (get_opts.opt_arg ());
         break;
       case 'p': // protocol.
-        if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("tcp")) == 0)
+        if (ACE_OS::strcasecmp (get_opts.opt_arg (), "tcp") == 0)
           this->protocol_ = IPPROTO_TCP;
         else
-          if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("udp")) == 0)
+          if (ACE_OS::strcasecmp (get_opts.opt_arg (), "udp") == 0)
             this->protocol_ = IPPROTO_UDP;
           else
             ACE_DEBUG ((LM_DEBUG,
diff --git a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h
index ae347de68f6..6de6e2d24d3 100644
--- a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h
+++ b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h
@@ -22,21 +22,21 @@
 
 class QoS_Util
 {
-  // = TITLE
-  //     This class provides the utility functions like parse_args ()
+  // = TITLE 
+  //     This class provides the utility functions like parse_args () 
   //     required by a QoS enabled application.
 
 public:
 
   // constructor.
-  QoS_Util (int argc, ACE_TCHAR *argv[]);
+  QoS_Util (int argc, char *argv[]);
 
   // destructor.
   ~QoS_Util (void);
 
   // Parse command-line arguments.
   int parse_args (void);
-
+  
   // GET methods.
   ACE_INET_Addr *mult_session_addr (void) const;
 
@@ -52,7 +52,7 @@ private:
 
   // Command line arguments.
   int argc_;
-  ACE_TCHAR **argv_;
+  char **argv_;
 
   // Multicast session address.
   ACE_INET_Addr *mult_session_addr_;
diff --git a/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp b/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp
index 8ef43514e9b..abeda6cd58e 100644
--- a/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp
+++ b/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp
@@ -25,7 +25,7 @@
 #include "Fill_ACE_QoS.h"
 #include "QoS_Signal_Handler.h"
 #include "Receiver_QoS_Event_Handler.h"
-
+    
 // To open QOS sockets administrative access is required on the
 // machine.  Fill in default values for QoS structure.  The default
 // values were simply choosen from existing QOS templates available
@@ -42,7 +42,7 @@
 
 int
 FillQoSParams (ACE_QoS_Params &qos_params,
-               iovec* iov,
+               iovec* iov, 
                ACE_QoS* qos)
 {
   qos_params.callee_data (iov);
@@ -55,8 +55,8 @@ FillQoSParams (ACE_QoS_Params &qos_params,
 }
 
 int
-ACE_TMAIN (int argc, ACE_TCHAR * argv[])
-{
+main (int argc, char * argv[])
+{  
 
   QoS_Util qos_util(argc, argv);
 
@@ -87,7 +87,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[])
                                                             25,
                                                             1)))
          {
-         case 1 :
+         case 1 : 
            ACE_ERROR_RETURN ((LM_ERROR,
                               "Unable to bind the new flow spec\n"
                               "The Flow Spec name already exists\n"),
@@ -99,7 +99,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[])
                              -1);
            break;
          }
-
+    
        ACE_DEBUG ((LM_DEBUG,
                    "g_711 Flow Spec bound successfully\n"));
 
@@ -116,12 +116,12 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 
       // Opening a new Multicast Datagram.
       ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos;
-
+      
       // Multicast Session Address specified by user at command line.
-      // If this address is not specified,
-      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed.
+      // If this address is not specified, 
+      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed. 
       ACE_INET_Addr mult_addr (*(qos_util.mult_session_addr ()));
-
+      
       // Fill the ACE_QoS_Params to be passed to the <ACE_OS::join_leaf>
       // through subscribe.
 
@@ -132,7 +132,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[])
       ACE_QoS_Session_Factory session_factory;
 
       // Ask the factory to create a QoS session.
-      ACE_QoS_Session *qos_session =
+      ACE_QoS_Session *qos_session = 
         session_factory.create_session ();
 
       // Create a destination address for the QoS session. The same
@@ -167,7 +167,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[])
       // subscribe call will fail. A more abstract version of
       // subscribe will be added that constrains the various features
       // of GQoS like different flags etc.
-
+      
       if (dgram_mcast_qos.subscribe (mult_addr,
                                      qos_params,
                                      1,
@@ -177,8 +177,8 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[])
                                      0,
                                      0, // ACE_Protocol_Info,
                                      0,
-                                     ACE_OVERLAPPED_SOCKET_FLAG
-                                     | ACE_FLAG_MULTIPOINT_C_LEAF
+                                     ACE_OVERLAPPED_SOCKET_FLAG 
+                                     | ACE_FLAG_MULTIPOINT_C_LEAF 
                                      | ACE_FLAG_MULTIPOINT_D_LEAF,
                                      qos_session) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -191,7 +191,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[])
       int nIP_TTL = 25;
       char achInBuf [BUFSIZ];
       u_long dwBytes;
-
+  
       // Should this be abstracted into QoS objects ?? Doesnt seem to have
       // to do anything directly with QoS.
       if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket.
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
index 3985f9369a2..9753fd4a2ca 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
@@ -15,7 +15,7 @@ Handle_L_Pipe::upper_case (char s[], int n)
 {
   while (--n >= 0)
     if (ACE_OS::ace_islower (s[n]))
-      s[n] = ACE_OS::ace_toupper (s[n]);
+      s[n] = ACE_OS::to_upper (s[n]);
 
   return s;
 } 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
index 95553833e72..07373da7ef7 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
@@ -5,7 +5,7 @@
 ACE_RCSID(server, Handle_R_Stream, "$Id$")
 
 #if defined (SunOS4)
-extern "C"
+extern "C" 
 {
   int init (void);
   int fini (void);
@@ -13,14 +13,14 @@ extern "C"
   void __std__Handle_R_Stream_C_recv_n_();
 }
 
-int
+int 
 init (void)
 {
   __sti__Handle_R_Stream_C_recv_n_();
   return 0;
 }
 
-int
+int 
 fini (void)
 {
   __std__Handle_R_Stream_C_recv_n_();
@@ -28,7 +28,7 @@ fini (void)
 }
 #endif /* SunOS4 */
 
-// Static variables.
+// Static variables. 
 
 u_short Handle_R_Stream::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT;
 char *Handle_R_Stream::login_name  = 0;
@@ -39,4 +39,4 @@ char Handle_R_Stream::login[ACE_MAX_USERID];
 #endif /* __ACE_INLINE__ */
 
 Handle_R_Stream	    remote_stream;
-ACE_Service_Object_Type rs (&remote_stream, ACE_TEXT("Remote_Stream"));
+ACE_Service_Object_Type rs (&remote_stream, "Remote_Stream");
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
index d49d10ae4a5..2b7978cbff2 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
@@ -24,8 +24,8 @@ class ACE_Svc_Export Handle_R_Stream : public ACE_Service_Object, public ACE_SOC
 {
 public:
   Handle_R_Stream (void);
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-  virtual int info (ACE_TCHAR **, size_t) const;
+  virtual int init (int argc, char *argv[]);
+  virtual int info (char **, size_t) const;
   virtual int fini (void);
 
 private:
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
index f126cd13aee..8f8912c8f63 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
@@ -27,19 +27,19 @@ Handle_R_Stream::open (const ACE_INET_Addr &sia, int async)
 }
 
 ACE_INLINE int
-Handle_R_Stream::info (ACE_TCHAR **strp, size_t length) const
+Handle_R_Stream::info (char **strp, size_t length) const
 {
-  ACE_TCHAR buf[BUFSIZ];
+  char buf[BUFSIZ];
   ACE_INET_Addr sa;
 
   if (this->get_local_addr (sa) == -1)
     return -1;
 
   ACE_OS::sprintf (buf,
-                   ACE_TEXT("%d/%s %s"),
+                   "%d/%s %s",
                    sa.get_port_number (),
-                   ACE_TEXT("tcp"),
-                   ACE_TEXT("# tests remote stream\n"));
+                   "tcp",
+                   "# tests remote stream\n");
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -49,10 +49,10 @@ Handle_R_Stream::info (ACE_TCHAR **strp, size_t length) const
 }
 
 ACE_INLINE int
-Handle_R_Stream::init (int argc, ACE_TCHAR *argv[])
+Handle_R_Stream::init (int argc, char *argv[])
 {
   ACE_INET_Addr sis (Handle_R_Stream::DEFAULT_PORT);
-  ACE_Get_Opt   get_opt (argc, argv, ACE_TEXT("p:"), 0);
+  ACE_Get_Opt   get_opt (argc, argv, "p:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
index ed914792c3e..8083f372b42 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -40,17 +40,17 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::Handle_Thr_Acceptor (void)
 }
 
 template <class SVH, PR_AC_1> int
-Handle_Thr_Acceptor<SVH, PR_AC_2>::info (ACE_TCHAR **strp,
+Handle_Thr_Acceptor<SVH, PR_AC_2>::info (char **strp,
 					size_t length) const
 {
-  ACE_TCHAR buf[BUFSIZ];
+  char buf[BUFSIZ];
   ACE_INET_Addr sa;
 
   if (this->acceptor ().get_local_addr (sa) == -1)
     return -1;
 
-  ACE_OS::sprintf (buf, ACE_TEXT("%d/%s %s"), sa.get_port_number (), ACE_TEXT("tcp"),
-       ACE_TEXT("# tests threaded remote stream\n"));
+  ACE_OS::sprintf (buf, "%d/%s %s", sa.get_port_number (), "tcp",
+	     "# tests threaded remote stream\n");
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -60,12 +60,12 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::info (ACE_TCHAR **strp,
 }
 
 template <class SVH, PR_AC_1> int
-Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
+Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, char *argv[])
 {
   ACE_INET_Addr local_addr (ACE_DEFAULT_THR_PORT);
   int n_threads = ACE_DEFAULT_THREADS;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:t:"), 0);
+  ACE_Get_Opt get_opt (argc, argv, "p:t:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
@@ -192,7 +192,7 @@ typedef Handle_Thr_Acceptor<CLI_STREAM, THR_ACCEPTOR> HANDLE_THR_ACCEPTOR;
 
 // Service object.
 HANDLE_THR_ACCEPTOR remote_thr_stream;
-ACE_Service_Object_Type rts (&remote_thr_stream, ACE_TEXT("Remote_Thr_Stream"));
+ACE_Service_Object_Type rts (&remote_thr_stream, "Remote_Thr_Stream");
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Acceptor<CLI_STREAM, THR_ACCEPTOR>;
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
index 7b98b361869..da61b0357e4 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
@@ -27,8 +27,8 @@ public:
   ~Handle_Thr_Acceptor (void);
 
   // = Dynamic linking hooks.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-  virtual int info (ACE_TCHAR **, size_t) const;
+  virtual int init (int argc, char *argv[]);
+  virtual int info (char **, size_t) const;
   virtual int fini (void);
 
 private:
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
index 9eccf88ef43..74081e1581e 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
@@ -5,7 +5,7 @@
 ACE_RCSID(server, Handle_Timeout, "$Id$")
 
 #if defined (SunOS4)
-extern "C"
+extern "C" 
 {
   int init (void);
   int fini (void);
@@ -13,14 +13,14 @@ extern "C"
   void __std__Handle_Timeout_C_init_();
 }
 
-int
+int 
 init (void)
 {
   __sti__Handle_Timeout_C_init_();
   return 0;
 }
 
-int
+int 
 fini (void)
 {
   __std__Handle_Timeout_C_init_();
@@ -33,4 +33,4 @@ fini (void)
 #endif /* __ACE_INLINE__ */
 
 Handle_Timeout timer_1;
-ACE_Service_Object_Type t1 (&timer_1, ACE_TEXT("Timer_1"));
+ACE_Service_Object_Type t1 (&timer_1, "Timer_1");
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
index 8f30199b480..1e3c82960fe 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
@@ -21,8 +21,8 @@ class ACE_Svc_Export Handle_Timeout : public ACE_Service_Object
 {
 public:
   Handle_Timeout (void);
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-  virtual int info (ACE_TCHAR **, size_t) const;
+  virtual int init (int argc, char *argv[]);
+  virtual int info (char **, size_t) const;
   virtual int fini (void);
 
 private:
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
index fbea27d826c..efad9dd62b3 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
@@ -12,11 +12,11 @@ Handle_Timeout::Handle_Timeout (void): count (0)
 }
 
 ACE_INLINE int
-Handle_Timeout::info (ACE_TCHAR **strp, size_t length) const
+Handle_Timeout::info (char **strp, size_t length) const
 {
-  ACE_TCHAR buf[BUFSIZ];
+  char buf[BUFSIZ];
 
-  ACE_OS::sprintf (buf, ACE_TEXT("%s"), ACE_TEXT("# tests timeout facility\n"));
+  ACE_OS::sprintf (buf, "%s", "# tests timeout facility\n");
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -26,11 +26,11 @@ Handle_Timeout::info (ACE_TCHAR **strp, size_t length) const
 }
 
 ACE_INLINE int
-Handle_Timeout::init (int argc, ACE_TCHAR *argv[])
+Handle_Timeout::init (int argc, char *argv[])
 {
   ACE_Time_Value delta (10);
   ACE_Time_Value interval (1);
-  ACE_Get_Opt    get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0);
+  ACE_Get_Opt    get_opt (argc, argv, "a:d:i:", 0);
   int        arg = 0;
 
   for (int c; (c = get_opt ()) != -1; )
diff --git a/examples/Threads/cancel.cpp b/examples/Threads/cancel.cpp
index f10bb822580..4f3cabb73a9 100644
--- a/examples/Threads/cancel.cpp
+++ b/examples/Threads/cancel.cpp
@@ -13,15 +13,9 @@ ACE_RCSID(Threads, cancel, "$Id$")
 #if defined (ACE_HAS_THREADS)
 
 static void *
-#if ACE_SIZEOF_VOID_P==8 && ACE_SIZEOF_INT<ACE_SIZEOF_VOID_P
-worker (long iterations)
-{
-  for (long i = 0; i < iterations; i++)
-#else
 worker (int iterations)
 {
   for (int i = 0; i < iterations; i++)
-#endif
     {
       if ((i % 10) == 0
 		  && (ACE_Thread_Manager::instance ()->testcancel (ACE_Thread::self ()) != 0))
@@ -45,11 +39,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   daemon.open (argv[0]);
 
   int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
-#if ACE_SIZEOF_VOID_P==8 && ACE_SIZEOF_INT<ACE_SIZEOF_VOID_P
-  long n_iterations = (long)( argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS );
-#else
   int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-#endif
 
   ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
 
diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU
index 39884825b0d..4044c2b83c1 100644
--- a/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/include/makeinclude/platform_gnuwin32_common.GNU
@@ -55,11 +55,7 @@ CC      = gcc
 CXX     = g++
 RC      = windres
 
-ifeq (3.4,$(findstring 3.4,$(GNUWIN32_CXX_VERSION)))
-  MODEL_FLAGS += -mtune=$(TCPU)
-else
-  MODEL_FLAGS += -mcpu=$(TCPU)
-endif
+MODEL_FLAGS += -mcpu=$(TCPU)
 
 CFLAGS  += -W -Wall -Wpointer-arith
 ifeq ($(threads),1)
@@ -99,7 +95,7 @@ SHLIBBUILD = \
   && mv $(VSHDIR)/$@.def $(VSHDIR)/$@.def.old \
   && sed 's/;.*$$//g' < $(VSHDIR)/$@.def.old > $(VSHDIR)/$@.def \
   && $(SOLINK.cc) -Wl,--enable-auto-image-base -Wl,--out-implib,$@.a \
-    -shared -o $@ $(LDFLAGS) -Wl,$(VSHDIR)/$@.def \
+    -shared -o $@ $(LDFLAGS) $(VSHDIR)/$@.def \
     $(VSHOBJS1) $(ACE_SHLIBS) $(LIBS)
 
 ifneq ($(GNUWIN32_DLL_ALLOW_EXECP), 1)
@@ -111,7 +107,7 @@ endif
 
 PRELIB  = @true
 
-# Test for template instantiation, add to SOFLAGS if SONAME set,
+# Test for template instantiation, add to SOFLAGS if SONAME set, 
 # add -E to LDFLAGS if using GNU ld
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 026de1cb662..4a1031b8b61 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -39,25 +39,21 @@ endif
 
 # First, extract the OS version number.
 HPVERS_WORDS := $(subst ., ,$(shell uname -r))
-HPMODEL := $(shell uname -m))
 HPUX_VERS	:= $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
 #
 CC		= /bin/cc
 CXX		= aCC
 
-# Determine compiler version
-CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1))
-CXXMINORVERS := $(word 8, $(CXXVERS_WORDS))
-CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS))
-
 ifeq (,$(stdcpplib))
 # If the user didn't explicitly set stdcpplib, assume that the compiler
 # can do -AA, unless it's a .2x version (e.g., 03.24). 03.27 can do -AA,
 # so check for that one explicitly and enable it if so.
-  ifeq (,$(filter 2%,$(CXXMINORVERS)))
+  CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1))
+  CXXVERS := $(word 8, $(CXXVERS_WORDS))
+  ifeq (,$(filter 2%,$(CXXVERS)))
     stdcpplib = 1
   else
-    ifeq (27,$(CXXMINORVERS))
+    ifeq (27,$(CXXVERS))
       stdcpplib = 1
     else
       stdcpplib = 0
@@ -67,22 +63,15 @@ endif
 
 ifeq (1,$(stdcpplib))
   CCFLAGS += -AA
-  ifeq (03,$(CXXMAJORVERS))
-    # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP
-    # as support call 3201224717. (Steve Huston, 23-Nov-2002)
-    CCFLAGS += +W930
-  endif
+  # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP
+  # as support call 3201224717. (Steve Huston, 23-Nov-2002)
+  CCFLAGS += +W930
 # Compile errors using -AA and +noeh together - HP problem report
 # JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001.
 # If you still have problems with this area, uncomment the following line:
 #  exceptions = 1
 endif
 
-ifeq (05,$(CXXMAJORVERS))
-  # Warnings about binary incompatiblity
-  CCFLAGS += +W1016,1031
-endif
-
 # Set the appropriate preprocessor defs for threading based on OS version
 # and specified compiler options.
 ifeq ($(threads),1)
@@ -108,14 +97,8 @@ else
   endif
 endif
 
-ifeq ($(HPMODEL), ia64)
-  itanium = 1
-endif
-
-ifeq (03,$(CXXMAJORVERS))
-  # Suppress Warning 302 ((...) parameter list is a non-portable feature)
-  CCFLAGS                += +W302
-endif
+# Suppress warning 302 ((...) parameter list is a non-portable feature)
+CCFLAGS		+= +W302
 CPPFLAGS	+= $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE
 
 # If exception support is explicitly disabled, tell the compiler.
@@ -143,7 +126,7 @@ AR              = /usr/ccs/bin/ar
 ARFLAGS		= ruv
 RANLIB		= echo
 LDFLAGS		= -Wl,+s -z
-SOFLAGS		+= -b
+SOFLAGS		+= -b 
 
 ifeq ($(distrib),1)
 
@@ -163,29 +146,18 @@ endif
 SOEXT		= sl
 
 ifeq ($(buildbits),32)
-  ifeq ($(itanium),1)
-    CCFLAGS += +DD32
-  else
-    CCFLAGS += +DA1.1 +DS1.1
-  endif
+CCFLAGS		+= +DA1.1 +DS1.1
 else
 ifeq ($(buildbits),64)
-  ifeq ($(itanium),1)
-    CCFLAGS += +DD64
+  ifeq ($(word 2,$(HPVERS_WORDS)), 11)
+    ## Without the W, it isn't really a 64-bit build
+    CCFLAGS     += +DA2.0W +DS2.0W
   else
-    ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-      ## Without the W, it isn't really a 64-bit build
-      CCFLAGS += +DA2.0W +DS2.0W
-    else
-      CCFLAGS += +DA2.0 +DS2.0
-    endif
+    CCFLAGS     += +DA2.0 +DS2.0
   endif
 LDFLAGS		+= -Wl,+vnocompatwarnings
 else
-  ifneq ($(itanium),1)
-    # HP aCC on Itanium doesn't support this option, defaults to 32bit then.
-    CCFLAGS += +DAportable
-  endif
+CCFLAGS         += +DAportable
 endif
 endif
 
diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU
index 1f9e1e2207a..7073cce4c48 100644
--- a/include/makeinclude/platform_hpux_gcc.GNU
+++ b/include/makeinclude/platform_hpux_gcc.GNU
@@ -95,7 +95,7 @@ else
 
 endif
 
-# Test for template instantiation, add to SOFLAGS if versioned_so set,
+# Test for template instantiation, add to SOFLAGS if versioned_so set, 
 # add -E to LDFLAGS if using GNU ld
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index cbc26622554..c8dd8c8c201 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -47,7 +47,7 @@ PLATFORM_WX_LIBS    = $(shell wx-config --libs)     $(PLATFORM_GTK_LIBS)
 PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags)  $(PLATFORM_GTK_LDFLAGS)
 
 PLATFORM_AIO_SUPPORT := \
-       $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_HAS_AIO_CALLS)
+       $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
 
 ssl ?= 0
 ifeq ($(ssl),1)
@@ -94,8 +94,7 @@ LIBS    += -ldl
 ifeq ($(threads),1)
   LIBS += -lpthread
 endif
-# look for the rt library in the usual places
-LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt)
+LIBS += $(shell test -e /usr/lib/librt.so && echo -lrt)
 
 PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include
 PLATFORM_QT_LIBS=-lqt
diff --git a/include/makeinclude/platform_linux_icc.GNU b/include/makeinclude/platform_linux_icc.GNU
index df8ee77e647..2709f2f616f 100644
--- a/include/makeinclude/platform_linux_icc.GNU
+++ b/include/makeinclude/platform_linux_icc.GNU
@@ -52,25 +52,26 @@ PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags)  $(PLATFORM_GTK_LDFLAGS)
 PLATFORM_AIO_SUPPORT := \
        $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
 
+#
+# Intel compiler comes in two flavors with different binaries. The first, 
+# icc, is for IA32 platforms and the second, ecc, is for IA64 platforms. 
+# They share most options except those influencing target machine code 
+# generation, therefore we should pick sensible defaults for both
+# depending on system architecture.
+#
 SYSARCH := $(shell uname -m)
 
 ifeq ($(insure),1)
-  CC  = insure
-  CXX = insure
+CC  = insure
+CXX = insure
 else
-  CC  = icc
-  CXX = icc
-endif
-
-ifndef CXX_VERSION
-  CXX_VERSION := $(shell $(CXX) --version)
-endif
-
-ifeq (8.0,$(findstring 8.0,$(CXX_VERSION)))
-  CFLAGS += -wd1476,1505
-endif
-ifeq (8.1,$(findstring 8.1,$(CXX_VERSION)))
-  CFLAGS += -wd1476,1505 -no-gcc
+  ifeq ($(SYSARCH),ia64)
+    CC  = ecc
+    CXX = ecc
+  else
+    CC  = icc
+    CXX = icc
+  endif
 endif
 
 CFLAGS  += -w1
@@ -78,6 +79,7 @@ ifeq ($(threads),1)
     CPPFLAGS  += -D_REENTRANT $(PLATFORM_AIO_SUPPORT)
 endif # threads
 
+
 CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG) -ip
 DCFLAGS += -g
 DLD     = $(CXX)
diff --git a/include/makeinclude/platform_netbsd.GNU b/include/makeinclude/platform_netbsd.GNU
index 2ee9697cabd..f847b5e03d2 100644
--- a/include/makeinclude/platform_netbsd.GNU
+++ b/include/makeinclude/platform_netbsd.GNU
@@ -2,54 +2,33 @@
 
 # platform_netbsd.GNU
 
-versioned_so = 1
-
-ifndef exceptions
-  exceptions = 1
-endif
-
-ifeq (,$(debug))
-  debug = 1
-endif
-
-ifeq (,$(optimize))
-  optimize = 1
-endif
-
-ifeq (,$(threads))
-  threads = 1
-endif
+# ***** Notice: This file is still under testing. *****
+# To be used on netbsd platform without pthread support.
 
-pipes ?= 1
+debug = 1
+optimize = 1
+versioned_so = 1
 
 CC              = gcc
 CXX		= g++
 
-CFLAGS          += -W -Wall -Wpointer-arith
+CFLAGS          += -w -fno-strict-prototypes
 DCFLAGS         += -g
-LDFLAGS		+= -Wl,-rpath $(ACE_ROOT)/ace
-DLD             = $(CXX)
+DLD             = ld
 LD		= $(CXX)
-LIBS            +=
-OCFLAGS         += -O2
-PIC             = -fpic
+LIBS            += -lstdc++  #-lcompat -lresolv
+##OCFLAGS         += -O2
+PIC             = -fpic -DPIC
 AR              = ar
 ARFLAGS         = ruv
 RANLIB          = ranlib
 
-SOFLAGS += $(CPPFLAGS) -shared
+SOFLAGS += -Bshareable -x /usr/lib/c++rt0.o
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so  $<
 PRELIB = @echo
 
-ifeq ($(threads),1)
-LDFLAGS         += -pthread
-CFLAGS          += -D_REENTRANT -DACE_HAS_THREADS
-endif # threads
-
-# Test for template instantiation, add to SOFLAGS if versioned_so set, 
+# Test for template instantiation, add to SOFLAGS if SONAME set, 
 # add -E to LDFLAGS if using GNU ld
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-
 CCFLAGS         += $(CFLAGS) $(TEMPLATES_FLAG)
-
diff --git a/include/makeinclude/platform_openvms.GNU b/include/makeinclude/platform_openvms.GNU
index 7cb18f81cb3..f30157eec0e 100644
--- a/include/makeinclude/platform_openvms.GNU
+++ b/include/makeinclude/platform_openvms.GNU
@@ -33,7 +33,7 @@ CFLAGS			+= -ieee
 DCFLAGS			+= -g
 OCFLAGS			+= -O
 
-#MATHLIB         = -lm
+MATHLIB         = -lm
 PIC             =
 ARFLAGS         = -c
 RANLIB          = @true
@@ -46,14 +46,8 @@ CXX             = cxx
 LD              = $(CXX)
 DLD             = $(CXX)
 SOVERSION       =
-SOEXT		= exe
-EXEEXT		= .exe
-INSLIB		= $(ACE_ROOT)/lib
+SOEXT			= exe
+EXEEXT			= .exe
+INSLIB			= $(ACE_ROOT)/lib
 REALCLEAN_FILES += $(CLEANUP_VSHLIB_NO_VER:%.exe=%_symvec.opt) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \
 	$(CLEANUP_BIN:%=%.DSF)
-
-ifneq ($(MAKEFILE),$(DEPENDENCY_FILE))
-VMS_DUMMY_ := $(shell touch $(DEPENDENCY_FILE))
-VMS_DUMMY_ := $(VMS_DUMMY_)
-endif
-
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 0e32bec299c..56ba08da116 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -214,9 +214,9 @@ endif # ! exceptions
 
 LD              = $(CXX)
 ifeq ($(distrib),0)
-  LDFLAGS       += -R $(ACE_ROOT)/lib -R./
+  LDFLAGS       += -R $(ACE_ROOT)/ace -R./
 endif
-  LIBS          += -lsocket -ldl -lnsl -lgen -lposix4 -ladm
+  LIBS          += -lsocket -ldl -lnsl -lgen -lposix4
 
 LDFLAGS         += -xildoff
 
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index d9ac5b6a581..3d2dd688edb 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -83,7 +83,9 @@ build.local: $(VBUILD)
 STATIC_LINK_FLAG ?=
 static_link ?= 0
 ifeq ($(static_link),1)
-  LDFLAGS += $(STATIC_LINK_FLAG)
+  ifeq ($(static_libs_only),1)
+    LDFLAGS += $(STATIC_LINK_FLAG)
+  endif # static_libs_only = 1
 endif # static_link = 1
 
 OS ?=
@@ -405,7 +407,7 @@ depend.local: $(MAKEFILE) idl_stubs.local
 	ACE_PLATFORM_CONFIG=$(ACE_PLATFORM_CONFIG) \
 	ACE_DEPEND_SED_CMD="$(ACE_DEPEND_SED_CMD)" \
 	$(DEPGEN) -A $(DEPEND_CMD_ARGS) -e config.h -f $(DEPENDENCY_FILE) $(CPPFLAGS) \
-	-DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC)
+	-DMAKEDEPEND $(LSRC) $(SRC) $(PSRC)
 	@if cmp -s $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old ;\
 	then echo "GNUmakefile dependencies unchanged." ;\
 	else \
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 9e0d59f5525..b6398602ff1 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -793,7 +793,7 @@ ace_codecs    ?= 1
 ace_token     ?= 1
 ace_svcconf   ?= 1
 ace_uuid      ?= 1
-ace_filecache ?= 1
+ace_filecahce ?= 1
 
 #----------------------------------------------------------------------------
 #      Conditional macro definitions
diff --git a/m4/ace.m4 b/m4/ace.m4
index 4b8d34bfe72..c9e89b16656 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -24,108 +24,6 @@ dnl Macros that add ACE configuration options to a `configure' script.
 dnl ACE_CONFIGURATION_OPTIONS
 AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
 [
- AC_ARG_ENABLE([ace-codecs],
-  AS_HELP_STRING(--enable-ace-codecs,build ACE with codecs support [[[yes]]]),
-  [
-   case "${enableval}" in
-    yes)
-      ace_user_enable_ace_codecs=yes
-      ;;
-    no)
-      ace_user_enable_ace_codecs=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-ace-codecs])
-      ;;
-   esac
-  ],
-  [
-   ace_user_enable_ace_codecs=yes
-  ])
- AM_CONDITIONAL([BUILD_ACE_CODECS], [test X$ace_user_enable_ace_codecs = Xyes])
-
- AC_ARG_ENABLE([ace-filecache],
-  AS_HELP_STRING(--enable-ace-filecache,build ACE_Filecache support [[[yes]]]),
-  [
-   case "${enableval}" in
-    yes)
-      ace_user_enable_ace_filecache=yes
-      ;;
-    no)
-      ace_user_enable_ace_filecache=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-ace-filecache])
-      ;;
-   esac
-  ],
-  [
-   dnl Enable ACE_Filecache support by default since it's never turned off
-   dnl in the ACE lib itself. Just required for some things like JAWS.
-   ace_user_enable_ace_filecache=yes
-  ])
- AM_CONDITIONAL([BUILD_ACE_FILECACHE], [test X$ace_user_enable_ace_filecache = Xyes])
-
- AC_ARG_ENABLE([ace-other],
-  AS_HELP_STRING(--enable-ace-other,build ACE with all misc pieces [[[yes]]]),
-  [
-   case "${enableval}" in
-    yes)
-      ace_user_enable_ace_other=yes
-      ;;
-    no)
-      ace_user_enable_ace_other=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-ace-other])
-      ;;
-   esac
-  ],
-  [
-   ace_user_enable_ace_other=yes
-  ])
- AM_CONDITIONAL([BUILD_ACE_OTHER], [test X$ace_user_enable_ace_other = Xyes])
-
- AC_ARG_ENABLE([ace-token],
-  AS_HELP_STRING(--enable-ace-token,build ACE with tokens support [[[yes]]]),
-  [
-   case "${enableval}" in
-    yes)
-      ace_user_enable_ace_token=yes
-      ;;
-    no)
-      ace_user_enable_ace_token=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-ace-token])
-      ;;
-   esac
-  ],
-  [
-   ace_user_enable_ace_token=yes
-  ])
- AM_CONDITIONAL([BUILD_ACE_TOKEN], [test X$ace_user_enable_ace_token = Xyes])
-
- AC_ARG_ENABLE([ace-uuid],
-  AS_HELP_STRING(--enable-ace-uuid,build ACE with UUID support [[[yes]]]),
-  [
-   case "${enableval}" in
-    yes)
-      ace_user_enable_ace_uuid=yes
-      ;;
-    no)
-      ace_user_enable_ace_uuid=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-ace-uuid])
-      ;;
-   esac
-  ],
-  [
-   ace_user_enable_ace_uuid=yes
-  ])
- AM_CONDITIONAL([BUILD_ACE_UUID], [test X$ace_user_enable_ace_uuid = Xyes])
-
  AC_ARG_ENABLE([alloca],
   AS_HELP_STRING(--enable-alloca,compile with alloca() support [[[no]]]),
   [
@@ -147,23 +45,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
    ace_user_enable_alloca=no
   ])
 
- AC_ARG_ENABLE([rwho],
-  AS_HELP_STRING(--enable-rwho,build the distributed rwho program [[[no]]]),
-  [
-   case "${enableval}" in
-    yes)
-      ace_user_enable_rwho=yes
-      ;;
-    no)
-      ace_user_enable_rwho=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-rwho])
-      ;;
-   esac
-  ],)
- AM_CONDITIONAL([BUILD_RWHO], [test X$ace_user_enable_rwho = Xyes])
-
  AC_ARG_ENABLE([ipv4-ipv6],
   AS_HELP_STRING(--enable-ipv4-ipv6,compile with IPv4/IPv6 migration support [[[no]]]),
   [
@@ -314,7 +195,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
   [
     ace_user_enable_threads=yes
   ])
- AM_CONDITIONAL([BUILD_THREADS], [test X$ace_user_enable_threads = Xyes])
 
  AC_ARG_ENABLE([verb-not-sup],
   AS_HELP_STRING(--enable-verb-not-sup,enable verbose ENOTSUP reports [[[no]]]),
@@ -350,60 +230,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
    AC_DEFINE([ACE_NTRACE])
   ])
 
- AC_ARG_ENABLE([wfmo],
-  AS_HELP_STRING(--enable-wfmo,build WFMO-using examples [[[no]]]),
-  [
-   case "${enableval}" in
-    yes)
-      ace_user_enable_wfmo=yes
-      ;;
-    no)
-      ace_user_enable_wfmo=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-rtti])
-      ;;
-   esac
-  ],
-  [
-    case "$host" in
-      *win*)
-           ace_user_enable_wfmo=yes
-               ;;
-      *)
-           ace_user_enable_wfmo=no
-               ;;
-    esac
-  ])
- AM_CONDITIONAL([BUILD_WFMO], [test X$ace_user_enable_wfmo = Xyes])
-
- AC_ARG_ENABLE([winregistry],
-  AS_HELP_STRING(--enable-winregistry,build Windows registry-using examples [[[no]]]),
-  [
-   case "${enableval}" in
-    yes)
-      ace_user_enable_winregistry=no
-      ;;
-    no)
-      ace_user_enable_winregistry=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-rtti])
-      ;;
-   esac
-  ],
-  [
-    case "$host" in
-      *win*)
-           ace_user_enable_winregistry=yes
-               ;;
-      *)
-           ace_user_enable_winregistry=no
-               ;;
-    esac
-  ])
- AM_CONDITIONAL([BUILD_WINREGISTRY], [test X$ace_user_enable_winregistry = Xyes])
-
  AC_ARG_ENABLE([xt-reactor],
   AS_HELP_STRING(--enable-xt-reactor,build support for the XtReactor [[[no]]]),
   [
@@ -484,9 +310,65 @@ dnl line, then "no_x" is set to "yes."
   ])
  AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_with_gperf = Xyes])
 
- ACE_WITH_RMCAST
- ACE_WITH_QOS
- ACE_WITH_SSL
+ AC_ARG_WITH([rmcast],
+  AS_HELP_STRING(--with-rmcast,compile the ACE_RMCast library [[[yes]]]),
+  [
+   case "${withval}" in
+    yes)
+      ace_user_with_rmcast=yes
+      ;;
+    no)
+      ace_user_with_rmcast=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${withval} for --with-rmcast])
+      ;;
+   esac
+  ],
+  [
+   ace_user_with_rmcast=yes
+  ])
+ AM_CONDITIONAL([BUILD_RMCAST], [test X$ace_user_with_rmcast = Xyes])
+
+ AC_ARG_WITH([qos],
+  AS_HELP_STRING(--with-qos,compile the ACE_QoS library [[[no]]]),
+  [
+   case "${withval}" in
+    yes)
+      ace_user_with_qos=yes
+      ;;
+    no)
+      ace_user_with_qos=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${withval} for --with-qos])
+      ;;
+   esac
+  ],
+  [
+   ace_user_with_qos=no
+  ])
+ AM_CONDITIONAL([BUILD_QOS], [test X$ace_user_with_qos = Xyes])
+
+ AC_ARG_WITH([ssl],
+  AS_HELP_STRING(--with-ssl,compile the ACE_SSL library [[[yes]]]),
+  [
+   case "${withval}" in
+    yes)
+      ace_user_with_ssl=yes
+      ;;
+    no)
+      ace_user_with_ssl=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${withval} for --with-ssl])
+      ;;
+   esac
+  ],
+  [
+   ace_user_with_ssl=yes
+  ])
+AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes])
 
  AC_ARG_WITH([tao],
   AS_HELP_STRING(--with-tao,build TAO (the ACE ORB) [[[yes]]]),
@@ -601,7 +483,7 @@ dnl        ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-exceptions"
 dnl      fi
 dnl    fi
   ])
- AM_CONDITIONAL([BUILD_EXCEPTIONS], [test X$ace_user_enable_exceptions = Xyes])
+
 
  AC_ARG_ENABLE([fast],
   AS_HELP_STRING(--enable-fast,enable -fast flag (e.g. Sun C++) [[[no]]]),
@@ -829,63 +711,3 @@ dnl    fi
   ])
 
 ])
-
-AC_DEFUN([ACE_WITH_RMCAST],
-[AC_ARG_WITH([rmcast],
-             AS_HELP_STRING([--with-rmcast],
-                            [compile/use the ACE_RMCast library [[yes]]]),
-             [case "${withval}" in
-               yes) 
-                ace_user_with_rmcast=yes
-                ;;
-               no)
-                ace_user_with_rmcast=no
-                ;;
-               *)
-                AC_MSG_ERROR(bad value ${withval} for --with-rmcast)
-                ;;
-              esac])
-AC_CACHE_CHECK([whether to compile/use the ACE_RMCast library],
-               [ace_user_with_rmcast],[ace_user_with_rmcast=yes])
-AM_CONDITIONAL([BUILD_RMCAST], [test X$ace_user_with_rmcast = Xyes])
-])
-
-AC_DEFUN([ACE_WITH_QOS],
-[AC_ARG_WITH([qos],
-             AS_HELP_STRING([--with-qos],
-                            [compile/use the ACE_QoS library [[no]]]),
-             [case "${withval}" in
-               yes) 
-                ace_user_with_qos=yes
-                ;;
-               no)
-                ace_user_with_qos=no
-                ;;
-               *)
-                AC_MSG_ERROR(bad value ${withval} for --with-qos)
-                ;;
-              esac])
-AC_CACHE_CHECK([whether to compile/use the ACE_QoS library],
-               [ace_user_with_qos],[ace_user_with_qos=no])
-AM_CONDITIONAL([BUILD_QOS], [test X$ace_user_with_qos = Xyes])
-])
-
-AC_DEFUN([ACE_WITH_SSL],
-[AC_ARG_WITH([ssl],
-             AS_HELP_STRING([--with-ssl],
-                            [compile/use the ACE_SSL library [[yes]]]),
-             [case "${withval}" in
-               yes) 
-                ace_user_with_ssl=yes
-                ;;
-               no)
-                ace_user_with_ssl=no
-                ;;
-               *)
-                AC_MSG_ERROR(bad value ${withval} for --with-ssl)
-                ;;
-              esac])
-AC_CACHE_CHECK([whether to compile/use the ACE_SSL library],
-               [ace_user_with_ssl], [ace_user_with_ssl=yes])
-AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes])
-])
diff --git a/m4/compiler.m4 b/m4/compiler.m4
index 721af9ac6cf..603112d53f9 100644
--- a/m4/compiler.m4
+++ b/m4/compiler.m4
@@ -38,6 +38,14 @@ dnl  AC_BEFORE([$0], [AC_PROG_LIBTOOL])
  AC_REQUIRE([ACE_COMPILATION_OPTIONS])
 
  if test "$GXX" = yes; then
+dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
+   if $CXX --version | $EGREP -v '^2\.[[0-7]]' > /dev/null; then
+     :  # Do nothing
+   else
+     AC_DEFINE([ACE_HAS_GNUG_PRE_2_8])
+     AC_DEFINE([ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS])
+   fi
+
    case `$CXX --version` in
      2.9* | 3*)
        if test "$ace_user_enable_exceptions" != yes; then
diff --git a/m4/config_h.m4 b/m4/config_h.m4
index d7662bdabdc..8acf5a0b942 100644
--- a/m4/config_h.m4
+++ b/m4/config_h.m4
@@ -62,8 +62,14 @@ AH_TEMPLATE([ACE_LACKS_SYSTIMES_H],[The `sys/times.h' header is unavailable])
 AH_TEMPLATE([ACE_LACKS_UNBUFFERED_STREAMBUF],[])
 AH_TEMPLATE([ACE_HAS_STDCPP_STL_INCLUDES],[])
 
+AH_TEMPLATE([ACE_HAS_LIBC_H],[])
+AH_TEMPLATE([ACE_HAS_OSFCN_H],[])
 AH_TEMPLATE([ACE_HAS_NEW_NO_H],[Platform provides new style C++ <new> header])
+AH_TEMPLATE([ACE_HAS_NEW_H],[Platform provides C++ <new.h> header])
 AH_TEMPLATE([ACE_HAS_STDEXCEPT_NO_H],[Platform provides C++ <stdexcept> header])
+AH_TEMPLATE([ACE_HAS_EXCEPTION_H],[Platform provides C++ <exception.h> header])
+
+AH_TEMPLATE([ACE_HAS_SYS_IOCTL_H],[Platform provides <sys/ioctl.h> header.])
 
 dnl Deprecated! (or soon to be?)
 AH_TEMPLATE([ACE_HAS_OSF1_GETTIMEOFDAY],
@@ -125,7 +131,7 @@ dnl MVS specific configuration parameters
 dnl Nothing yet
 
 dnl NetBSD specific configuration parameters
-dnl Nothing yet
+AH_TEMPLATE([ACE_NETBSD],[Configure for use on NetBSD])
 
 dnl OSF/1 and Digital Unix specific configuration parameters
 AH_TEMPLATE([DEC_CXX],[])
@@ -189,6 +195,7 @@ AH_TEMPLATE([ACE_HAS_DLL],[Build ACE using the frigging PC DLL nonsense...])
 AH_TEMPLATE([ACE_HAS_STRICT],[Use the STRICT compilation mode on Win32.])
 
 AH_TEMPLATE([CYGWIN32], [GNU Win32 environement])
+AH_TEMPLATE([ACE_HAS_CYGWIN32_SOCKET_H],[Platform has cygwin32 socket.h.])
 
 
 dnl ACE internals
@@ -201,6 +208,7 @@ AH_TEMPLATE([ACE_MALLOC_ALIGN],[])
 AH_TEMPLATE([ACE_MAP_PRIVATE],[])
 AH_TEMPLATE([ACE_THR_PRI_FIFO_DEF],[])
 AH_TEMPLATE([ACE_TIMER_SKEW],[])
+AH_TEMPLATE([ACE_UINT64_FORMAT_SPECIFIER],[The format specifier (e.g. "%Lu") for the 64 bit unsigned integer type])
 AH_TEMPLATE([ACE_USE_RCSID],[Enable embedding of global RCS ID strings into compiled object file])
 AH_TEMPLATE([IP_ADD_MEMBERSHIP],[])
 AH_TEMPLATE([IP_DROP_MEMBERSHIP],[])
@@ -209,7 +217,6 @@ AH_TEMPLATE([IP_DROP_MEMBERSHIP],[])
 dnl Specify sizes of given built-in types.  If a size isn't defined here,
 dnl then ace/Basic_Types.h will attempt to deduce the size.
 dnl AH_TEMPLATE([ACE_SIZEOF_CHAR],[Size of native "char" type])
-AH_TEMPLATE([ACE_SIZEOF_WCHAR],[Size of native "wchar_t" type])
 AH_TEMPLATE([ACE_SIZEOF_SHORT],[Size of the native "short" type])
 AH_TEMPLATE([ACE_SIZEOF_INT],[Size of the native "int" type])
 AH_TEMPLATE([ACE_SIZEOF_LONG],[Size of the native "long" type])
@@ -261,6 +268,9 @@ AH_TEMPLATE([ACE_THREADS_DONT_INHERIT_LOG_MSG],
 [Specify this if you don't want threads to inherit parent thread's
 ACE_Log_Msg properties.])
 
+AH_TEMPLATE([ACE_HAS_ONE_DEFINITION_RULE],
+[Compiler enforces C++ One Definition Rule])
+
 AH_TEMPLATE([ACE_HAS_PRIOCNTL],[OS has priocntl (2)])
 
 AH_TEMPLATE([ACE_HAS_RLIMIT_RESOURCE_ENUM],
@@ -359,9 +369,19 @@ AH_TEMPLATE([ACE_HAS_BROKEN_RANDR],
 [OS/compiler's header files are inconsistent with libC definition of
 rand_r().])
 
+AH_TEMPLATE([ACE_HAS_BROKEN_READV],
+[OS/Compiler's header files are not consistent with readv() definition.])
+
 AH_TEMPLATE([ACE_HAS_BROKEN_SAP_ANY],
 [Compiler can't handle the static ACE_Addr::sap_any construct.])
 
+AH_TEMPLATE([ACE_HAS_BROKEN_SENDMSG],
+[OS/compiler omits the const from the sendmsg() prototype.])
+
+AH_TEMPLATE([ACE_HAS_BROKEN_SETRLIMIT],
+[OS/compiler omits the const from the rlimit parameter in the
+setrlimit() prototype.])
+
 AH_TEMPLATE([ACE_HAS_BROKEN_T_ERROR],
 [Compiler/platform has the wrong prototype for t_error(), i.e.,
 t_error(char *) rather than t_error(const char *).])
@@ -371,9 +391,15 @@ AH_TEMPLATE([ACE_HAS_BROKEN_TIMESPEC_MEMBERS],
 instead of tv_sec and tv_nsec.  This is highly non-portable.
 Currently only FreeBSD 2.1.x uses it.])
 
+AH_TEMPLATE([ACE_HAS_BROKEN_WRITEV],
+[OS/compiler omits the const from the iovec parameter in the
+writev() prototype.])
+
 AH_TEMPLATE([ACE_HAS_BSTRING],
 [Platform has <bstring.h> (which contains bzero() prototype)])
 
+AH_TEMPLATE([ACE_HAS_BYTESEX_H],[Platform has <bytesex.h>.])
+
 AH_TEMPLATE([ACE_HAS_CHARPTR_DL],
 [OS/platform uses char * for dlopen/dlsym args, rather than const char *.])
 
@@ -404,10 +430,21 @@ AH_TEMPLATE([ACE_HAS_EXCEPTIONS],[Compiler supports C++ exception handling.])
 
 AH_TEMPLATE([ACE_HAS_FL],[Platform has Fast-Light (FL) toolkit installed.])
 
+AH_TEMPLATE([ACE_HAS_GETIFADDRS],
+[Platform supports getifaddrs() / freeifaddrs().])
+
 AH_TEMPLATE([ACE_HAS_GETPAGESIZE],
 [Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must
 be defined, except on Win32).])
 
+AH_TEMPLATE([ACE_HAS_GETRUSAGE_PROTO],
+[Platform has a getrusage () prototype in sys/resource.h that
+   differs from the one in ace/OS.i.])
+
+AH_TEMPLATE([ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS],
+[GNUC 2.7.3 mistakenly takes the template definition as the place
+   where an inline function of an argument class is first used.])
+
 AH_TEMPLATE([ACE_HAS_GNU_CSTRING_H],
 [Denotes that GNU has cstring.h as standard which redefines memchr()])
 
@@ -487,23 +524,13 @@ AH_TEMPLATE([ACE_HAS_NONCONST_GETBY],
 AH_TEMPLATE([ACE_HAS_NONCONST_MSGSND],
 [Platform has a non-const parameter to msgsnd() (e.g., SCO).])
 
-AH_TEMPLATE([ACE_HAS_NONCONST_READV],
-[Platform omits const qualifier from iovec parameter in readv() prototype.])
-
 AH_TEMPLATE([ACE_HAS_NONCONST_SELECT_TIMEVAL],
 [Platform's select() uses non-const timeval* (only found on Linux
    right now)])
 
-AH_TEMPLATE([ACE_HAS_NONCONST_SENDMSG],
-[Platform omits const qualifier from msghdr parameter in sendmsg()
- prototype.])
-
-AH_TEMPLATE([ACE_HAS_NONCONST_SETRLIMIT],
-[Platform omits const qualifier from rlimit parameter in setrlimit()
- prototype.])
-
-AH_TEMPLATE([ACE_HAS_NONCONST_WRITEV],
-[Platform omits const qualifier from iovec parameter in writev() prototype.])
+AH_TEMPLATE([ACE_HAS_GNUG_PRE_2_8],
+[Platform has "old" GNU compiler,  i.e. does not completely support
+   standard C++. (compiling with g++ prior to version 2.8.0)])
 
 AH_TEMPLATE([ACE_HAS_OLD_MALLOC],
 [Compiler/platform uses old malloc()/free() prototypes (ugh)])
@@ -552,6 +579,8 @@ AH_TEMPLATE([ACE_HAS_POWERPC_TIMER],
 
 AH_TEMPLATE([ACE_HAS_PRUSAGE_T],[Platform supports the prusage_t struct])
 
+AH_TEMPLATE([ACE_HAS_PTHREADS],[Platform supports POSIX Threads])
+
 AH_TEMPLATE([ACE_HAS_PTHREADS_DRAFT4],
 [Platform supports POSIX Threads .4a Draft 4])
 
@@ -634,6 +663,12 @@ AH_TEMPLATE([ACE_LACKS_NETDB_REENTRANT_FUNCTIONS],
 AH_TEMPLATE([ACE_HAS_REGEX],
 [Platform supports the POSIX regular expression library])
 
+AH_TEMPLATE([ACE_HAS_SCANDIR],
+[Platform supports the scandir() function.])
+
+AH_TEMPLATE([ACE_HAS_SELECT_H],
+[Platform has special header for select().])
+
 AH_TEMPLATE([ACE_HAS_SEMUN],
 [Compiler/platform defines a union semun for SysV shared memory ])
 
@@ -670,6 +705,9 @@ AH_TEMPLATE([ACE_HAS_SOCKADDR_MSG_NAME],
 [Platform requires (struct sockaddr *) for msg_name field of
    struct msghdr.])
 
+AH_TEMPLATE([ACE_HAS_SOCKIO_H],
+[Compiler/platform provides the sys/sockio.h file])
+
 AH_TEMPLATE([ACE_HAS_SOCKLEN_T],
 [Platform provides socklen_t type, such as Linux with glibc2.])
 
@@ -678,6 +716,8 @@ AH_TEMPLATE([ACE_HAS_SPARCWORKS_401_SIGNALS],
 
 AH_TEMPLATE([ACE_HAS_SSIZE_T],[Compiler supports the ssize_t typedef])
 
+AH_TEMPLATE([ACE_HAS_STHREADS],[Platform supports UNIX International Threads])
+
 AH_TEMPLATE([ACE_HAS_THR_YIELD],[Platform has thr_yield()])
 
 AH_TEMPLATE([ACE_HAS_STANDARD_CPP_LIBRARY],
@@ -727,6 +767,8 @@ AH_TEMPLATE([ACE_HAS_SYSCALL_GETRUSAGE],
 AH_TEMPLATE([ACE_HAS_SYSCALL_H],
 [Compiler/platform contains the <sys/syscall.h> file.])
 
+AH_TEMPLATE([ACE_HAS_SYSENT_H],[Platform provides <sysent.h> header])
+
 AH_TEMPLATE([ACE_HAS_SYSINFO],
 [Platform supports system configuration information.])
 
@@ -736,6 +778,8 @@ AH_TEMPLATE([ACE_HAS_SYSV_IPC],
 AH_TEMPLATE([ACE_HAS_SYS_ERRLIST],
 [Platform/compiler supports _sys_errlist symbol])
 
+AH_TEMPLATE([ACE_HAS_SYS_FILIO_H],[Platform provides <sys/filio.h> header])
+
 AH_TEMPLATE([ACE_HAS_SYS_SIGLIST],
 [Compiler/platform supports _sys_siglist array])
 
@@ -810,6 +854,8 @@ AH_TEMPLATE([ACE_HAS_UNIXWARE_SVR4_SIGNAL_T],
 
 AH_TEMPLATE([ACE_HAS_WCHAR],[Platform/compiler supports wchar_t])
 
+AH_TEMPLATE([ACE_HAS_UTIME],[Platform has <utime.h> header file])
+
 AH_TEMPLATE([ACE_HAS_TYPENAME_KEYWORD],
 [Compiler supports the C++ typename keyword])
 
@@ -821,7 +867,7 @@ AH_TEMPLATE([ACE_HAS_VERBOSE_NOTSUP],
    origin of ACE_NOTSUP.])
 
 AH_TEMPLATE([ACE_HAS_VOIDPTR_GETTIMEOFDAY],
-[Platform/compiler supports void * as second parameter to
+[Platform/compiler supports void * as second parameter to 
    gettimeofday() and has a prototype.])
 
 AH_TEMPLATE([ACE_HAS_VOIDPTR_MMAP],[Platform requires void * for mmap().])
@@ -887,6 +933,16 @@ AH_TEMPLATE([ACE_LACKS_FILELOCKS],[Platform lacks file locking mechanism])
 AH_TEMPLATE([ACE_LACKS_FLOATING_POINT],
 [Platform does not support floating point operations])
 
+AH_TEMPLATE([ACE_LACKS_GETOPT_PROTO],
+[Platform lacks the getopt() prototype (e.g., LynxOS)])
+
+AH_TEMPLATE([ACE_LACKS_GETPGID],
+[Platform lacks getpgid() call (e.g., Win32, Chorus, and FreeBSD).])
+
+AH_TEMPLATE([ACE_LACKS_SETREGID],[Platform lacks setregid() call.])
+
+AH_TEMPLATE([ACE_LACKS_SETREUID],[Platform lacks setreuid() call.])
+
 AH_TEMPLATE([ACE_LACKS_GETSERVBYNAME],
 [Platforms lacks getservbyname() (e.g., VxWorks and Chorus).])
 
@@ -902,6 +958,19 @@ AH_TEMPLATE([ACE_LACKS_LONGLONG_T],
 AH_TEMPLATE([ACE_LACKS_U_LONGLONG_T],
 [Platform does not have u_longlong_t typedef])
 
+AH_TEMPLATE([ACE_LACKS_MALLOC_H],[Platform lacks malloc.h])
+
+AH_TEMPLATE([ACE_LACKS_MEMORY_H],
+[Platform lacks memory.h (e.g., VxWorks and Chorus)])
+
+AH_TEMPLATE([ACE_LACKS_STDINT_H],
+[Platform lacks stdint.h (e.g., UnixWare)])
+
+AH_TEMPLATE([ACE_LACKS_INTTYPES_H],
+[Platform lacks inittypes.h (e.g. Unixware)])
+
+AH_TEMPLATE([ACE_LACKS_MKTEMP],[ACE has no mktemp()])
+
 AH_TEMPLATE([ACE_LACKS_MMAP],
 [The platform doesn't have mmap(2) (e.g., SCO UNIX).])
 
@@ -923,6 +992,8 @@ AH_TEMPLATE([ACE_LACKS_NULL_PTHREAD_STATUS],
 AH_TEMPLATE([ACE_HAS_MUTEX_TIMEOUTS],
 [Compiler supports timed mutex acquisitions (e.g. pthread_mutex_timedlock()).])
 
+AH_TEMPLATE([ACE_LACKS_PARAM_H],[Platform lacks <sys/param.h> (e.g., MVS)])
+
 AH_TEMPLATE([ACE_LACKS_NAMED_POSIX_SEM],
 [Platform lacks named POSIX semaphores (e.g., Chorus)])
 
@@ -933,6 +1004,9 @@ AH_TEMPLATE([ACE_LACKS_RLIMIT],
 [Platform/compiler lacks {get,set}rlimit() function (e.g., VxWorks,
    Chorus, and SCO UNIX)])
 
+AH_TEMPLATE([ACE_LACKS_RLIMIT_PROTOTYPE],
+[Platform/compiler lacks {get,set}rlimit() prototypes (e.g., Tandem)])
+
 AH_TEMPLATE([ACE_LACKS_RWLOCKATTR_PSHARED],
 [Platform lacks pthread_rwlockattr_setpshared().])
 
@@ -1001,6 +1075,9 @@ AH_TEMPLATE([ACE_LACKS_SI_ADDR],
 AH_TEMPLATE([ACE_LACKS_SYSV_SHMEM],
 [Platform lacks System V shared memory (e.g., Win32 and VxWorks)])
 
+AH_TEMPLATE([ACE_LACKS_SIGINFO_H],
+[Platform lacks the siginfo.h include file (e.g., MVS)])
+
 AH_TEMPLATE([ACE_LACKS_SOCKET_BUFSIZ],
 [Platform doesn't support SO_SNDBUF/SO_RCVBUF (used in TAO)])
 
@@ -1009,6 +1086,11 @@ AH_TEMPLATE([ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES],
 
 AH_TEMPLATE([ACE_LACKS_STRRECVFD],[Platform doesn't define struct strrecvfd.])
 
+AH_TEMPLATE([ACE_LACKS_SYS_SELECT_H],
+[Platform lacks <sys/select.h> header file])
+
+AH_TEMPLATE([ACE_LACKS_SYS_TYPES_H],[Platform lacks <sys/types.h> header file])
+
 AH_TEMPLATE([ACE_LACKS_T_ERRNO],[Header files lack t_errno for TLI])
 
 AH_TEMPLATE([ACE_LACKS_TCP_H],[Platform doesn't have netinet/tcp.h])
@@ -1021,9 +1103,21 @@ AH_TEMPLATE([ACE_LACKS_THREAD_PROCESS_SCOPING],
 AH_TEMPLATE([ACE_LACKS_THREAD_STACK_SIZE],
 [Platform lacks pthread_attr_setstacksize() (e.g., Linux pthreads)])
 
+AH_TEMPLATE([ACE_LACKS_TIMEDWAIT_PROTOTYPES],
+[MIT pthreads platform lacks the timedwait prototypes])
+
 AH_TEMPLATE([ACE_LACKS_TIMESPEC_T],
 [Platform does not define timepec_t as a typedef for struct timespec.])
 
+AH_TEMPLATE([ACE_LACKS_GETPGID_PROTOTYPE],
+[Platform/compiler lacks the getpgid() prototype])
+
+AH_TEMPLATE([ACE_LACKS_SETREGID_PROTOTYPE],
+[Platform/compiler lacks the setregid() prototype])
+
+AH_TEMPLATE([ACE_LACKS_SETREUID_PROTOTYPE],
+[Platform/compiler lacks the setreuid() prototype])
+
 AH_TEMPLATE([ACE_LACKS_STRPTIME_PROTOTYPE],
 [Platform/compiler lacks the strptime() prototype])
 
@@ -1041,6 +1135,9 @@ AH_TEMPLATE([ACE_LACKS_LLSEEK_PROTOTYPE],
 AH_TEMPLATE([ACE_LACKS_PREAD_PROTOTYPE],
 [Platform/compiler lacks the pread() and pwrite() prototypes])
 
+AH_TEMPLATE([ACE_LACKS_UALARM_PROTOTYPE],
+[Platform/compiler lacks the ualarm() prototype (e.g., Solaris)])
+
 AH_TEMPLATE([ACE_LACKS_CHAR_RIGHT_SHIFTS],
 [Compiler does not have any istream operator>> for chars, u_chars, or
    signed chars.])
@@ -1049,6 +1146,11 @@ AH_TEMPLATE([ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS],
 [Compiler does not have operator>> (istream &, u_char *) or
    operator>> (istream &, signed char *)])
 
+AH_TEMPLATE([ACE_LACKS_UCONTEXT_H],[Platform lacks the ucontext.h file])
+
+AH_TEMPLATE([ACE_LACKS_UNISTD_H],
+[Platform lacks the unistd.h file (e.g., VxWorks and Win32) ])
+
 AH_TEMPLATE([ACE_LACKS_UNIX_DOMAIN_SOCKETS],
 [ACE platform has no UNIX domain sockets])
 
diff --git a/m4/platform.m4 b/m4/platform.m4
index c0e477f5695..d39dfeea0f1 100644
--- a/m4/platform.m4
+++ b/m4/platform.m4
@@ -104,6 +104,8 @@ dnl  */
     AC_DEFINE([IP_DROP_MEMBERSHIP], [0x14])
     ACE_CPPFLAGS="$ACE_CPPFLAGS -D_POSIX4A_DRAFT10_SOURCE -D_POSIX4_DRAFT_SOURCE"
     ;;
+  *freebsd*)
+    ;;
   *fsu*)
 dnl FIXME: "FSU" isn't a platform!  We need to move this somewhere.
     AC_DEFINE([PTHREAD_STACK_MIN], [(1024*10)])
@@ -187,6 +189,9 @@ dnl FIXME: "FSU" isn't a platform!  We need to move this somewhere.
   *mvs*)
     ACE_CPPFLAGS="$ACE_CPPFLAGS -D_ALL_SOURCE"
     ;;
+  *netbsd*)
+    AC_DEFINE([ACE_NETBSD])
+    ;;
   *osf3.2*)
     AC_EGREP_CPP([ACE_DEC_CXX],
       [
@@ -345,125 +350,5 @@ dnl    AC_DEFINE(ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL)
     ;;
 esac
 
-ACE_FUNC_IOCTL_ARGTYPES
-
-ACE_CHECK_FORMAT_SPECIFIERS
-ACE_CHECK_LACKS_PERFECT_MULTICAST_FILTERING
-
 dnl End ACE_SET_PLATFORM_MACROS
 ])
-
-
-
-# ACE_CHECK_FORMAT_SPECIFIERS
-#
-# Override default *printf format specifiers for size_t, ssize_t, ACE_INT64, 
-# and ACE_UINT64
-#
-# FIXME: Is it possible to write a portable feature test, or is checking
-#        the the target OS / target CPU the best we can do?
-# 
-#---------------------------------------------------------------------------
-AC_DEFUN([ACE_CHECK_FORMAT_SPECIFIERS],
-[dnl
-AH_TEMPLATE([ACE_SIZE_T_FORMAT_SPECIFIER],
-[Define to the *printf format specifier  (e.g. "%u") for size_t])dnl
-AH_TEMPLATE([ACE_SSIZE_T_FORMAT_SPECIFIER],
-[Define to the *printf format specifier  (e.g. "%d") for ssize_t])dnl
-AH_TEMPLATE([ACE_INT64_FORMAT_SPECIFIER],
-[Define to the *printf format specifier (e.g. "%lld") for the 64 bit signed integer type])dnl
-AH_TEMPLATE([ACE_UINT64_FORMAT_SPECIFIER],
-[Define to the *printf format specifier (e.g. "%llu") for the 64 bit signed integer type])dnl
-
-case "$target_os" in
-darwin*)
-  AC_DEFINE([ACE_SIZE_T_FORMAT_SPECIFIER], ["%lu"])
-  ;;
-netbsd*)
-  case "$target_cpu" in
-    x86_64)
-      AC_DEFINE([ACE_SIZE_T_FORMAT_SPECIFIER], ["%lu"])
-      AC_DEFINE([ACE_SSIZE_T_FORMAT_SPECIFIER], ["%ld"])
-      ;;
-    *)
-      ;;
-  esac
-  ;;
-
-*)
-  ;;
-esac])
-
-
-# ACE_CHECK_PERFECT_MULTICAST_FILTERING
-#
-# Checks whether platform lacks "perfect" multicast filtering.
-#
-# FIXME: Is it possible to write a portable feature test, or is checking
-#        the the target OS the best we can do?
-# 
-#---------------------------------------------------------------------------
-AC_DEFUN([ACE_CHECK_LACKS_PERFECT_MULTICAST_FILTERING],
-[AC_CACHE_CHECK([whether platform lacks perfect multicast filtering],
-  [ace_cv_lacks_perfect_multicast_filtering],
-  [case "$target_os" in
-  darwin* | freebsd* | netbsd* | openbsd* | qnx*)
-    ace_cv_lacks_perfect_multicast_filtering=yes ;;
-  *)
-    ace_cv_lacks_perfect_multicast_filtering=no ;;
-  esac])
-    
-if test $ace_cv_lacks_perfect_multicast_filtering = yes; then
-  AC_DEFINE([ACE_LACKS_PERFECT_MULTICAST_FILTERING], 1,
-[Define to 1 if platform lacks IGMPv3 "perfect" filtering of multicast 
-datagrams at the socket level.  If defined, ACE_SOCK_Dgram_Mcast will bind 
-the first joined multicast group to the socket, and all future joins on that
-socket will fail with an error.])
-fi
-])
-
-
-# ACE_FUNC_IOCTL_ARGTYPES
-#
-# Determine the correct type to be passed to ioctl's second argument and
-# define the types in ACE_IOCTL_TYPE_ARG2.
-#
-# FIXME: Should we support ioctl's third argument as well...?
-# 
-# FIXME: Is it possible to write a portable feature test, or is checking
-#        the the target OS the best we can do?
-# 
-#---------------------------------------------------------------------------
-AC_DEFUN([ACE_FUNC_IOCTL_ARGTYPES],
-[AC_CACHE_CHECK([types of arguments for ioctl()],
-  [ace_cv_func_ioctl_arg2],
-  [case "$target_os" in
-   darwin* | freebsd* | netbsd* | openbsd*)
-    ace_cv_func_ioctl_arg2="unsigned long" ;;
-   *)
-    ace_cv_func_ioctl_arg2="int" ;;
-   esac])
-
-AC_DEFINE_UNQUOTED(ACE_IOCTL_TYPE_ARG2, $ace_cv_func_ioctl_arg2,
-	           [Define to the type of arg 2 for `ioctl'.])
-])
- 
-
-# ACE_VAR_TIMEZONE
-#
-# Checks whether platform has global "timezone" variable.
-#
-#---------------------------------------------------------------------------
-AC_DEFUN([ACE_VAR_TIMEZONE],
-[AC_CACHE_CHECK([for timezone variable],
-		[ace_cv_var_timezone],
-		[AC_TRY_LINK([#include <time.h>],
-			     [return (int)timezone;],
-		             [ace_cv_var_timezone=yes],
-			     [ace_cv_var_timezone=no])
-		])
-if test "$ace_cv_var_timezone" = yes; then
-  AC_DEFINE([ACE_HAS_TIMEZONE], 1,
-	    [Define to 1 if platform has global timezone variable])
-fi
-])
diff --git a/m4/subsets.m4 b/m4/subsets.m4
index afcd471b25f..276a204278f 100644
--- a/m4/subsets.m4
+++ b/m4/subsets.m4
@@ -30,7 +30,7 @@ dnl Assume all subsets will be built, including the full ACE library.
 dnl If any of the components is explicitly enabled or disabled by the user
 dnl then do NOT build the full ACE library.
 AC_ARG_ENABLE([lib-all],
-     AS_HELP_STRING([--enable-lib-all],[build all ACE components [[no]]]),
+     AC_HELP_STRING([--enable-lib-all],[build all ACE components [[no]]]),
               [
                case "${enableval}" in
                 yes)
@@ -49,7 +49,7 @@ AC_ARG_ENABLE([lib-all],
               ])
 
 AC_ARG_ENABLE([lib-full],
-     AS_HELP_STRING([--enable-lib-full],[build the full ACE library [[yes]]]),
+     AC_HELP_STRING([--enable-lib-full],[build the full ACE library [[yes]]]),
               [
                case "${enableval}" in
                 yes)
@@ -68,7 +68,7 @@ AC_ARG_ENABLE([lib-full],
               ])
 
 AC_ARG_ENABLE([lib-os],
-     AS_HELP_STRING([--enable-lib-os],[build ACE_OS library]),
+     AC_HELP_STRING([--enable-lib-os],[build ACE_OS library]),
               [
                case "${enableval}" in
                 yes)
@@ -87,7 +87,7 @@ AC_ARG_ENABLE([lib-os],
               ],)
 
 AC_ARG_ENABLE([lib-codecs],
-     AS_HELP_STRING([--enable-lib-codecs],[build ACE_Codecs library]),
+     AC_HELP_STRING([--enable-lib-codecs],[build ACE_Codecs library]),
               [
                case "${enableval}" in
                 yes)
@@ -107,7 +107,7 @@ AC_ARG_ENABLE([lib-codecs],
               ],)
 
 AC_ARG_ENABLE([lib-connection],
-     AS_HELP_STRING([--enable-lib-connection],[build ACE_Connection library ]),
+     AC_HELP_STRING([--enable-lib-connection],[build ACE_Connection library ]),
               [
                case "${enableval}" in
                 yes)
@@ -126,7 +126,7 @@ AC_ARG_ENABLE([lib-connection],
               ],)
 
 AC_ARG_ENABLE([lib-demux],
-     AS_HELP_STRING([--enable-lib-demux],[build ACE_Demux library]),
+     AC_HELP_STRING([--enable-lib-demux],[build ACE_Demux library]),
               [
                case "${enableval}" in
                 yes)
@@ -145,7 +145,7 @@ AC_ARG_ENABLE([lib-demux],
               ],)
 
 AC_ARG_ENABLE([lib-filecache],
-     AS_HELP_STRING([--enable-lib-filecache],[build ACE_Filecache library]),
+     AC_HELP_STRING([--enable-lib-filecache],[build ACE_Filecache library]),
               [
                case "${enableval}" in
                 yes)
@@ -164,7 +164,7 @@ AC_ARG_ENABLE([lib-filecache],
               ],)
 
 AC_ARG_ENABLE([lib-ipc],
-     AS_HELP_STRING([--enable-lib-ipc],[build ACE_IPC library]),
+     AC_HELP_STRING([--enable-lib-ipc],[build ACE_IPC library]),
               [
                case "${enableval}" in
                 yes)
@@ -183,7 +183,7 @@ AC_ARG_ENABLE([lib-ipc],
               ],)
 
 AC_ARG_ENABLE([lib-logging],
-     AS_HELP_STRING([--enable-lib-logging],[build ACE_Logging library]),
+     AC_HELP_STRING([--enable-lib-logging],[build ACE_Logging library]),
               [
                case "${enableval}" in
                 yes)
@@ -202,7 +202,7 @@ AC_ARG_ENABLE([lib-logging],
               ],)
 
 AC_ARG_ENABLE([lib-memory],
-     AS_HELP_STRING([--enable-lib-memory],[build ACE_Memory library]),
+     AC_HELP_STRING([--enable-lib-memory],[build ACE_Memory library]),
               [
                case "${enableval}" in
                 yes)
@@ -221,7 +221,7 @@ AC_ARG_ENABLE([lib-memory],
               ],)
 
 AC_ARG_ENABLE([lib-metrics],
-     AS_HELP_STRING([--enable-lib-metrics],[build ACE_Metrics library]),
+     AC_HELP_STRING([--enable-lib-metrics],[build ACE_Metrics library]),
               [
                case "${enableval}" in
                 yes)
@@ -240,7 +240,7 @@ AC_ARG_ENABLE([lib-metrics],
               ],)
 
 AC_ARG_ENABLE([lib-sockets],
-     AS_HELP_STRING([--enable-lib-sockets],[build ACE_Sockets library]),
+     AC_HELP_STRING([--enable-lib-sockets],[build ACE_Sockets library]),
               [
                case "${enableval}" in
                 yes)
@@ -259,7 +259,7 @@ AC_ARG_ENABLE([lib-sockets],
               ],)
 
 AC_ARG_ENABLE([lib-streams],
-     AS_HELP_STRING([--enable-lib-streams],[build ACE_Streams library]),
+     AC_HELP_STRING([--enable-lib-streams],[build ACE_Streams library]),
               [
                case "${enableval}" in
                 yes)
@@ -278,7 +278,7 @@ AC_ARG_ENABLE([lib-streams],
               ],)
 
 AC_ARG_ENABLE([lib-svcconf],
-     AS_HELP_STRING([--enable-lib-svcconf],[build ACE_Svcconf library]),
+     AC_HELP_STRING([--enable-lib-svcconf],[build ACE_Svcconf library]),
               [
                case "${enableval}" in
                 yes)
@@ -298,7 +298,7 @@ AC_ARG_ENABLE([lib-svcconf],
               ],)
 
 AC_ARG_ENABLE([lib-threads],
-     AS_HELP_STRING([--enable-lib-threads],[build ACE_Threads library]),
+     AC_HELP_STRING([--enable-lib-threads],[build ACE_Threads library]),
               [
                case "${enableval}" in
                 yes)
@@ -317,7 +317,7 @@ AC_ARG_ENABLE([lib-threads],
               ],)
 
 AC_ARG_ENABLE([lib-timer],
-     AS_HELP_STRING([--enable-lib-timer],[build ACE_Timer library]),
+     AC_HELP_STRING([--enable-lib-timer],[build ACE_Timer library]),
               [
                case "${enableval}" in
                 yes)
@@ -336,7 +336,7 @@ AC_ARG_ENABLE([lib-timer],
               ],)
 
 AC_ARG_ENABLE([lib-token],
-     AS_HELP_STRING([--enable-lib-token],[build ACE_Token library]),
+     AC_HELP_STRING([--enable-lib-token],[build ACE_Token library]),
               [
                case "${enableval}" in
                 yes)
@@ -356,7 +356,7 @@ AC_ARG_ENABLE([lib-token],
               ],)
 
 AC_ARG_ENABLE([lib-utils],
-     AS_HELP_STRING([--enable-lib-utils],[build ACE_Utils library]),
+     AC_HELP_STRING([--enable-lib-utils],[build ACE_Utils library]),
               [
                case "${enableval}" in
                 yes)
@@ -375,7 +375,7 @@ AC_ARG_ENABLE([lib-utils],
               ],)
 
 AC_ARG_ENABLE([lib-uuid],
-     AS_HELP_STRING([--enable-lib-uuid],[build ACE_UUID library]),
+     AC_HELP_STRING([--enable-lib-uuid],[build ACE_UUID library]),
               [
                case "${enableval}" in
                 yes)
@@ -395,7 +395,7 @@ AC_ARG_ENABLE([lib-uuid],
               ],)
 
 AC_ARG_ENABLE([lib-other],
-     AS_HELP_STRING([--enable-lib-other],[build ACE_Other library]),
+     AC_HELP_STRING([--enable-lib-other],[build ACE_Other library]),
               [
                case "${enableval}" in
                 yes)
diff --git a/m4/threads.m4 b/m4/threads.m4
index bfffd5ac02a..f6cd6cba36d 100644
--- a/m4/threads.m4
+++ b/m4/threads.m4
@@ -71,8 +71,7 @@ dnl  AC_REQUIRE([AC_LANG])
  AC_SEARCH_LIBS([thr_create], [thread],
    [
     ace_has_sthreads=yes
-    AC_DEFINE([ACE_HAS_STHREADS], 1, 
-	      [Define to 1 if platform has UNIX International Threads])
+    AC_DEFINE([ACE_HAS_STHREADS])
    ],
    [
     ace_has_sthreads=no
@@ -93,8 +92,7 @@ dnl  AC_REQUIRE([AC_LANG])
  ACE_CHECK_POSIX_THREADS(
    [
     ace_has_pthreads=yes
-    AC_DEFINE([ACE_HAS_PTHREADS], 1,
-	      [Define to 1 if platform has POSIX threads])
+    AC_DEFINE([ACE_HAS_PTHREADS])
     AC_MSG_RESULT([none required])
    ],
    [])
diff --git a/netsvcs/Makefile.am b/netsvcs/Makefile.am
index f3d559265e8..5bebeb4ea44 100644
--- a/netsvcs/Makefile.am
+++ b/netsvcs/Makefile.am
@@ -1,15 +1,17 @@
-##  Process this file with automake to create Makefile.in
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for the ACE network services
 ##
-## $Id$
+##---------------------------------------------------------------------------
+
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##  Process this file with automake to create Makefile.in
 ##
-## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
 
 SUBDIRS = \
-        lib \
-        clients \
-        servers
+  lib \
+  clients \
+  servers
 
+EXTRA_DIST = ACE-netsvcs.html
diff --git a/netsvcs/clients/Logger/Makefile.am b/netsvcs/clients/Logger/Makefile.am
index 962adef1494..70449c5e220 100644
--- a/netsvcs/clients/Logger/Makefile.am
+++ b/netsvcs/clients/Logger/Makefile.am
@@ -1,45 +1,24 @@
-##  Process this file with automake to create Makefile.in
+##----------------------------------------------------------------------------
+##       $Id$
 ##
-## $Id$
+##       Makefile for client logging applications
+##----------------------------------------------------------------------------
+
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##  Process this file with automake to create Makefile.in
 ##
-## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
-
-ACE_BUILDDIR = $(top_builddir)
-
-## Makefile.direct_logging.am 
-noinst_PROGRAMS = direct_logging
-
-direct_logging_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR)
-
-direct_logging_SOURCES = \
-  direct_logging.cpp
-
-direct_logging_LDADD = \
- $(top_builddir)/netsvcs/lib/libnetsvcs.la $(top_builddir)/ace/libACE.la
 
-## Makefile.indirect_logging.am 
-noinst_PROGRAMS += indirect_logging
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
-indirect_logging_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR)
+## LDFLAGS = 
+## Libtool will automatically link against the "proper" library.
+## Do not change the "libACE.la."  It is not a typographical error!
+LDADD = $(top_builddir)/ace/libACE.la
 
-indirect_logging_SOURCES = \
-  indirect_logging.cpp
+noinst_PROGRAMS = \
+ direct_logging \
+ indirect_logging
 
-indirect_logging_LDADD = \
- $(top_builddir)/netsvcs/lib/libnetsvcs.la $(top_builddir)/ace/libACE.la
+direct_logging_SOURCES = direct_logging.cpp
 
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
-	-rm -rf ptrepository SunWS_cache Templates.DB
+indirect_logging_SOURCES = indirect_logging.cpp
diff --git a/netsvcs/clients/Makefile.am b/netsvcs/clients/Makefile.am
index 595f146924e..6edac17be3d 100644
--- a/netsvcs/clients/Makefile.am
+++ b/netsvcs/clients/Makefile.am
@@ -1,14 +1,14 @@
-##  Process this file with automake to create Makefile.in
+##----------------------------------------------------------------------------
+##       $Id$
 ##
-## $Id$
+##       Makefile for the client programs that test the ACE network services
+##----------------------------------------------------------------------------
+
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##  Process this file with automake to create Makefile.in
 ##
-## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
 
 SUBDIRS = \
-        Logger \
-        Naming
-
+  Logger \
+  Naming \
+  Tokens
diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index 0f87432d246..ce3e2942219 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -381,7 +381,7 @@ Client_Test::set_proc_local (void)
 {
   // Close down original name space
   NAMING_CONTEXT ()->close ();
-  this->name_options_->nameserver_host (ACE_TEXT ("localhost"));
+  this->name_options_->nameserver_host ("localhost");
   this->name_options_->context (ACE_Naming_Context::PROC_LOCAL);
   return NAMING_CONTEXT ()->open (ACE_Naming_Context::PROC_LOCAL);
 }
@@ -391,7 +391,7 @@ Client_Test::set_node_local (void)
 {
   // Close down original name space
   NAMING_CONTEXT ()->close ();
-  this->name_options_->nameserver_host (ACE_TEXT ("localhost"));
+  this->name_options_->nameserver_host ("localhost");
   this->name_options_->context (ACE_Naming_Context::NODE_LOCAL);
   return NAMING_CONTEXT ()->open (ACE_Naming_Context::NODE_LOCAL);
 }
@@ -404,7 +404,7 @@ Client_Test::set_host (const char *hostname, int port)
 
   this->name_options_->context (ACE_Naming_Context::NET_LOCAL);
   // Set Name Options
-  this->name_options_->nameserver_host (ACE_TEXT_CHAR_TO_TCHAR (hostname));
+  this->name_options_->nameserver_host (hostname);
   this->name_options_->nameserver_port (port);
 
   return NAMING_CONTEXT ()->open (ACE_Naming_Context::NET_LOCAL);
diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am
index c1e6cfc66ac..95879536177 100644
--- a/netsvcs/clients/Naming/Client/Makefile.am
+++ b/netsvcs/clients/Naming/Client/Makefile.am
@@ -1,50 +1,31 @@
-##  Process this file with automake to create Makefile.in
+##----------------------------------------------------------------------------
+##       $Id$
 ##
-## $Id$
+##       Makefile for the client programs that test the ACE network services
+##----------------------------------------------------------------------------
+
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##  Process this file with automake to create Makefile.in
 ##
-## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
-
-ACE_BUILDDIR = $(top_builddir)
-
-## Makefile.Netsvsc_Client_Test_Lib.am 
-noinst_LTLIBRARIES = libClient_Test.la
-
-libClient_Test_la_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR) \
-  -DACE_CLIENT_TEST_BUILD_DLL
 
-libClient_Test_la_SOURCES = \
-  Client_Test.cpp
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
-libClient_Test_la_LIBADD = \
- $(top_builddir)/ace/libACE.la
+noinst_LIBRARIES = libClient_Test.a
 
-noinst_HEADERS = \
-  Client_Test.h
+libClient_Test_a_SOURCES = Client_Test.cpp Client_Test.h
 
-## Makefile.Netsvcs_Client_Test.am 
-noinst_PROGRAMS = main
+noinst_PROGRAMS = \
+  main
 
-main_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR)
+main_SOURCES = main.cpp
+main_LDADD = libClient_Test.a \
+             $(top_builddir)/ace/libACE.la
 
-main_SOURCES = \
-  main.cpp \
-  Client_Test.h
+noinst_DATA = svc.conf svc2.conf
 
-main_LDADD = \
- libClient_Test.la $(top_builddir)/ace/libACE.la
+EXTRA_DIST = $(noinst_DATA)
 
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
-	-rm -rf ptrepository SunWS_cache Templates.DB
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp
index 25a87893d27..75456ba8cad 100644
--- a/netsvcs/clients/Naming/Client/main.cpp
+++ b/netsvcs/clients/Naming/Client/main.cpp
@@ -12,7 +12,7 @@
 ACE_RCSID(Client, main, "$Id$")
 
 int
-ACE_TMAIN (int, ACE_TCHAR *argv[])
+main (int, char *argv[])
 {
   ACE_Service_Config daemon;
   ACE_ARGV new_args;
@@ -20,13 +20,13 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
   // Load the existing <argv> into our new one.
   new_args.add (argv);
   // Enable loading of static services.
-  new_args.add (ACE_TEXT ("-y")); 
+  new_args.add ("-y"); 
   // Enable debugging within dynamically linked services.
-  new_args.add (ACE_TEXT ("-d")); 
+  new_args.add ("-d"); 
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("argc = %d\n"),
-              new_args.argc ()));
+              ACE_TEXT (new_args.argc ())));
 
   // Print the contents of the combined <ACE_ARGV>.
   for (int i = 0; i < new_args.argc (); i++)
@@ -39,23 +39,25 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
                    new_args.argv ()) == -1)
     {
       if (errno != ENOENT)
-	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")),
-                          1);
+	ACE_ERROR ((LM_ERROR,
+                    "%p\n%a",
+                    "open",
+                    1));
       else // Use static binding.
 	{
           ACE_ARGV args;
 
           args.add (argv[0]);
-	  args.add (ACE_TEXT ("-p10011")); // Port number.
+	  args.add ("-p10011"); // Port number.
 	  ACE_Service_Object *so =
             ACE_SVC_INVOKE (ACE_Naming_Context);
 
 	  if (so->init (args.argc (),
                         args.argv ()) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               ACE_TEXT ("ACE_Naming_Context")),
-                              1);
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "ACE_Naming_Context",
+                        1));
 
 	  so = ACE_SVC_INVOKE (Client_Test);
 
diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
index bfda59cd09f..f9a765d605e 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
@@ -16,7 +16,7 @@
 
 ACE_RCSID(Dump_Restore, Dump_Restore, "$Id$")
 
-Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[])
+Dump_Restore::Dump_Restore (int argc, char *argv[])
   : infile_ (0)
 {
   ACE_NEW (this->ns_context_,
@@ -28,12 +28,12 @@ Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[])
 
   //determine name context
   if (ACE_OS::strcmp (this->name_options_->nameserver_host (),
-                      ACE_TEXT ("localhost")) == 0)
+                      "localhost") == 0)
     {
       if (ns_context_->open (ACE_Naming_Context::PROC_LOCAL) == -1)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%p\n"),
-                    ACE_TEXT ("ns_context_->open")));
+                    "%p\n",
+                    "ns_context_->open"));
     }
   else
     {
@@ -46,8 +46,8 @@ Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[])
 
       if (this->ns_context_->open (ACE_Naming_Context::NET_LOCAL) == -1)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%p\n"),
-                    ACE_TEXT ("ns_context_->open")));
+                    "%p\n",
+                    "ns_context_->open"));
     }
 
   this->display_menu ();
@@ -56,8 +56,8 @@ Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[])
                                                  ACE_Reactor::instance (),
                                                  ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("%p\n"),
-                ACE_TEXT ("register_stdin_handler")));
+                "%p\n",
+                "register_stdin_handler"));
 }
 
 Dump_Restore::~Dump_Restore (void)
@@ -80,7 +80,7 @@ Dump_Restore::handle_input (ACE_HANDLE)
   if (::scanf ("%s", option) <= 0)
     {
       ACE_DEBUG ((LM_ERROR,
-                  ACE_TEXT ("try again\n")));
+                  "try again\n"));
       return 0;
     }
 
@@ -98,7 +98,7 @@ Dump_Restore::handle_input (ACE_HANDLE)
     case 'h' :
       if (::scanf ("%s %hu", buf1, &port) <= 0)
         break;
-      set_host (ACE_TEXT_CHAR_TO_TCHAR (buf1), port);
+      set_host (buf1, port);
       break;
     case 'F':
     case 'f':
@@ -131,7 +131,7 @@ Dump_Restore::handle_input (ACE_HANDLE)
       quit ();
       break;
     default :
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unrecognized command.\n")));
+      ACE_DEBUG ((LM_DEBUG, "Unrecognized command.\n"));
     }
 
   display_menu ();
@@ -142,59 +142,59 @@ void
 Dump_Restore::display_menu (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("\n")));
+              "\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Name Service Main Menu\n")));
+              "Name Service Main Menu\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("----------------------\n")));
+              "----------------------\n"));
 
   // Check if using local name space or remote name space
   if (ACE_OS::strcmp (this->name_options_->nameserver_host (),
-                      ACE_TEXT ("localhost")) == 0)
+                      "localhost") == 0)
     {
       if (this->ns_scope_ == ACE_Naming_Context::PROC_LOCAL)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("  *** Using Process Local Database ***\n\n")));
+                    "  *** Using Process Local Database ***\n\n"));
       else
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("  *** Using Node Local Database ***\n\n")));
+                    "  *** Using Node Local Database ***\n\n"));
     }
   else
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("  Hostname: %s\n"),
+                  "  Hostname: %s\n",
                   this->hostname_));
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("  Port Number: %d\n"),
+                  "  Port Number: %d\n",
                   this->port_));
     }
 
   if (this->infile_)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Input File: %C\n"),
+                "Input File: %s\n",
                 this->filename_));
   else
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("** No Input File Specified **\n")));
+                "** No Input File Specified **\n"));
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("<P> Use Process Local Database\n")));
+              "<P> Use Process Local Database\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("<N> Use Node Local Database\n")));
+              "<N> Use Node Local Database\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("<H> Set Remote Name server <host> and <port>\n")));
+              "<H> Set Remote Name server <host> and <port>\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("<F> Set Input File <file name>\n")));
+              "<F> Set Input File <file name>\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("<B> Bind\n")));
+              "<B> Bind\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("<U> Unbind\n")));
+              "<U> Unbind\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("<R> Rebind\n")));
+              "<R> Rebind\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("<D> Dump <file name>\n")));
+              "<D> Dump <file name>\n"));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("<Q> or ^C (exit) \n")));
+              "<Q> or ^C (exit) \n"));
 }
 
 
@@ -202,7 +202,7 @@ int
 Dump_Restore::set_proc_local (void)
 {
   // Set Name Options
-  this->name_options_->nameserver_host (ACE_TEXT ("localhost"));
+  this->name_options_->nameserver_host ("localhost");
   this->name_options_->nameserver_port (0);
 
   // Set Naming Context scope
@@ -219,8 +219,8 @@ Dump_Restore::set_proc_local (void)
 
   if (this->ns_context_->open (ACE_Naming_Context::PROC_LOCAL) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("ns_context_->open")),
+                       "%p\n",
+                       "ns_context_->open"),
                       -1);
 
   return 0;
@@ -230,7 +230,7 @@ int
 Dump_Restore::set_node_local (void)
 {
   // Set Name Options
-  this->name_options_->nameserver_host (ACE_TEXT ("localhost"));
+  this->name_options_->nameserver_host ("localhost");
   this->name_options_->nameserver_port (0);
 
   // Set Naming Context scope
@@ -246,14 +246,14 @@ Dump_Restore::set_node_local (void)
 
   if (ns_context_->open (ACE_Naming_Context::NODE_LOCAL) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("ns_context_->open")),
+                       "%p\n",
+                       "ns_context_->open"),
                       -1);
   return 0;
 }
 
 int
-Dump_Restore::set_host (const ACE_TCHAR *hostname,
+Dump_Restore::set_host (const char *hostname,
                         int port)
 {
   // Set Name Options
@@ -262,9 +262,11 @@ Dump_Restore::set_host (const ACE_TCHAR *hostname,
 
   // Don't really need to do this but it's a hack to fix the problme
   // of Display () not printing the right hostname
-  ACE_OS::strcpy (this->hostname_, hostname);
+  ACE_OS::strcpy (this->hostname_,
+                  hostname);
   this->port_ = port;
-  this->ns_scope_ = ACE_Naming_Context::NET_LOCAL;
+  this->ns_scope_ =
+    ACE_Naming_Context::NET_LOCAL;
 
   // remove old naming context
   delete this->ns_context_;
@@ -277,8 +279,8 @@ Dump_Restore::set_host (const ACE_TCHAR *hostname,
   // assume net_local context
   if (ns_context_->open (ACE_Naming_Context::NET_LOCAL) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("ns_context_->open")),
+                       "%p\n",
+                       "ns_context_->open"),
                       -1);
   return 0;
 }
@@ -380,8 +382,8 @@ Dump_Restore::populate (Dump_Restore::Operation_Type op)
               break;
             default:
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("%p\n"),
-                                 ACE_TEXT ("populate")),
+                                 "%p\n",
+                                 "populate"),
                                 -1);
               /* NOTREACHED */
             }
@@ -403,15 +405,15 @@ Dump_Restore::bind (const char *key,
                                   type);
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("ns_context_->bind")),
+                       "%p\n",
+                       "ns_context_->bind"),
                       -1);
   else if (result == 1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%s%s%s\n"),
-                       ACE_TEXT ("key <"),
+                       "%s%s%s\n",
+                       "key <",
                        key,
-                       ACE_TEXT ("> already bound")),
+                       "> already bound"),
                       1);
   return 0;
 }
@@ -423,8 +425,8 @@ Dump_Restore::unbind (const char *key)
 
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("ns_context_->unbind")),
+                       "%p\n",
+                       "ns_context_->unbind"),
                       -1);
   return 0;
 }
@@ -438,8 +440,8 @@ Dump_Restore::rebind (const char *key,
                            value,
                            type) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("ns_context_->rebind")),
+                       "%p\n",
+                       "ns_context_->rebind"),
                       -1);
   return 0;
 }
diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
index 1cdd2113f8e..72651ff6ad0 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h
@@ -21,7 +21,7 @@ public:
       UNBIND,
       REBIND
     };
-  Dump_Restore (int argc, ACE_TCHAR *argv[]);
+  Dump_Restore (int argc, char *argv[]);
   // Initialize name options and naming context
 
   ~Dump_Restore (void);
@@ -32,7 +32,7 @@ public:
   void dump (void);
 
 private:
-  ACE_TCHAR hostname_[MAXHOSTNAMELEN + 1];
+  char hostname_[MAXHOSTNAMELEN + 1];
   // Cache the hostname and port number for remote case
 
   void display_menu (void);
@@ -44,7 +44,7 @@ private:
   int set_node_local (void);
   // Set options to use NODE_LOCAL naming context.
 
-  int set_host (const ACE_TCHAR *hostname,
+  int set_host (const char *hostname,
                 int port);
   // Set options to use NET_LOCAL naming context specifying host name
   // and port number.
diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am
index cc5dfd0c1c7..22a196c18fb 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Makefile.am
+++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.am
@@ -1,50 +1,27 @@
-##  Process this file with automake to create Makefile.in
+##----------------------------------------------------------------------------
+##       $Id$
 ##
-## $Id$
+##       Makefile for the ACE Dump-Restore Name_Server utility
+##----------------------------------------------------------------------------
+
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##  Process this file with automake to create Makefile.in
 ##
-## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
-
-ACE_BUILDDIR = $(top_builddir)
-
-## Makefile.Netsvcs_Dump_Restore_Lib.am 
-noinst_LTLIBRARIES = libDump_Restore.la
-
-libDump_Restore_la_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR) \
-  -DACE_BUILD_SVC_DLL
-
-libDump_Restore_la_SOURCES = \
-  Dump_Restore.cpp
-
-libDump_Restore_la_LIBADD = \
- $(top_builddir)/ace/libACE.la
 
-noinst_HEADERS = \
-  Dump_Restore.h
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
-## Makefile.Netsvcs_Dump_Restore.am 
-noinst_PROGRAMS = main
+noinst_LIBRARIES = \
+         libDump_Restore.a
 
-main_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR)
+libDump_Restore_a_SOURCES = Dump_Restore.cpp Dump_Restore.h
 
-main_SOURCES = \
-  main.cpp \
-  Dump_Restore.h
+noinst_PROGRAMS = \
+         main
 
+main_SOURCES = main.cpp
 main_LDADD = \
-  libDump_Restore.la $(top_builddir)/ace/libACE.la
+      libDump_Restore.a \
+      $(top_builddir)/ace/libACE.la
 
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
-	-rm -rf ptrepository SunWS_cache Templates.DB
+## ACE currently doesn't build this so we don't build it with automake either.
+EXTRA_DIST = createfile.cpp
diff --git a/netsvcs/clients/Naming/Dump_Restore/main.cpp b/netsvcs/clients/Naming/Dump_Restore/main.cpp
index 46d298357bc..4d90427edda 100644
--- a/netsvcs/clients/Naming/Dump_Restore/main.cpp
+++ b/netsvcs/clients/Naming/Dump_Restore/main.cpp
@@ -9,11 +9,11 @@
 ACE_RCSID(Dump_Restore, main, "$Id$")
 
 int 
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+main (int argc, char *argv[])
 {
   ACE_Service_Config daemon (argv[0]);
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("entering main\n")));
+  ACE_DEBUG ((LM_DEBUG, "entering main\n"));
 
   // Get a handler
   Dump_Restore client_handler (argc, argv);
@@ -21,6 +21,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Reactor::run_event_loop ();
   
   /* NOTREACHED */
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("leaving main\n")));
+  ACE_DEBUG ((LM_DEBUG, "leaving main\n"));
   return 0;
 }
diff --git a/netsvcs/clients/Naming/Makefile.am b/netsvcs/clients/Naming/Makefile.am
index ce115bb2cc7..09924790da5 100644
--- a/netsvcs/clients/Naming/Makefile.am
+++ b/netsvcs/clients/Naming/Makefile.am
@@ -1,14 +1,19 @@
-##  Process this file with automake to create Makefile.in
+##---------------------------------------------------------------------------
+##       $Id$
 ##
-## $Id$
+##       Makefile for the Name Server test applications
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##---------------------------------------------------------------------------
+
 ##
-## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4 
 
 SUBDIRS = \
-        Client \
-        Dump_Restore
+         Client \
+         Dump_Restore
 
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index ec93d250348..8861c5f7dfc 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -300,12 +300,12 @@ ACE_Client_Logging_Handler::send (ACE_Log_Record &log_record)
   // since otherwise the values of the <log_record> fields will be in
   // network byte order.
   if (orig_ostream)
-    log_record.print (ACE_TEXT ("<localhost>"),
+    log_record.print ("<localhost>",
                       ACE_Log_Msg::instance ()->flags (),
                       *orig_ostream);
 
   if (this->logging_output_ == ACE_STDERR)
-    log_record.print (ACE_TEXT ("<localhost>"),
+    log_record.print ("<localhost>",
                       ACE_Log_Msg::instance ()->flags (),
                       stderr);
   else
@@ -345,13 +345,13 @@ public:
 
 protected:
   // = Dynamic linking hooks.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
   // Called when service is linked.
 
   virtual int fini (void);
   // Called when service is unlinked.
 
-  virtual int info (ACE_TCHAR **strp, size_t length) const;
+  virtual int info (char **strp, size_t length) const;
   // Called to determine info about the service.
 
   virtual int make_svc_handler (ACE_Client_Logging_Handler *&sh);
@@ -362,10 +362,10 @@ protected:
   virtual int resume (void);
 
 private:
-  int parse_args (int argc, ACE_TCHAR *argv[]);
+  int parse_args (int argc, char *argv[]);
   // Parse svc.conf arguments.
 
-  const ACE_TCHAR *server_host_;
+  const char *server_host_;
   // Host where the logging server is located.
 
   u_short server_port_;
@@ -375,7 +375,7 @@ private:
   ACE_INET_Addr server_addr_;
   // Address of the logging server.
 
-  const ACE_TCHAR *logger_key_;
+  const char *logger_key_;
   // Communication endpoint where the client logging daemon will
   // listen for connections from clients.
 
@@ -411,11 +411,11 @@ ACE_Client_Logging_Acceptor::make_svc_handler (ACE_Client_Logging_Handler *&sh)
 }
 
 int
-ACE_Client_Logging_Acceptor::info (ACE_TCHAR **strp, size_t length) const
+ACE_Client_Logging_Acceptor::info (char **strp, size_t length) const
 {
-  ACE_TCHAR buf[BUFSIZ];
+  char buf[BUFSIZ];
 
-  ACE_OS::sprintf (buf, ACE_TEXT ("%d/%s %s"),
+  ACE_OS::sprintf (buf, "%d/%s %s",
 		   this->server_addr_.get_port_number (), "tcp",
 		   "# client logging daemon\n");
 
@@ -435,10 +435,10 @@ ACE_Client_Logging_Acceptor::ACE_Client_Logging_Acceptor (void)
 }
 
 int
-ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[])
+ACE_Client_Logging_Acceptor::init (int argc, char *argv[])
 {
   // We'll log *our* error and debug messages to stderr!
-  ACE_LOG_MSG->open (ACE_TEXT ("Client Logging Service"));
+  ACE_LOG_MSG->open ("Client Logging Service");
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -495,9 +495,9 @@ ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ACE_Client_Logging_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
+ACE_Client_Logging_Acceptor::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:k:p:"), 0);
+  ACE_Get_Opt get_opt (argc, argv, "h:k:p:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/netsvcs/lib/Log_Message_Receiver.cpp b/netsvcs/lib/Log_Message_Receiver.cpp
index b6496232bd3..7c032c453ef 100644
--- a/netsvcs/lib/Log_Message_Receiver.cpp
+++ b/netsvcs/lib/Log_Message_Receiver.cpp
@@ -10,8 +10,8 @@ ACE_RCSID(lib, Log_Message_Receiver, "$Id$")
 
 // Type based log message receiver
 template<ACE_SYNCH_DECL> void
-Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname,
-                                                        ACE_Log_Record &record)
+Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (char const *hostname,
+						      ACE_Log_Record &record)
 {
 #if defined (ACE_HAS_THREADS)
     static ACE_SYNCH_MUTEX_T lock_;
@@ -24,7 +24,7 @@ Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostnam
 }
 
 template<ACE_SYNCH_DECL> void
-Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_output (const ACE_TCHAR *hostname,
+Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_output (char const *hostname,
                                                         ACE_Log_Record &record,
                                                         ostream *outputfile)
 {
@@ -106,8 +106,8 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::detach (Log_Message_Receiver_Impl<ACE_
 
 // Type based log message receiver
 template<ACE_SYNCH_DECL> void
-Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname,
-                                                      ACE_Log_Record &record)
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (char const *hostname,
+						    ACE_Log_Record &record)
 {
   ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, print_lock_));
   record.print (hostname,
@@ -116,7 +116,7 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname,
 }
 
 template<ACE_SYNCH_DECL> void
-Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_output (const ACE_TCHAR *hostname,
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_output (char const *hostname,
                                                       ACE_Log_Record &record,
                                                       ostream *outputfile)
 {
@@ -152,15 +152,15 @@ Log_Message_Receiver<ACE_SYNCH_USE>::Log_Message_Receiver
 
 // Type based log message receiver
 template<ACE_SYNCH_DECL> void
-Log_Message_Receiver<ACE_SYNCH_USE>::log_record(const ACE_TCHAR *hostname,
-                                                ACE_Log_Record &record)
+Log_Message_Receiver<ACE_SYNCH_USE>::log_record(char const *hostname,
+                                              ACE_Log_Record &record)
 {
   ACE_ASSERT (receiver_impl_ != 0);
   receiver_impl_->log_record (hostname, record);
 }
 
 template<ACE_SYNCH_DECL> void
-Log_Message_Receiver<ACE_SYNCH_USE>::log_output(const ACE_TCHAR *hostname,
+Log_Message_Receiver<ACE_SYNCH_USE>::log_output(char const *hostname,
                                                 ACE_Log_Record &record,
                                                 ostream *outputfile)
 {
diff --git a/netsvcs/lib/Log_Message_Receiver.h b/netsvcs/lib/Log_Message_Receiver.h
index 1124b3f4884..d72a07ac809 100644
--- a/netsvcs/lib/Log_Message_Receiver.h
+++ b/netsvcs/lib/Log_Message_Receiver.h
@@ -38,7 +38,7 @@
 //  The requiremnts on a log manager receiver, T, are quite simple.
 //  1: There must exist one "log_record" member function with the following
 //     prototype:
-//        void log_record(const ACE_TCHAR *hostname,
+//        void log_record(char const* hostname,
 //                        ACE_Log_Record &record);
 //
 //  2: There must exist a public destructor.
@@ -53,7 +53,7 @@
 //  receiver.
 //
 //  Methods:
-//    void log_record(const ACE_TCHAR* hostname,
+//    void log_record(char const* hostname,
 //                    ACE_Log_Record& record)
 //  Description:
 //    Processes the log record "record" from the host "hostname"
@@ -104,12 +104,12 @@ class Static_Log_Message_Receiver
   //  prints the content of log_records on stderr.
 
 public:
-  static void log_record(const ACE_TCHAR *hostname,
+  static void log_record(const char *hostname,
                          ACE_Log_Record &record);
   // Prints the log_record to stderr using record.print (hostname, 0, stderr).
   // Serializes the output by using a ACE_SYNCH_MUTEX.
 
-  static void log_output(const ACE_TCHAR *hostname,
+  static void log_output(const char *hostname,
                          ACE_Log_Record &record,
                          ostream *output);
   // Prints the log_record to a user specified ostream.
@@ -159,10 +159,10 @@ public:
   Log_Message_Receiver(Log_Message_Receiver<ACE_SYNCH_USE> const &rhs);
   ~Log_Message_Receiver (void);
 
-  void log_record (const ACE_TCHAR *hostname,
+  void log_record (const char *hostname,
                    ACE_Log_Record &record);
 
-  void log_output(const ACE_TCHAR *hostname,
+  void log_output(const char *hostname,
                   ACE_Log_Record &record,
                   ostream *output);
 private:
@@ -185,10 +185,10 @@ public:
   static Log_Message_Receiver_Impl *attach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body);
   static void detach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body);
 
-  void log_record (const ACE_TCHAR *hostname,
+  void log_record (const char *hostname,
                    ACE_Log_Record &record);
 
-  void log_output(const ACE_TCHAR *hostname,
+  void log_output(const char *hostname,
                   ACE_Log_Record &record,
                   ostream *output);
 
diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am
index 7fd980d3c3b..a527f3ef54b 100644
--- a/netsvcs/lib/Makefile.am
+++ b/netsvcs/lib/Makefile.am
@@ -1,51 +1,53 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
+##---------------------------------------------------------------------------
+##       $Id$
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##       Makefile for the server-side ACE network services
 ##
-## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+##---------------------------------------------------------------------------
 
-ACE_BUILDDIR = $(top_builddir)
+##
+##  Process this file with automake to create Makefile.in
+##
 
-## Makefile.netsvcs.am 
-noinst_LTLIBRARIES = libnetsvcs.la
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
-libnetsvcs_la_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR) \
-  -DACE_NETSVCS_BUILD_DLL
+lib_LTLIBRARIES = libnetsvcs.la
 
 libnetsvcs_la_SOURCES = \
-  Base_Optimizer.cpp \
-  Client_Logging_Handler.cpp \
-  Log_Message_Receiver.cpp \
-  Name_Handler.cpp \
-  Server_Logging_Handler.cpp \
-  TS_Clerk_Handler.cpp \
-  TS_Server_Handler.cpp \
-  Token_Handler.cpp
-
-libnetsvcs_la_LIBADD = \
- $(top_builddir)/ace/libACE.la
+         Base_Optimizer.cpp  \
+         Client_Logging_Handler.cpp  \
+         Log_Message_Receiver.cpp  \
+         Name_Handler.cpp  \
+         Server_Logging_Handler.cpp  \
+         Server_Logging_Handler_T.cpp  \
+         TS_Clerk_Handler.cpp  \
+         TS_Server_Handler.cpp  \
+         Token_Handler.cpp
+
+libnetsvcs_la_LDFLAGS = \
+         -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
 noinst_HEADERS = \
-  Base_Optimizer.h \
-  Client_Logging_Handler.h \
-  Log_Message_Receiver.h \
-  Name_Handler.h \
-  Server_Logging_Handler.h \
-  Server_Logging_Handler_T.h \
-  TS_Clerk_Handler.h \
-  TS_Server_Handler.h \
-  Token_Handler.h \
-  Server_Logging_Handler_T.cpp
+         Base_Optimizer.h  \
+         Client_Logging_Handler.h  \
+         Log_Message_Receiver.h  \
+         Name_Handler.h  \
+         Server_Logging_Handler.h  \
+         Server_Logging_Handler_T.h  \
+         TS_Clerk_Handler.h  \
+         TS_Server_Handler.h  \
+         Token_Handler.h
 
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
-	-rm -rf ptrepository SunWS_cache Templates.DB
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
+
+## What do we about the below?  It was in the original libnetsvcs Makefile.
+##  ifeq ($(SUPPRESS_DASH_G),1)
+##  #### Build this target without -g on some platforms.
+##  $(VDIR)Server_Logging_Handler.o $(VSHDIR)Server_Logging_Handler.$(SOEXT):
+##          $(COMPILE-NO_DASH_G.cc) -o $@ $<
+##  endif # SUPPRESS_DASH_G
+
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index a0c20e4c386..63bb145c537 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #define ACE_BUILD_SVC_DLL
 
 #include "ace/Containers.h"
@@ -44,15 +42,15 @@ template ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX> *
 #define ACE_LIST_MAP(INDEX, MASK) (((unsigned long) (INDEX & MASK)) >> 3)
 
 int
-ACE_Name_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
+ACE_Name_Acceptor::parse_args (int argc, char *argv[])
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Acceptor::parse_args"));
+  ACE_TRACE ("ACE_Name_Acceptor::parse_args");
 
   int service_port = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_LOG_MSG->open (ACE_TEXT ("Name Service"));
+  ACE_LOG_MSG->open ("Name Service");
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Opt get_opt (argc, argv, "p:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -63,7 +61,7 @@ ACE_Name_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                            ACE_TEXT ("%n:\n[-p server-port]\n")),
+                            "%n:\n[-p server-port]\n%a", 1),
                            -1);
         }
     }
@@ -73,9 +71,9 @@ ACE_Name_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ACE_Name_Acceptor::init (int argc, ACE_TCHAR *argv[])
+ACE_Name_Acceptor::init (int argc, char *argv[])
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Acceptor::init"));
+  ACE_TRACE ("ACE_Name_Acceptor::init");
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -87,11 +85,11 @@ ACE_Name_Acceptor::init (int argc, ACE_TCHAR *argv[])
                   ACE_Reactor::instance (),
                   0, 0, 0,
                   &this->scheduling_strategy_,
-                  ACE_TEXT ("Name Server"),
-                  ACE_TEXT ("ACE naming service")) == -1)
+                  "Name Server",
+                  "ACE naming service") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%n: %p on port %d\n"),
-                       ACE_TEXT ("acceptor::open failed"),
+                       "%n: %p on port %d\n",
+                       "acceptor::open failed",
                        this->service_addr_.get_port_number ()),
                       -1);
 
@@ -105,14 +103,14 @@ ACE_Name_Acceptor::init (int argc, ACE_TCHAR *argv[])
   // Figure out what port we're really bound to.
   if (this->acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("get_local_addr")),
+                       "%p\n",
+                       "get_local_addr"),
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("starting up Name Server at port %d on handle %d\n"),
-              server_addr.get_port_number (),
-              this->acceptor ().get_handle ()));
+              "starting up Name Server at port %d on handle %d\n",
+             server_addr.get_port_number (),
+             this->acceptor ().get_handle ()));
   return 0;
 }
 
@@ -126,7 +124,7 @@ ACE_SVC_FACTORY_DEFINE (ACE_Name_Acceptor)
 ACE_Name_Handler::ACE_Name_Handler (ACE_Thread_Manager *tm)
   : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (tm)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::ACE_Name_Handler"));
+  ACE_TRACE ("ACE_Name_Handler::ACE_Name_Handler");
 
   // Set up pointers to member functions for the top-level dispatching
   // of client requests.
@@ -167,13 +165,13 @@ ACE_Name_Handler::ACE_Name_Handler (ACE_Thread_Manager *tm)
 /* VIRTUAL */ int
 ACE_Name_Handler::open (void *)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::open"));
+  ACE_TRACE ("ACE_Name_Handler::open");
 
   // Call down to our parent to register ourselves with the Reactor.
   if (ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::open (0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("open")),
+                       "%p\n",
+                       "open"),
                       -1);
   return 0;
 }
@@ -184,7 +182,7 @@ ACE_Name_Handler::open (void *)
 ACE_Name_Handler::send_reply (ACE_INT32 status,
                               ACE_UINT32 err)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::send_reply"));
+  ACE_TRACE ("ACE_Name_Handler::send_reply");
   void *buf;
   this->name_reply_.msg_type (status);
   this->name_reply_.errnum (err);
@@ -199,8 +197,8 @@ ACE_Name_Handler::send_reply (ACE_INT32 status,
 
   if (n != len)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n, expected len = %d, actual len = %d"),
-                       ACE_TEXT ("send failed"),
+                       "%p\n, expected len = %d, actual len = %d",
+                      "send failed",
                        len,
                        n),
                       -1);
@@ -211,21 +209,21 @@ ACE_Name_Handler::send_reply (ACE_INT32 status,
 /* VIRTUAL */ int
 ACE_Name_Handler::send_request (ACE_Name_Request &request)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::send_request"));
+  ACE_TRACE ("ACE_Name_Handler::send_request");
   void *buffer;
   ssize_t length = request.encode (buffer);
 
   if (length == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("encode failed")),
+                       "%p\n",
+                       "encode failed"),
                       -1);
   // Transmit request via a blocking send.
 
   if (this->peer ().send_n (buffer, length) != length)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("send_n failed")),
+                       "%p\n",
+                       "send_n failed"),
                       -1);
   return 0;
 }
@@ -236,7 +234,7 @@ ACE_Name_Handler::send_request (ACE_Name_Request &request)
 /* VIRTUAL */ int
 ACE_Name_Handler::abandon (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::abandon"));
+  ACE_TRACE ("ACE_Name_Handler::abandon");
   return this->send_reply (-1, errno);
 }
 
@@ -245,7 +243,7 @@ ACE_Name_Handler::abandon (void)
 /* VIRTUAL */ int
 ACE_Name_Handler::handle_timeout (const ACE_Time_Value &, const void *)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::handle_timeout"));
+  ACE_TRACE ("ACE_Name_Handler::handle_timeout");
   return this->abandon ();
 }
 
@@ -254,7 +252,7 @@ ACE_Name_Handler::handle_timeout (const ACE_Time_Value &, const void *)
 /* VIRTUAL */ ACE_HANDLE
 ACE_Name_Handler::get_handle (void) const
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::get_handle"));
+  ACE_TRACE ("ACE_Name_Handler::get_handle");
   return this->peer ().get_handle ();
 }
 
@@ -263,7 +261,7 @@ ACE_Name_Handler::get_handle (void) const
 /* VIRTUAL */ int
 ACE_Name_Handler::dispatch (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::dispatch"));
+  ACE_TRACE ("ACE_Name_Handler::dispatch");
   // Dispatch the appropriate request.
   int index = this->name_request_.msg_type ();
 
@@ -283,7 +281,7 @@ ACE_Name_Handler::dispatch (void)
 /* VIRTUAL */ int
 ACE_Name_Handler::recv_request (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::recv_request"));
+  ACE_TRACE ("ACE_Name_Handler::recv_request");
   // Read the first 4 bytes to get the length of the message This
   // implementation assumes that the first 4 bytes are the length of
   // the message.
@@ -294,11 +292,11 @@ ACE_Name_Handler::recv_request (void)
     case -1:
       /* FALLTHROUGH */
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("****************** recv_request returned -1\n")));
+                  "****************** recv_request returned -1\n"));
     default:
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
-                  ACE_TEXT ("recv failed"),
+                  "%p got %d bytes, expected %d bytes\n",
+                 "recv failed",
                   n,
                   sizeof (ACE_UINT32)));
       /* FALLTHROUGH */
@@ -316,7 +314,7 @@ ACE_Name_Handler::recv_request (void)
         if (length > (ssize_t) sizeof this->name_request_)
           {
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("length %d too long\n"),
+                        "length %d too long\n",
                         length));
             return this->abandon ();
           }
@@ -330,8 +328,8 @@ ACE_Name_Handler::recv_request (void)
         // Subtract off the size of the part we skipped over...
         if (n != (length - (ssize_t) sizeof (ACE_UINT32)))
           {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p expected %d, got %d\n"),
-                       ACE_TEXT ("invalid length"), length, n));
+            ACE_ERROR ((LM_ERROR, "%p expected %d, got %d\n",
+                       "invalid length", length, n));
             return this->abandon ();
           }
 
@@ -339,8 +337,8 @@ ACE_Name_Handler::recv_request (void)
         if (this->name_request_.decode () == -1)
           {
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("%p\n"),
-                        ACE_TEXT ("decode failed")));
+                        "%p\n",
+                        "decode failed"));
             return this->abandon ();
           }
       }
@@ -354,7 +352,7 @@ ACE_Name_Handler::recv_request (void)
 /* VIRTUAL */ int
 ACE_Name_Handler::handle_input (ACE_HANDLE)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::handle_input"));
+  ACE_TRACE ("ACE_Name_Handler::handle_input");
 
   if (this->recv_request () == -1)
     return -1;
@@ -365,14 +363,14 @@ ACE_Name_Handler::handle_input (ACE_HANDLE)
 int
 ACE_Name_Handler::bind (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::bind"));
+  ACE_TRACE ("ACE_Name_Handler::bind");
   return this->shared_bind (0);
 }
 
 int
 ACE_Name_Handler::rebind (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::rebind"));
+  ACE_TRACE ("ACE_Name_Handler::rebind");
   int result = this->shared_bind (1);
   return result == 1 ? 0 : result;
 }
@@ -380,7 +378,7 @@ ACE_Name_Handler::rebind (void)
 int
 ACE_Name_Handler::shared_bind (int rebind)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::shared_bind"));
+  ACE_TRACE ("ACE_Name_Handler::shared_bind");
   ACE_NS_WString a_name (this->name_request_.name (),
                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
   ACE_NS_WString a_value (this->name_request_.value (),
@@ -390,7 +388,7 @@ ACE_Name_Handler::shared_bind (int rebind)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("request for BIND \n")));
+                  "request for BIND \n"));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->bind (a_name,
                                                   a_value,
@@ -400,7 +398,7 @@ ACE_Name_Handler::shared_bind (int rebind)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("request for REBIND \n")));
+                  "request for REBIND \n"));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->rebind (a_name,
                                                     a_value,
@@ -417,9 +415,9 @@ ACE_Name_Handler::shared_bind (int rebind)
 int
 ACE_Name_Handler::resolve (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::resolve"));
+  ACE_TRACE ("ACE_Name_Handler::resolve");
 #if 0
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for RESOLVE \n")));
+  ACE_DEBUG ((LM_DEBUG, "request for RESOLVE \n"));
 #endif /* 0 */
   ACE_NS_WString a_name (this->name_request_.name (),
                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
@@ -450,9 +448,9 @@ ACE_Name_Handler::resolve (void)
 int
 ACE_Name_Handler::unbind (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::unbind"));
+  ACE_TRACE ("ACE_Name_Handler::unbind");
 #if 0
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for UNBIND \n")));
+  ACE_DEBUG ((LM_DEBUG, "request for UNBIND \n"));
 #endif /* 0 */
   ACE_NS_WString a_name (this->name_request_.name (),
                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
@@ -466,7 +464,7 @@ ACE_Name_Handler::unbind (void)
 ACE_Name_Request
 ACE_Name_Handler::name_request (ACE_NS_WString *one_name)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::name_request"));
+  ACE_TRACE ("ACE_Name_Handler::name_request");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_name_urep (one_name->rep ());
   return ACE_Name_Request (ACE_Name_Request::LIST_NAMES,
                            one_name_urep.get (),
@@ -478,7 +476,7 @@ ACE_Name_Handler::name_request (ACE_NS_WString *one_name)
 ACE_Name_Request
 ACE_Name_Handler::value_request (ACE_NS_WString *one_value)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::value_request"));
+  ACE_TRACE ("ACE_Name_Handler::value_request");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_value_urep (one_value->rep ());
   return ACE_Name_Request (ACE_Name_Request::LIST_VALUES,
                            0, 0,
@@ -490,7 +488,7 @@ ACE_Name_Handler::value_request (ACE_NS_WString *one_value)
 ACE_Name_Request
 ACE_Name_Handler::type_request (ACE_NS_WString *one_type)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::type_request"));
+  ACE_TRACE ("ACE_Name_Handler::type_request");
   return ACE_Name_Request (ACE_Name_Request::LIST_TYPES,
                            0, 0,
                            0, 0,
@@ -501,7 +499,7 @@ ACE_Name_Handler::type_request (ACE_NS_WString *one_type)
 int
 ACE_Name_Handler::lists (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::lists"));
+  ACE_TRACE ("ACE_Name_Handler::lists");
 
   ACE_PWSTRING_SET set;
   ACE_NS_WString pattern (this->name_request_.name (),
@@ -552,7 +550,7 @@ ACE_Name_Handler::lists (void)
 int
 ACE_Name_Handler::lists_entries (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::lists_entries"));
+  ACE_TRACE ("ACE_Name_Handler::lists_entries");
   ACE_BINDING_SET set;
   ACE_NS_WString pattern (this->name_request_.name (),
                           this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
@@ -571,7 +569,7 @@ ACE_Name_Handler::lists_entries (void)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("request for LIST_NAME_ENTRIES \n")));
+                  "request for LIST_NAME_ENTRIES \n"));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->
         ACE_Naming_Context::list_name_entries (set, pattern);
@@ -580,7 +578,7 @@ ACE_Name_Handler::lists_entries (void)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("request for LIST_VALUE_ENTRIES \n")));
+                  "request for LIST_VALUE_ENTRIES \n"));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->
         ACE_Naming_Context::list_value_entries (set, pattern);
@@ -589,7 +587,7 @@ ACE_Name_Handler::lists_entries (void)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("request for LIST_TYPE_ENTRIES \n")));
+                  "request for LIST_TYPE_ENTRIES \n"));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->
         ACE_Naming_Context::list_type_entries (set, pattern);
@@ -641,9 +639,9 @@ ACE_Name_Handler::lists_entries (void)
 
 ACE_Name_Handler::~ACE_Name_Handler (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::~ACE_Name_Handler"));
+  ACE_TRACE ("ACE_Name_Handler::~ACE_Name_Handler");
 #if 0
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("closing down Handle  %d\n"),
+  ACE_DEBUG ((LM_DEBUG, "closing down Handle  %d\n",
               this->get_handle ()));
 #endif /* 0 */
 }
diff --git a/netsvcs/lib/Name_Handler.h b/netsvcs/lib/Name_Handler.h
index 300da03bfdc..02e0146d13d 100644
--- a/netsvcs/lib/Name_Handler.h
+++ b/netsvcs/lib/Name_Handler.h
@@ -197,10 +197,10 @@ class ACE_Name_Acceptor : public ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOC
   //     This class contains the service-specific methods that can't
   //     easily be factored into the <ACE_Strategy_Acceptor>.
 public:
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
   // Dynamic linking hook.
 
-  int parse_args (int argc, ACE_TCHAR *argv[]);
+  int parse_args (int argc, char *argv[]);
   // Parse svc.conf arguments.
 
 private:
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index abb2d82affb..e3d16f378da 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -34,7 +34,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::AC
   : receiver_ (receiver, ACE_CString (" ", 1))
 #else
   : receiver_ (receiver),
-    host_name_ (ACE_TString (ACE_TEXT (" "), 1))
+    host_name_ (ACE_CString (" ", 1))
 #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */
 {
 }
@@ -49,7 +49,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
   return result > 0 ? 0 : -1;
 }
 
-template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> const ACE_TCHAR *
+template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> const char *
 ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::host_name (void)
 {
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
@@ -77,14 +77,14 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
     default:
     case -1:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("%p at host %s\n"),
-                         ACE_TEXT ("server logger"),
+                         "%p at host %s\n",
+                         "server logger",
                          this->host_name ()),
                         -1);
       /* NOTREACHED */
     case 0:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("closing log daemon at host %C\n"),
+                         "closing log daemon at host %s\n",
                          this->host_name ()),
                         -1);
       /* NOTREACHED */
@@ -100,7 +100,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
 #  if 0
         u_long count = this->request_count_;
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("request count = %d, length = %d\n"),
+                    "request count = %d, length = %d\n",
                     count,
                     length));
 #  endif /* 0 */
@@ -111,10 +111,10 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
                                           length);
         if (n != length)
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("%d != %d, %p at host %C\n"),
+                             "%d != %d, %p at host %s\n",
                              n,
                              length,
-                             ACE_TEXT ("server logger"),
+                             "server logger",
                              this->host_name ()),
                             -1);
 
@@ -135,7 +135,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
           }
         else
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("error, lp.length = %d, n = %d\n"),
+                      "error, lp.length = %d, n = %d\n",
                       lp.length (),
                       n));
         return n;
@@ -154,28 +154,26 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::op
   // Shut off non-blocking IO if it was enabled...
   if (this->peer ().disable (ACE_NONBLOCK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("disable")),
+                       "%p\n",
+                       "disable"),
                       -1);
   ACE_PEER_STREAM_ADDR client_addr;
 
   // Determine the address of the client and display it.
   if (this->peer ().get_remote_addr (client_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("get_remote_addr")),
+                       "%p\n",
+                       "get_remote_addr"),
                       -1);
 
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
-  this->receiver_.m_ =
-    ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ()));
+  this->receiver_.m_ = ACE_CString (client_addr.get_host_name ());
 #else
-  this->host_name_ =
-    ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ()));
+  this->host_name_ = ACE_CString (client_addr.get_host_name ());
 #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) accepted connection from host %C on fd %d\n"),
+              "(%t) accepted connection from host %s on fd %d\n",
               client_addr.get_host_name (),
               this->peer ().get_handle ()));
 
@@ -204,9 +202,9 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::scheduling_strategy (void)
 }
 
 template<class SLH, class LMR, class SST> int
-ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, ACE_TCHAR *argv[])
+ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, char *argv[])
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init"));
+  ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init");
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -218,11 +216,11 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, ACE_TCHAR *argv[])
                   ACE_Reactor::instance (),
                   0, 0, 0,
                   &this->scheduling_strategy(),
-                  ACE_TEXT ("Logging Server"),
-                  ACE_TEXT ("ACE logging service")) == -1)
+                  "Logging Server",
+                  "ACE logging service") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%n: %p on port %d\n"),
-                       ACE_TEXT ("acceptor::open failed"),
+                       "%n: %p on port %d\n",
+                       "acceptor::open failed",
                        this->service_addr_.get_port_number ()),
                       -1);
   // Ignore SIGPIPE so that each <SVC_HANDLER> can handle this on its
@@ -235,26 +233,26 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, ACE_TCHAR *argv[])
   // Figure out what port we're really bound to.
   if (this->acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("get_local_addr")),
+                       "%p\n",
+                       "get_local_addr"),
                       -1);
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("starting up Logging Server at port %d on handle %d\n"),
-              server_addr.get_port_number (),
-              this->acceptor ().get_handle ()));
+              "starting up Logging Server at port %d on handle %d\n",
+             server_addr.get_port_number (),
+             this->acceptor ().get_handle ()));
   return 0;
 }
 
 template<class SLH, class LMR, class SST> int
-ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, ACE_TCHAR *argv[])
+ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, char *argv[])
 {
-  ACE_TRACE (ACE_TEXT ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args"));
+  ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args");
 
   int service_port = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_LOG_MSG->open (ACE_TEXT ("Logging Service"));
+  ACE_LOG_MSG->open ("Logging Service");
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Opt get_opt (argc, argv, "p:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -265,8 +263,8 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, ACE_TCHAR *a
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("%n:\n[-p server-port]\n")),
-                            -1);
+                            "%n:\n[-p server-port]\n%a", 1),
+                           -1);
         }
     }
 
@@ -341,8 +339,8 @@ ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::open (void *)
   // control all the threads.
   if (this->activate (THR_BOUND | THR_DETACHED) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("spawn")),
+                       "%p\n",
+                       "spawn"),
                       -1);
   return 0;
 }
diff --git a/netsvcs/lib/Server_Logging_Handler_T.h b/netsvcs/lib/Server_Logging_Handler_T.h
index 4cf1a5d3fbc..229e4aeb339 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/netsvcs/lib/Server_Logging_Handler_T.h
@@ -76,9 +76,9 @@ protected:
   // a class with no instance data.
 #else
   LOG_MESSAGE_RECEIVER receiver_;
-  ACE_TString host_name_;
+  ACE_CString host_name_;
 #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */
-  const ACE_TCHAR *host_name (void);
+  const char *host_name (void);
   // Name of the host we are connected to.
 
   LOG_MESSAGE_RECEIVER &receiver (void){ return receiver_; }
@@ -106,11 +106,11 @@ class ACE_Server_Logging_Acceptor_T : public ACE_Strategy_Acceptor<SERVER_LOGGIN
   //     easily be factored into the <ACE_Strategy_Acceptor>.
 public:
   ACE_Server_Logging_Acceptor_T (void);
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
   // Dynamic linking hook.
 
 protected:
-  int parse_args (int argc, ACE_TCHAR *argv[]);
+  int parse_args (int argc, char *argv[]);
   // Parse svc.conf arguments.
 
   virtual int make_svc_handler (SERVER_LOGGING_HANDLER *&);
diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp
index 8346156fa47..d8e6a3d7612 100644
--- a/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -28,7 +28,7 @@ ACE_TS_Clerk_Handler::ACE_TS_Clerk_Handler (ACE_TS_Clerk_Processor *processor,
 void
 ACE_TS_Clerk_Handler::state (ACE_TS_Clerk_Handler::State state)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::state"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::state");
   this->state_ = state;
 }
 
@@ -36,7 +36,7 @@ ACE_TS_Clerk_Handler::state (ACE_TS_Clerk_Handler::State state)
 ACE_TS_Clerk_Handler::State
 ACE_TS_Clerk_Handler::state (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::state"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::state");
   return this->state_;
 }
 
@@ -44,7 +44,7 @@ ACE_TS_Clerk_Handler::state (void)
 void
 ACE_TS_Clerk_Handler::timeout (int to)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::timeout"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::timeout");
   if (to > this->max_timeout_)
     to = this->max_timeout_;
 
@@ -57,7 +57,7 @@ ACE_TS_Clerk_Handler::timeout (int to)
 int
 ACE_TS_Clerk_Handler::timeout (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::timeout"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::timeout");
   int old_timeout = this->timeout_;
   this->timeout_ *= 2;
 
@@ -79,7 +79,7 @@ ACE_TS_Clerk_Handler::handle_signal (int, siginfo_t *, ucontext_t *)
 void
 ACE_TS_Clerk_Handler::max_timeout (int mto)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::max_timeout"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::max_timeout");
   this->max_timeout_ = mto;
 }
 
@@ -87,14 +87,14 @@ ACE_TS_Clerk_Handler::max_timeout (int mto)
 int
 ACE_TS_Clerk_Handler::max_timeout (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::max_timeout"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::max_timeout");
   return this->max_timeout_;
 }
 
 int
 ACE_TS_Clerk_Handler::open (void *)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::open"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::open");
   ACE_INET_Addr server_addr;
 
   // Set connection state as established
@@ -104,26 +104,23 @@ ACE_TS_Clerk_Handler::open (void *)
   // reconnections.
 #if !defined (ACE_WIN32)
   if (ACE_Reactor::instance ()->register_handler (SIGPIPE, this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%n: %p\n"),
-                       ACE_TEXT ("register_handler (SIGPIPE)")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%n: %p\n",
+                       "register_handler (SIGPIPE)"), -1);
 #endif /* ACE_WIN32 */
 
   // Register ourselves with the reactor to receive input
   if (ACE_Reactor::instance ()->register_handler (this->get_handle (),
-                                                  this,
+                                                        this,
                                                         ACE_Event_Handler::READ_MASK |
                                                         ACE_Event_Handler::EXCEPT_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%n: %p\n"),
-                ACE_TEXT ("register_handler (this)")));
+    ACE_ERROR ((LM_ERROR, "%n: %p\n", "register_handler (this)"));
 
   // Figure out what remote port we're really bound to.
   else if (this->peer ().get_remote_addr (server_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("get_remote_addr")),
-                       -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_remote_addr"), -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("TS Clerk Daemon connected to port %d on handle %d\n"),
+              "TS Clerk Daemon connected to port %d on handle %d\n",
               server_addr.get_port_number (),
               this->peer ().get_handle ()));
 
@@ -133,7 +130,7 @@ ACE_TS_Clerk_Handler::open (void *)
 ACE_HANDLE
 ACE_TS_Clerk_Handler::get_handle (void) const
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::get_handle"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::get_handle");
   return this->peer().get_handle ();
 }
 
@@ -141,11 +138,10 @@ int
 ACE_TS_Clerk_Handler::handle_close (ACE_HANDLE,
                                     ACE_Reactor_Mask mask)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::handle_close"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::handle_close");
   ACE_UNUSED_ARG (mask);
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shutting down on handle %d\n"),
-              this->get_handle ()));
+  ACE_DEBUG ((LM_DEBUG, "(%t) shutting down on handle %d\n", this->get_handle ()));
 
   return this->reinitiate_connection ();
 }
@@ -153,7 +149,7 @@ ACE_TS_Clerk_Handler::handle_close (ACE_HANDLE,
 int
 ACE_TS_Clerk_Handler::reinitiate_connection (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::reinitiate_connection"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::reinitiate_connection");
   // Skip over deactivated descriptors.
 
   // Set state to connecting so that we don't try to send anything
@@ -161,14 +157,12 @@ ACE_TS_Clerk_Handler::reinitiate_connection (void)
   this->state (ACE_TS_Clerk_Handler::CONNECTING);
   if (this->get_handle () != ACE_INVALID_HANDLE)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) Scheduling reinitiation of connection\n")));
+      ACE_DEBUG ((LM_DEBUG, "(%t) Scheduling reinitiation of connection\n"));
 
       // Reschedule ourselves to try and connect again.
       if (ACE_Reactor::instance ()->schedule_timer (this, 0,
-                                                    this->timeout ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
-                           ACE_TEXT ("schedule_timer")), -1);
+                                                          this->timeout ()) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_timer"), -1);
     }
   return 0;
 }
@@ -177,7 +171,7 @@ ACE_TS_Clerk_Handler::reinitiate_connection (void)
 int
 ACE_TS_Clerk_Handler::handle_input (ACE_HANDLE)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::handle_input"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::handle_input");
   // We're getting a time update message from a server
   ACE_Time_Request reply;
   if (this->recv_reply (reply) != 0)
@@ -207,9 +201,9 @@ int
 ACE_TS_Clerk_Handler::handle_timeout (const ACE_Time_Value &,
                                       const void *)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::handle_timeout"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::handle_timeout");
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) attempting to reconnect to server with timeout = %d\n"),
+              "(%t) attempting to reconnect to server with timeout = %d\n",
               this->timeout_));
 
   // Close down peer to reclaim descriptor if need be. Note this is
@@ -222,21 +216,21 @@ ACE_TS_Clerk_Handler::handle_timeout (const ACE_Time_Value &,
 void
 ACE_TS_Clerk_Handler::remote_addr (ACE_INET_Addr &addr)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::remote_addr"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::remote_addr");
   this->remote_addr_ = addr;
 }
 
 ACE_INET_Addr &
 ACE_TS_Clerk_Handler::remote_addr (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::remote_addr"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::remote_addr");
   return this->remote_addr_;
 }
 
 int
 ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::recv_reply"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::recv_reply");
   const int bytes_expected = reply.size ();
 
   // Since Time_Request messages are fixed size, read the entire
@@ -249,10 +243,10 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply)
         {
         case -1:
           // FALLTHROUGH
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("****************** recv_reply returned -1\n")));
+          ACE_DEBUG ((LM_DEBUG, "****************** recv_reply returned -1\n"));
         default:
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
-                      ACE_TEXT ("recv failed"), n, bytes_expected));
+          ACE_ERROR ((LM_ERROR, "%p got %d bytes, expected %d bytes\n",
+                      "recv failed", n, bytes_expected));
           // FALLTHROUGH
         case 0:
           // We've shutdown unexpectedly
@@ -261,8 +255,7 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply)
         }
     }
   else if (reply.decode () == -1)       // Decode the request into host byte order.
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("decode failed")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "decode failed"), -1);
   return 0;
 }
 
@@ -270,7 +263,7 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply)
 int
 ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time_info)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::send_request"));
+  ACE_TRACE ("ACE_TS_Clerk_Handler::send_request");
   void    *buffer;
   ssize_t length;
 
@@ -285,8 +278,7 @@ ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time
   ACE_Time_Request request (ACE_Time_Request::TIME_UPDATE, 0, 0);
 
   if ((length = request.encode (buffer)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("encode failed")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "encode failed"), -1);
 
   // Compute start time of sending request (needed to compute
   // roundtrip delay)
@@ -294,9 +286,7 @@ ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time
 
   // Send the request
   if (this->peer ().send_n (buffer, length) != length)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("send_n failed")),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send_n failed"), -1);
 
   return 0;
 }
@@ -315,13 +305,13 @@ ACE_TS_Clerk_Processor::ACE_TS_Clerk_Processor ()
                          MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Temporary path too long, ")
-                  ACE_TEXT ("defaulting to current directory\n")));
+                  "Temporary path too long, "
+                  "defaulting to current directory\n"));
       this->poolname_[0] = 0;
     }
 
   // Add the filename to the end
-  ACE_OS::strcat (this->poolname_, ACE_TEXT ("ace-malloc-XXXXXX"));
+  ACE_OS::strcat (this->poolname_, "ace-malloc-XXXXXX");
 
 #endif /* ACE_DEFAULT_BACKING_STORE */
 }
@@ -329,7 +319,7 @@ ACE_TS_Clerk_Processor::ACE_TS_Clerk_Processor ()
 void
 ACE_TS_Clerk_Processor::alloc (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::alloc"));
+  ACE_TRACE ("ACE_TS_Clerk_Processor::alloc");
   ACE_NEW (this->shmem_, ALLOCATOR (this->poolname_));
 
   // Only create the state if it doesn't already exist.
@@ -357,14 +347,14 @@ int
 ACE_TS_Clerk_Processor::handle_timeout (const ACE_Time_Value &,
                                         const void *)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::handle_timeout"));
+  ACE_TRACE ("ACE_TS_Clerk_Processor::handle_timeout");
   return this->update_time ();
 }
 
 int
 ACE_TS_Clerk_Processor::update_time ()
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::update_time"));
+  ACE_TRACE ("ACE_TS_Clerk_Processor::update_time");
   ACE_UINT32 expected_sequence_num = this->cur_sequence_num_;
 
   // Increment sequence number
@@ -390,9 +380,7 @@ ACE_TS_Clerk_Processor::update_time ()
                    time_info.sequence_num_ == expected_sequence_num)
             {
               count++;
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("[%d] Delta time: %d\n"),
-                          count, time_info.delta_time_));
+              ACE_DEBUG ((LM_DEBUG, "[%d] Delta time: %d\n", count, time_info.delta_time_));
 
               // #### Can check here if delta value falls within a threshold ####
               total_delta += time_info.delta_time_;
@@ -418,8 +406,7 @@ ACE_TS_Clerk_Processor::update_time ()
   // Update the last local time
   *(this->system_time_.last_local_time_) = ACE_OS::time (0);
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Average delta time: %d\n"),
-              *(this->system_time_.delta_time_)));
+  ACE_DEBUG ((LM_DEBUG, "Average delta time: %d\n", *(this->system_time_.delta_time_)));
   return 0;
 }
 
@@ -427,7 +414,7 @@ ACE_TS_Clerk_Processor::update_time ()
 int
 ACE_TS_Clerk_Processor::fini (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::fini"));
+  ACE_TRACE ("ACE_TS_Clerk_Processor::fini");
 
   // Cancel the timer
   if (this->timer_id_ != -1)
@@ -457,16 +444,16 @@ ACE_TS_Clerk_Processor::fini (void)
 }
 
 int
-ACE_TS_Clerk_Processor::info (ACE_TCHAR **, size_t) const
+ACE_TS_Clerk_Processor::info (char **, size_t) const
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::info"));
+  ACE_TRACE ("ACE_TS_Clerk_Processor::info");
   return 0;
 }
 
 int
-ACE_TS_Clerk_Processor::init (int argc, ACE_TCHAR *argv[])
+ACE_TS_Clerk_Processor::init (int argc, char *argv[])
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::init"));
+  ACE_TRACE ("ACE_TS_Clerk_Processor::init");
   // Use the options hook to parse the command line arguments and set
   // options.
   this->parse_args (argc, argv);
@@ -494,9 +481,9 @@ ACE_TS_Clerk_Processor::init (int argc, ACE_TCHAR *argv[])
   // Now set up timer to receive updates from server
   // set the timer to go off after timeout value
   this->timer_id_ = ACE_Reactor::instance ()->schedule_timer (this,
-                                                              NULL,
-                                                              ACE_Time_Value (this->timeout_),
-                                                              ACE_Time_Value (this->timeout_));
+                                                                    NULL,
+                                                                    ACE_Time_Value (this->timeout_),
+                                                                    ACE_Time_Value (this->timeout_));
   return 0;
 }
 
@@ -504,16 +491,16 @@ int
 ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler,
                                              ACE_Synch_Options &synch_options)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::initiate_connection"));
-  ACE_TCHAR buf[MAXHOSTNAMELEN + 1];
+  ACE_TRACE ("ACE_TS_Clerk_Processor::initiate_connection");
+  char buf[MAXHOSTNAMELEN + 1];
 
   // Mark ourselves as idle so that the various iterators will ignore
   // us until we are connected/reconnected.
   handler->state (ACE_TS_Clerk_Handler::IDLE);
 
-  if (handler->remote_addr ().addr_to_string (buf, MAXHOSTNAMELEN) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
-                      ACE_TEXT ("can't obtain peer's address")), -1);
+  if (handler->remote_addr ().addr_to_string (buf, sizeof buf) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n",
+                      "can't obtain peer's address"), -1);
 
   // Establish connection with the server.
   if (this->connect (handler,
@@ -523,17 +510,15 @@ ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler,
       if (errno != EWOULDBLOCK)
         {
           handler->state (ACE_TS_Clerk_Handler::FAILED);
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %p on address %s\n"),
-                      ACE_TEXT ("connect"), buf));
+          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_Reactor::instance ()->schedule_timer (handler,
-                                                            0,
-                                                            handler->timeout ()) == -1)
-                ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
-                                   ACE_TEXT ("schedule_timer")), -1);
+                                                                  0,
+                                                                  handler->timeout ()) == -1)
+                ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_timer"), -1);
             }
           else
             // Failures on synchronous connects are reported as errors
@@ -544,29 +529,34 @@ ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler,
         {
           handler->state (ACE_TS_Clerk_Handler::CONNECTING);
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%t) in the process of connecting %s to %s\n"),
-                      synch_options[ACE_Synch_Options::USE_REACTOR] ?
-                       ACE_TEXT ("asynchronously") : ACE_TEXT ("synchronously"),
-                      buf));
+                     "(%t) in the process of connecting %s to %s\n",
+                      synch_options[ACE_Synch_Options::USE_REACTOR]
+                      ? "asynchronously" : "synchronously", buf));
         }
     }
   else
     {
       handler->state (ACE_TS_Clerk_Handler::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) connected to %s on %d\n"),
-                  buf, handler->get_handle ()));
+      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n",
+                 buf, handler->get_handle ()));
     }
   return 0;
 }
 
 int
-ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[])
+ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[])
 {
-  ACE_TRACE (ACE_TESXT ("ACE_TS_Clerk_Processor::parse_args"));
+  ACE_TRACE ("ACE_TS_Clerk_Processor::parse_args");
   ACE_INET_Addr server_addr;
   ACE_TS_Clerk_Handler *handler;
+  char server_host[BUFSIZ];
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:t:p:b"), 0);
+  // Create a default entry
+  ACE_OS::sprintf (server_host, "%s:%d",
+                   ACE_DEFAULT_SERVER_HOST,
+                   ACE_DEFAULT_LOGGING_SERVER_PORT);
+
+  ACE_Get_Opt get_opt (argc, argv, "h:t:p:b", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -591,7 +581,7 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[])
         case 'p':
           // Get the poolname
           ACE_OS::strncpy (this->poolname_,
-                           get_opt.opt_arg (),
+                           ACE_TEXT_CHAR_TO_TCHAR (get_opt.opt_arg ()),
                            sizeof this->poolname_ / sizeof (ACE_TCHAR));
           break;
         case 'b':
@@ -600,7 +590,7 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[])
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("%n:\n[-h hostname:port] [-t timeout] [-p poolname]\n")),
+                             "%n:\n[-h hostname:port] [-t timeout] [-p poolname]\n%a", 1),
                             -1);
         }
     }
@@ -610,14 +600,14 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TS_Clerk_Processor::suspend (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::suspend"));
+  ACE_TRACE ("ACE_TS_Clerk_Processor::suspend");
   return 0;
 }
 
 int
 ACE_TS_Clerk_Processor::resume (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::resume"));
+  ACE_TRACE ("ACE_TS_Clerk_Processor::resume");
   return 0;
 }
 
diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h
index efad8fac6e1..8e44d8cb2e3 100644
--- a/netsvcs/lib/TS_Clerk_Handler.h
+++ b/netsvcs/lib/TS_Clerk_Handler.h
@@ -190,13 +190,13 @@ public:
 
 protected:
   // = Dynamic linking hooks.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
   // Called when service is linked.
 
   virtual int fini (void);
   // Called when service is unlinked.
 
-  virtual int info (ACE_TCHAR **strp, size_t length) const;
+  virtual int info (char **strp, size_t length) const;
   // Called to determine info about the service.
 
   // = Scheduling hooks.
@@ -204,7 +204,7 @@ protected:
   virtual int resume (void);
 
 private:
-  int parse_args (int argc, ACE_TCHAR *argv[]);
+  int parse_args (int argc, char *argv[]);
   // Parse svc.conf arguments.
 
   void alloc (void);
diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp
index d0a87fd4c84..74745f9d362 100644
--- a/netsvcs/lib/TS_Server_Handler.cpp
+++ b/netsvcs/lib/TS_Server_Handler.cpp
@@ -38,15 +38,15 @@ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 int
-ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
+ACE_TS_Server_Acceptor::parse_args (int argc, char *argv[])
 {
   ACE_TRACE ("ACE_TS_Server_Acceptor::parse_args");
 
   int service_port = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_LOG_MSG->open (ACE_TEXT ("Time Service"));
+  ACE_LOG_MSG->open ("Time Service");
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Opt get_opt (argc, argv, "p:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -57,7 +57,7 @@ ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                            ACE_TEXT ("%n:\n[-p server-port]\n"), 1),
+                            "%n:\n[-p server-port]\n%a", 1),
                            -1);
         }
     }
@@ -66,9 +66,9 @@ ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[])
+ACE_TS_Server_Acceptor::init (int argc, char *argv[])
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Acceptor::init"));
+  ACE_TRACE ("ACE_TS_Server_Acceptor::init");
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -79,11 +79,10 @@ ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[])
   if (this->open (this->service_addr_, ACE_Reactor::instance (),
                   0, 0, 0,
                   &this->scheduling_strategy_,
-                  ACE_TEXT ("Time Server"),
-                  ACE_TEXT ("ACE time service")) == -1)
+                  "Time Server", "ACE time service") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%n: %p on port %d\n"),
-                       ACE_TEXT ("acceptor::open failed"),
+                       "%n: %p on port %d\n",
+                       "acceptor::open failed",
                        this->service_addr_.get_port_number ()),
                       -1);
 
@@ -97,14 +96,14 @@ ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[])
   // Figure out what port we're really bound to.
   if (this->acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("get_local_addr")),
+                       "%p\n",
+                       "get_local_addr"),
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("starting up Time Server at port %d on handle %d\n"),
-              server_addr.get_port_number (),
-              this->acceptor ().get_handle ()));
+              "starting up Time Server at port %d on handle %d\n",
+             server_addr.get_port_number (),
+             this->acceptor ().get_handle ()));
   return 0;
 }
 
@@ -117,7 +116,7 @@ ACE_SVC_FACTORY_DEFINE (ACE_TS_Server_Acceptor)
 ACE_TS_Server_Handler::ACE_TS_Server_Handler (ACE_Thread_Manager *tm)
   : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (tm)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::ACE_TS_Server_Handler"));
+  ACE_TRACE ("ACE_TS_Server_Handler::ACE_TS_Server_Handler");
 }
 
 // Activate this instance of the ACE_TS_Server_Handler (called by the
@@ -126,27 +125,27 @@ ACE_TS_Server_Handler::ACE_TS_Server_Handler (ACE_Thread_Manager *tm)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::open (void *)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::open"));
+  ACE_TRACE ("ACE_TS_Server_Handler::open");
 
   ACE_INET_Addr client_addr;
 
   // Determine the address of the client and display it.
   if (this->peer ().get_remote_addr (client_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("get_remote_addr")),
+                       "%p\n",
+                       "get_remote_addr"),
                       -1);
   
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) accepted connection from host %s on fd %d\n"),
+              "(%t) accepted connection from host %s on fd %d\n",
               client_addr.get_host_name (),
               this->peer ().get_handle ()));
 
   // Call down to our parent to register ourselves with the Reactor.
   if (ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::open (0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("open")),
+                       "%p\n",
+                       "open"),
                       -1);
   return 0;
 }
@@ -154,22 +153,22 @@ ACE_TS_Server_Handler::open (void *)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::send_request (ACE_Time_Request &request)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::send_request"));
+  ACE_TRACE ("ACE_TS_Server_Handler::send_request");
   void *buffer;
   ssize_t length = request.encode (buffer);
 
   if (length == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("encode failed")),
+                       "%p\n",
+                       "encode failed"),
                       -1);
 
   // Transmit request via a blocking send.
 
   if (this->peer ().send_n (buffer, length) != length)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("send_n failed")),
+                       "%p\n",
+                       "send_n failed"),
                       -1);
   return 0;
 }
@@ -180,7 +179,7 @@ ACE_TS_Server_Handler::send_request (ACE_Time_Request &request)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::abandon (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::abandon"));
+  ACE_TRACE ("ACE_TS_Server_Handler::abandon");
 
   // Note we are using the time field to report the errno in case of
   // failure.
@@ -192,7 +191,7 @@ ACE_TS_Server_Handler::abandon (void)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::handle_timeout (const ACE_Time_Value &, const void *)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::handle_timeout"));
+  ACE_TRACE ("ACE_TS_Server_Handler::handle_timeout");
   return this->abandon ();
 }
 
@@ -201,7 +200,7 @@ ACE_TS_Server_Handler::handle_timeout (const ACE_Time_Value &, const void *)
 /* VIRTUAL */ ACE_HANDLE
 ACE_TS_Server_Handler::get_handle (void) const
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::get_handle"));
+  ACE_TRACE ("ACE_TS_Server_Handler::get_handle");
   return this->peer ().get_handle ();
 }
 
@@ -210,7 +209,7 @@ ACE_TS_Server_Handler::get_handle (void) const
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::dispatch (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::dispatch"));
+  ACE_TRACE ("ACE_TS_Server_Handler::dispatch");
   // Get the system time and then create an ACE_Time_Request
   time_t t = ACE_OS::time (0);
   ACE_Time_Request rq (ACE_Time_Request::TIME_UPDATE, t);
@@ -223,7 +222,7 @@ ACE_TS_Server_Handler::dispatch (void)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::recv_request (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::recv_request"));
+  ACE_TRACE ("ACE_TS_Server_Handler::recv_request");
   ssize_t bytes_expected = this->time_request_.size ();
 
   // Since Time_Request messages are fixed size, read the entire
@@ -235,12 +234,11 @@ ACE_TS_Server_Handler::recv_request (void)
         {
         case -1:
           /* FALLTHROUGH */
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("****************** recv_request returned -1\n")));
+          ACE_DEBUG ((LM_DEBUG, "****************** recv_request returned -1\n"));
         default:
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
-                      ACE_TEXT ("recv failed"),
+                      "%p got %d bytes, expected %d bytes\n",
+                      "recv failed",
                       n,
                       bytes_expected));
           /* FALLTHROUGH */
@@ -257,9 +255,7 @@ ACE_TS_Server_Handler::recv_request (void)
       // Decode the request into host byte order.
       if (this->time_request_.decode () == -1)
         {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%p\n"),
-                      ACE_TEXT ("decode failed")));
+          ACE_ERROR ((LM_ERROR, "%p\n", "decode failed"));
           return this->abandon ();
         }
     }
@@ -272,7 +268,7 @@ ACE_TS_Server_Handler::recv_request (void)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::handle_input (ACE_HANDLE)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::handle_input"));
+  ACE_TRACE ("ACE_TS_Server_Handler::handle_input");
 
   if (this->recv_request () == -1)
     return -1;
@@ -282,8 +278,8 @@ ACE_TS_Server_Handler::handle_input (ACE_HANDLE)
 
 ACE_TS_Server_Handler::~ACE_TS_Server_Handler (void)
 {
-  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler"));
+  ACE_TRACE ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler");
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("closing down Handle %d\n"),
+              "closing down Handle %d\n",
               this->get_handle ()));
 }
diff --git a/netsvcs/lib/TS_Server_Handler.h b/netsvcs/lib/TS_Server_Handler.h
index 4aee2da517e..3ab5e51427a 100644
--- a/netsvcs/lib/TS_Server_Handler.h
+++ b/netsvcs/lib/TS_Server_Handler.h
@@ -100,10 +100,10 @@ class ACE_TS_Server_Acceptor : public ACE_Strategy_Acceptor<ACE_TS_Server_Handle
   //     easily be factored into the <ACE_Strategy_Acceptor>.
 
 public:
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
   // Dynamic linking hook.
 
-  int parse_args (int argc, ACE_TCHAR *argv[]);
+  int parse_args (int argc, char *argv[]);
   // Parse svc.conf arguments.
 
 private:
diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am
index b1dbc676a98..6e1c58949a2 100644
--- a/netsvcs/servers/Makefile.am
+++ b/netsvcs/servers/Makefile.am
@@ -1,33 +1,21 @@
-##  Process this file with automake to create Makefile.in
+##----------------------------------------------------------------------------
+##       $Id$
 ##
-## $Id$
+##       Makefile.am for the netsvcs server example
+##----------------------------------------------------------------------------
+
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##  Process this file with automake to create Makefile.in
 ##
-## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
 
-ACE_ROOT = $(top_srcdir)
-ACE_BUILDDIR = $(top_builddir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/netsvcs/lib
 
-## Makefile.Netsvcs_server.am 
 noinst_PROGRAMS = main
 
-main_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/netsvcs/lib
-
-main_SOURCES = \
-  main.cpp
+main_SOURCES = main.cpp
+main_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \
+             $(top_builddir)/ace/libACE.la
 
-main_LDADD = \
- $(top_builddir)/netsvcs/lib/libnetsvcs.la $(top_builddir)/ace/libACE.la
+noinst_DATA = svc.conf
 
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
-	-rm -rf ptrepository SunWS_cache Templates.DB
+EXTRA_DIST = $(noinst_DATA)
diff --git a/netsvcs/servers/main.cpp b/netsvcs/servers/main.cpp
index b134b8db7c7..bd75b4e046f 100644
--- a/netsvcs/servers/main.cpp
+++ b/netsvcs/servers/main.cpp
@@ -12,7 +12,7 @@
 ACE_RCSID(servers, main, "$Id$")
 
 int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+main (int argc, char *argv[])
 {
 
   // Try to link in the svc.conf entries dynamically.
@@ -25,8 +25,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       if (errno != ENOENT)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("open")),
+                           "%p\n",
+                           "open"),
                           1);
       else // Use static linking.
         {
@@ -39,83 +39,76 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           // ACE_Service_Object_Ptr which is an <auto_ptr> specialized
           // for ACE_Service_Object.
 
-          ACE_TCHAR *l_argv[3];
-          ACE_TCHAR name_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_NAME_SERVER_PORT_STR;
+          char *l_argv[3];
+          char name_port[] = "-p " ACE_DEFAULT_NAME_SERVER_PORT_STR;
 
           l_argv[0] = name_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_1 = ACE_SVC_INVOKE (ACE_Name_Acceptor);
 
           if (sp_1->init (1, l_argv) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               ACE_TEXT ("Name Service")),
-                              1);
+            ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Name Service",
+                        1));
 
-          ACE_TCHAR time_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_TIME_SERVER_PORT_STR;
+          char time_port[] = "-p " ACE_DEFAULT_TIME_SERVER_PORT_STR;
           l_argv[0] = time_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor);
 
           if (sp_2->init (1, l_argv) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               ACE_TEXT ("TS Server Acceptor")),
-                              1);
+            ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "TS Server Acceptor", 1));
 
-          ACE_TCHAR clerk_port[] = ACE_TEXT ("-p 10011");
+          char clerk_port[] = "-p 10011";
           l_argv[0] = argv[0];
           l_argv[1] = clerk_port;
           l_argv[2] = 0;
           ACE_Service_Object_Ptr sp_3 = ACE_SVC_INVOKE (ACE_TS_Clerk_Processor);
 
           if (sp_3->init (2, l_argv) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               ACE_TEXT ("TS Clerk Processor")),
-                              1);
+            ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "TS Clerk Processor",
+                        1));
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
-          ACE_TCHAR token_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_TOKEN_SERVER_PORT_STR;
+          char token_port[] = "-p " ACE_DEFAULT_TOKEN_SERVER_PORT_STR;
           l_argv[0] = token_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor);
 
           if (sp_4->init (1, l_argv) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               ACE_TEXT ("Token Service")),
-                              1);
+            ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Token Service",
+                        1));
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
-          ACE_TCHAR thr_logging_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR;
+          char thr_logging_port[] = "-p " ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR;
           l_argv[0] = thr_logging_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_5 =
             ACE_SVC_INVOKE (ACE_Thr_Server_Logging_Acceptor);
 
           if (sp_5->init (1, l_argv) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               ACE_TEXT ("Threaded Logging Server")),
-                              1);
+            ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Threaded Logging Server",
+                        1));
 
-          ACE_TCHAR logging_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
+          char logging_port[] = "-p " ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
           l_argv[0] = logging_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_6 =
             ACE_SVC_INVOKE (ACE_Server_Logging_Acceptor);
 
           if (sp_6->init (1, l_argv) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               ACE_TEXT ("Logging Server")),
-                              1);
+            ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Logging Server", 1));
 
           l_argv[0] = logging_port;
           l_argv[1] = 0;
@@ -123,10 +116,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             ACE_SVC_INVOKE (ACE_Client_Logging_Acceptor);
 
           if (sp_7->init (1, l_argv) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               ACE_TEXT ("Logging Client")),
-                              1);
+            ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Logging Client",
+                        1));
 
           // Run forever, performing the configured services until we
           // are shut down by a SIGINT/SIGQUIT signal.
@@ -138,11 +131,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           sig_set.sig_add (SIGQUIT);
           if (ACE_Reactor::instance ()->register_handler (sig_set,
                                                           &sa) == -1)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("%p\n"),
-                        ACE_TEXT ("register signals")));
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n")));
           else
-            ACE_Reactor::instance ()->run_reactor_event_loop ();
+            ACE_Reactor::run_event_loop ();
 
           // Destructors of ACE_Service_Object_Ptr's automagically
           // call fini().
@@ -167,11 +158,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // gracefully.
       if (ACE_Reactor::instance ()->register_handler (sig_set,
                                                       &sa) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%p\n"),
-                    ACE_TEXT ("register signals2")));
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n")));
       else
-        ACE_Reactor::instance ()->run_reactor_event_loop ();
+        ACE_Reactor::run_event_loop ();
     }
 
   return 0;
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp
index 12d240b29fe..d563b6e832c 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp
@@ -53,7 +53,7 @@ Benchmark_Performance::fini (void)
 void *
 Benchmark_Performance::svc_run (Benchmark_Performance *bp)
 {
-  return (void *) (bp->svc () == -1 ? (long)-1 : (long)0);
+  return (void *) (bp->svc () == -1 ? -1 : 0);
 }
 
 #endif /* ACE_HAS_THREADS */
diff --git a/protocols/ace/RMCast/Makefile.am b/protocols/ace/RMCast/Makefile.am
deleted file mode 100644
index f874ca9a380..00000000000
--- a/protocols/ace/RMCast/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for ACE_RMCast library
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libACE_RMCast.la
-
-## ACE_RMCast library version is same as ACE's version.
-libACE_RMCast_la_LDFLAGS = -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_RMCast_la_SOURCES = \
-  RMCast.cpp \
-  RMCast_Ack_Worker.cpp \
-  RMCast_Fork.cpp \
-  RMCast_Fragment.cpp \
-  RMCast_IO_UDP.cpp \
-  RMCast_Membership.cpp \
-  RMCast_Module.cpp \
-  RMCast_Module_Factory.cpp \
-  RMCast_Partial_Message.cpp \
-  RMCast_Proxy.cpp \
-  RMCast_Reassembly.cpp \
-  RMCast_Receiver_Module.cpp \
-  RMCast_Reliable_Factory.cpp \
-  RMCast_Reordering.cpp \
-  RMCast_Resend_Handler.cpp \
-  RMCast_Resend_Worker.cpp \
-  RMCast_Retransmission.cpp \
-  RMCast_Sequencer.cpp \
-  RMCast_Singleton_Factory.cpp \
-  RMCast_UDP_Event_Handler.cpp \
-  RMCast_UDP_Proxy.cpp \
-  RMCast_UDP_Reliable_Receiver.cpp \
-  RMCast_UDP_Reliable_Sender.cpp
-
-libACE_RMCast_la_LIBADD = $(top_builddir)/ace/libACE.la
-
-## These are template source files.
-TEMPLATE_FILES = \
-  RMCast_Copy_On_Write.cpp \
-  RMCast_Worker.cpp
-
-HEADER_FILES = \
-  RMCast.h \
-  RMCast_Ack_Worker.h \
-  RMCast_Copy_On_Write.h \
-  RMCast_Export.h \
-  RMCast_Fork.h \
-  RMCast_Fragment.h \
-  RMCast_IO_UDP.h \
-  RMCast_Membership.h \
-  RMCast_Module.h \
-  RMCast_Module_Factory.h \
-  RMCast_Partial_Message.h \
-  RMCast_Proxy.h \
-  RMCast_Reassembly.h \
-  RMCast_Receiver_Module.h \
-  RMCast_Reliable_Factory.h \
-  RMCast_Reordering.h \
-  RMCast_Resend_Handler.h \
-  RMCast_Resend_Worker.h \
-  RMCast_Retransmission.h \
-  RMCast_Sequencer.h \
-  RMCast_Singleton_Factory.h \
-  RMCast_UDP_Event_Handler.h \
-  RMCast_UDP_Proxy.h \
-  RMCast_UDP_Reliable_Receiver.h \
-  RMCast_UDP_Reliable_Sender.h \
-  RMCast_Worker.h
-
-INLINE_FILES = \
-  RMCast.i \
-  RMCast_Ack_Worker.i \
-  RMCast_Copy_On_Write.i \
-  RMCast_Fork.i \
-  RMCast_Fragment.i \
-  RMCast_IO_UDP.i \
-  RMCast_Membership.i \
-  RMCast_Module.i \
-  RMCast_Module_Factory.i \
-  RMCast_Partial_Message.i \
-  RMCast_Proxy.i \
-  RMCast_Reassembly.i \
-  RMCast_Receiver_Module.i \
-  RMCast_Reliable_Factory.i \
-  RMCast_Reordering.i \
-  RMCast_Resend_Handler.i \
-  RMCast_Resend_Worker.i \
-  RMCast_Retransmission.i \
-  RMCast_Sequencer.i \
-  RMCast_Singleton_Factory.i \
-  RMCast_UDP_Event_Handler.i \
-  RMCast_UDP_Proxy.i \
-  RMCast_UDP_Reliable_Receiver.i \
-  RMCast_UDP_Reliable_Sender.i \
-  RMCast_Worker.i
-
-pkginclude_HEADERS = \
-  $(HEADER_FILES) \
-  $(INLINE_FILES) \
-  $(TEMPLATE_FILES)
diff --git a/protocols/ace/RMCast/README b/protocols/ace/RMCast/README
deleted file mode 100644
index ed6b22bf1c6..00000000000
--- a/protocols/ace/RMCast/README
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-
-	This directory will contain a simple, small-scale reliable
-multicast framework for ACE.  The framework is based on the ASX
-components of the ACE library: the protocol is implemented as a stack
-of interchangeable "modules", each one in charge of a very small task.
-For example, one module implements fragmentation and reassembly, other
-modules implement retransmission, send ACK and NAK messages, and
-maintain receiver membership.
-
-	The modules are replaced to achieve different levels of
-reliability.  For example, the retransmission module can be either the
-"Best_Effort", "Semi_Reliable" or "Reliable" implementation.  In the
-first case no retransmissions are performed, but lost messages are
-detected and reported to the receiver.  The "Semi_Reliable" case
-messages are held for a pre-specified amount of time, and
-re-transmited if requested, but it is possible to loose some messages
-if multiple re-transmissions fail.  As in the "Best_Effort" case the
-lost messages are detected and flagged to the application.  Finally
-in the "Reliable" mode the senders are flowed controlled until enough
-messages are successfully transmitted.
-
-	In general the stack looks like this:
-
-
-SENDER:
-
-----------------------------------------------------------------
-Buffering	:	Save lost messages
-Retransmission	:	Retransmit 
-----------------------------------------------------------------
-Fragmentation   :	Fragment messages in smaller chunks
-Reassembly	:	and ensure that the IOVMAX limit is not
-		:	reached
-----------------------------------------------------------------
-Transport	:	Encapsulate the specific transport media
-		:	such as TCP/IP, ATM, or shared memory
-		:	Demuxes incoming data to the right chain
-		:	Change control messages and data messages
-		:	to the right dynamic types.
-----------------------------------------------------------------
-
-RECEIVER:
-
-----------------------------------------------------------------
-Lost detection	:	Detect lost messages and send control
-		:	messages back
-----------------------------------------------------------------
-Reassembly	:	Reassemble messages, fragment control
-Fragmentation	:	data
-----------------------------------------------------------------
-Transport	:	Group membership, ACT reception,
-		:	handle keep-alive messages...
-----------------------------------------------------------------
-
-
-@@ TODO: Piggybacking...
diff --git a/protocols/ace/RMCast/RMCast_Export.h b/protocols/ace/RMCast/RMCast_Export.h
deleted file mode 100644
index 51257c4d682..00000000000
--- a/protocols/ace/RMCast/RMCast_Export.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
-// ------------------------------
-#if !defined (ACE_RMCAST_EXPORT_H)
-#define ACE_RMCAST_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL)
-#  define ACE_RMCAST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */
-
-#if !defined (ACE_RMCAST_HAS_DLL)
-#define ACE_RMCAST_HAS_DLL 1
-#endif /* ! ACE_RMCAST_HAS_DLL */
-
-#if defined (ACE_RMCAST_HAS_DLL)
-#  if (ACE_RMCAST_HAS_DLL == 1)
-#    if defined (ACE_RMCAST_BUILD_DLL)
-#      define ACE_RMCast_Export ACE_Proper_Export_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    else
-#      define ACE_RMCast_Export ACE_Proper_Import_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    endif /* ACE_RMCAST_BUILD_DLL */
-#  else
-#    define ACE_RMCast_Export
-#    define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#    define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif   /* ! ACE_RMCAST_HAS_DLL == 1 */
-#else
-#  define ACE_RMCast_Export
-#  define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#  define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif     /* ACE_RMCAST_HAS_DLL */
-
-#endif     /* ACE_RMCAST_EXPORT_H */
-
-// End of auto generated file.
diff --git a/protocols/ace/TMCast/Export.hpp b/protocols/ace/TMCast/Export.hpp
deleted file mode 100644
index f13a69ecefd..00000000000
--- a/protocols/ace/TMCast/Export.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TMCast
-// ------------------------------
-#ifndef TMCAST_EXPORT_H
-#define TMCAST_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TMCAST_HAS_DLL)
-#  define TMCAST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TMCAST_HAS_DLL */
-
-#if !defined (TMCAST_HAS_DLL)
-#define TMCAST_HAS_DLL 1
-#endif /* ! TMCAST_HAS_DLL */
-
-#if defined (TMCAST_HAS_DLL) && (TMCAST_HAS_DLL == 1)
-#  if defined (TMCAST_BUILD_DLL)
-#    define TMCast_Export ACE_Proper_Export_Flag
-#    define TMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TMCAST_BUILD_DLL */
-#    define TMCast_Export ACE_Proper_Import_Flag
-#    define TMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TMCAST_BUILD_DLL */
-#else /* TMCAST_HAS_DLL == 1 */
-#  define TMCast_Export
-#  define TMCAST_SINGLETON_DECLARATION(T)
-#  define TMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TMCAST_HAS_DLL == 1 */
-
-// Set TMCAST_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TMCAST_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TMCAST_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TMCAST_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TMCAST_NTRACE */
-
-#if (TMCAST_NTRACE == 1)
-#  define TMCAST_TRACE(X)
-#else /* (TMCAST_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TMCAST_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TMCAST_NTRACE == 1) */
-
-#endif /* TMCAST_EXPORT_H */
-
-// End of auto generated file.
diff --git a/protocols/ace/TMCast/FaultDetector.hpp b/protocols/ace/TMCast/FaultDetector.hpp
deleted file mode 100644
index ba476cbd367..00000000000
--- a/protocols/ace/TMCast/FaultDetector.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// file      : TMCast/FaultDetector.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "Protocol.hpp"
-
-namespace TMCast
-{
-  class FaultDetector
-  {
-  public:
-    FaultDetector ()
-        : silence_period_ (-1)
-    {
-    }
-
-  public:
-    class Failed {};
-
-
-    void
-    insync ()
-    {
-      silence_period_ = 0;
-    }
-
-    void
-    outsync ()
-    {
-      if (++silence_period_ >= Protocol::FATAL_SILENCE_FRAME)
-      {
-        // cerr << "Silence period has been passed." << endl;
-        // cerr << "Decalring the node failed." << endl;
-        throw Failed ();
-      }
-    }
-
-  private:
-    short silence_period_;
-  };
-}
diff --git a/protocols/ace/TMCast/Group.cpp b/protocols/ace/TMCast/Group.cpp
deleted file mode 100644
index 6cf8c33e47c..00000000000
--- a/protocols/ace/TMCast/Group.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-// file      : TMCast/Group.cpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "Group.hpp"
-
-#include <typeinfo>
-
-// OS primitives
-#include <ace/OS.h>
-#include <ace/Synch.h>
-#include <ace/Time_Value.h>
-#include <ace/SOCK_Dgram_Mcast.h>
-
-#include "Messaging.hpp"
-
-#include "Protocol.hpp"
-
-// Components
-
-#include "LinkListener.hpp"
-#include "FaultDetector.hpp"
-#include "TransactionController.hpp"
-
-namespace TMCast
-{
-  bool
-  operator== (std::type_info const* pa, std::type_info const& b)
-  {
-    return *pa == b;
-  }
-
-  //
-  //
-  //
-  class Terminate : public virtual Message {};
-
-
-  //
-  //
-  //
-  class Failure : public virtual Message {};
-
-
-  //
-  //
-  //
-  class Scheduler
-  {
-  public:
-    Scheduler (ACE_INET_Addr const& addr,
-               char const* id,
-               MessageQueue& out_send_data,
-               MessageQueue& out_recv_data,
-               MessageQueue& out_control)
-
-        : cond_ (mutex_),
-
-          addr_ (addr),
-          sock_ (),
-
-          out_control_ (out_control),
-
-          in_data_ (mutex_),
-          in_link_data_(mutex_),
-          in_control_ (mutex_),
-
-          sync_schedule (ACE_OS::gettimeofday ()),
-
-          transaction_controller_ (in_data_, out_send_data, out_recv_data)
-    {
-      ACE_OS::strncpy (id_, id, Protocol::MEMBER_ID_LENGTH);
-      id_[Protocol::MEMBER_ID_LENGTH - 1] = '\0';
-
-      sock_.set_option (IP_MULTICAST_TTL, 32); // @@ ttl is hardcoded
-
-      in_data_.subscribe (cond_);
-      in_link_data_.subscribe (cond_);
-      in_control_.subscribe (cond_);
-
-      if (ACE_OS::thr_create (&thread_thunk,
-                              this,
-                              THR_JOINABLE,
-                              &thread_) != 0) ::abort ();
-    }
-
-    virtual ~Scheduler ()
-    {
-      {
-        MessageQueueAutoLock lock (in_control_);
-
-        in_control_.push (MessagePtr (new Terminate));
-      }
-
-      if (ACE_OS::thr_join (thread_, &thread_, 0) != 0) ::abort ();
-
-      // cerr << "Scheduler is down." << endl;
-    }
-
-  public:
-    MessageQueue&
-    in_data ()
-    {
-      return in_data_;
-    }
-
-  private:
-    static ACE_THR_FUNC_RETURN
-    thread_thunk (void* arg)
-    {
-      Scheduler* obj = reinterpret_cast<Scheduler*> (arg);
-      obj->execute ();
-      return 0;
-    }
-
-    void
-    execute ()
-    {
-      try
-      {
-        sock_.join (addr_);
-        auto_ptr<LinkListener> ll (new LinkListener (sock_, in_link_data_));
-
-        {
-          AutoLock lock (mutex_);
-
-          // Loop
-          //
-          //
-
-          while (true)
-          {
-            cond_.wait (&sync_schedule);
-
-            // "Loop of Fairness"
-
-            bool done = false;
-
-            do
-            {
-              // control message
-              //
-              //
-              if (!in_control_.empty ())
-              {
-                done = true;
-                break;
-              }
-
-              // outsync
-              //
-              //
-              if (sync_schedule < ACE_OS::gettimeofday ())
-              {
-                // OUTSYNC
-
-                outsync ();
-
-                // schedule next outsync
-                sync_schedule =
-                  ACE_OS::gettimeofday () +
-                  ACE_Time_Value (0, Protocol::SYNC_PERIOD);
-              }
-
-              // link message
-              //
-              //
-              if (!in_link_data_.empty ())
-              {
-                MessagePtr m (in_link_data_.front ());
-                in_link_data_.pop ();
-
-                std::type_info const* exp = &typeid (*m);
-
-                if (exp == typeid (LinkFailure))
-                {
-                  // cerr << "link failure" << endl;
-                  throw false;
-                }
-                else if (exp == typeid (LinkData))
-                {
-
-                  LinkData* data = dynamic_cast<LinkData*> (m.get ());
-
-                  // INSYNC, TL, CT
-
-                  // Filter out loopback.
-                  //
-                  if (ACE_OS::strcmp (data->header().member_id.id, id_) != 0)
-                  {
-                    insync ();
-                    transaction_list ();
-                    current_transaction (data->header().current,
-                                         data->payload (),
-                                         data->size ());
-                  }
-                }
-                else
-                {
-                  // cerr << "unknown message type from link listener: "
-                  //      << typeid (*m).name () << endl;
-                  abort ();
-                }
-              }
-
-              // api message
-              //
-              //
-              if (!in_data_.empty ())
-              {
-                // API
-
-                api ();
-              }
-
-            } while (!in_link_data_.empty() ||
-                     sync_schedule < ACE_OS::gettimeofday ());
-
-            if (done) break;
-          }
-        }
-      }
-      catch (...)
-      {
-        // cerr << "Exception in scheduler loop." << endl;
-        MessageQueueAutoLock lock (out_control_);
-        out_control_.push (MessagePtr (new Failure));
-      }
-    }
-
-    // Events
-    //
-    // Order:
-    //
-    // INSYNC, TSL, VOTE, BEGIN
-    // API
-    // OUTSYNC
-    //
-
-    void
-    insync ()
-    {
-      fault_detector_.insync ();
-    }
-
-    void
-    outsync ()
-    {
-      char buf[Protocol::MAX_MESSAGE_SIZE];
-
-      Protocol::MessageHeader* hdr =
-        reinterpret_cast<Protocol::MessageHeader*> (buf);
-
-      void* data = buf + sizeof (Protocol::MessageHeader);
-
-      hdr->length = sizeof (Protocol::MessageHeader);
-      hdr->check_sum = 0;
-
-      ACE_OS::strcpy (hdr->member_id.id, id_);
-
-      size_t size (0);
-
-      transaction_controller_.outsync (hdr->current, data, size);
-
-      hdr->length += size;
-
-      fault_detector_.outsync ();
-
-      // sock_.send (buf, hdr->length, addr_);
-      sock_.send (buf, hdr->length);
-    }
-
-    void
-    transaction_list ()
-    {
-    }
-
-    void
-    current_transaction (Protocol::Transaction const& t,
-                         void const* payload,
-                         size_t size)
-    {
-      transaction_controller_.current_transaction (t, payload, size);
-    }
-
-    void
-    api ()
-    {
-      transaction_controller_.api ();
-    }
-
-  private:
-    ACE_thread_t thread_;
-
-    ACE_Thread_Mutex mutex_;
-    ACE_Condition<ACE_Thread_Mutex> cond_;
-
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
-
-    char id_[Protocol::MEMBER_ID_LENGTH];
-
-    ACE_INET_Addr addr_;
-    ACE_SOCK_Dgram_Mcast sock_;
-
-    MessageQueue& out_control_;
-
-    MessageQueue  in_data_;
-    MessageQueue  in_link_data_;
-    MessageQueue  in_control_;
-
-    // Protocol state
-    //
-    //
-
-    ACE_Time_Value sync_schedule;
-
-    FaultDetector fault_detector_;
-    TransactionController transaction_controller_;
-  };
-
-
-  //
-  //
-  //
-  class Group::GroupImpl
-  {
-  public:
-    virtual ~GroupImpl ()
-    {
-    }
-
-    GroupImpl (ACE_INET_Addr const& addr, char const* id)
-      throw (Group::Failed)
-        : send_cond_ (mutex_),
-          recv_cond_ (mutex_),
-          failed_ (false),
-          in_send_data_ (mutex_),
-          in_recv_data_ (mutex_),
-          in_control_ (mutex_),
-          scheduler_ (new  Scheduler (addr,
-                                      id,
-                                      in_send_data_,
-                                      in_recv_data_,
-                                      in_control_)),
-          out_data_ (scheduler_->in_data ())
-    {
-      in_send_data_.subscribe (send_cond_);
-      in_recv_data_.subscribe (recv_cond_);
-
-      in_control_.subscribe (send_cond_);
-      in_control_.subscribe (recv_cond_);
-    }
-
-    void
-    send (void const* msg, size_t size)
-      throw (Group::InvalidArg, Group::Failed, Group::Aborted)
-    {
-      if (size > Protocol::MAX_PAYLOAD_SIZE) throw InvalidArg ();
-
-      // Note the potential deadlock if I lock mutex_ and out_data_ in
-      // reverse order.
-
-      MessageQueueAutoLock l1 (out_data_);
-      AutoLock l2 (mutex_);
-
-      throw_if_failed ();
-
-      out_data_.push (MessagePtr (new Send (msg, size)));
-
-      l1.unlock (); // no need to keep it locked
-
-      while (true)
-      {
-        throw_if_failed ();
-
-        if (!in_send_data_.empty ())
-        {
-          MessagePtr m (in_send_data_.front ());
-          in_send_data_.pop ();
-
-          std::type_info const* exp = &typeid (*m);
-
-          if (exp == typeid (TMCast::Aborted))
-          {
-            throw Group::Aborted ();
-          }
-          else if (exp == typeid (Commited))
-          {
-            return;
-          }
-          else
-          {
-            // cerr << "send: group-scheduler messaging protocol violation; "
-            //     << "unexpected message " << typeid (*m).name ()
-            //     << " " << typeid (Aborted).name () << endl;
-
-            abort ();
-          }
-        }
-
-        // cerr << "send: waiting on condition" << endl;
-        send_cond_.wait ();
-        // cerr << "send: wokeup on condition" << endl;
-      }
-    }
-
-
-
-    size_t
-    recv (void* msg, size_t size) throw (Group::Failed, Group::InsufficienSpace)
-    {
-      AutoLock lock (mutex_);
-
-      while (true)
-      {
-        throw_if_failed ();
-
-        if (!in_recv_data_.empty ())
-        {
-          MessagePtr m (in_recv_data_.front ());
-          in_recv_data_.pop ();
-
-          std::type_info const* exp = &typeid (*m);
-
-          if (exp == typeid (Recv))
-          {
-            Recv* data = dynamic_cast<Recv*> (m.get ());
-
-            if (size < data->size ()) throw Group::InsufficienSpace ();
-
-            memcpy (msg, data->payload (), data->size ());
-
-            return data->size ();
-          }
-          else
-          {
-            // cerr << "recv: group-scheduler messaging protocol violation. "
-            //     << "unexpected message " << typeid (*m).name () << endl;
-
-            abort ();
-          }
-        }
-
-        recv_cond_.wait ();
-      }
-    }
-
-  private:
-    void
-    throw_if_failed ()
-    {
-      if (!failed_ && !in_control_.empty ()) failed_ = true;
-
-      if (failed_) throw Group::Failed ();
-    }
-
-  private:
-    ACE_Thread_Mutex mutex_;
-    ACE_Condition<ACE_Thread_Mutex> send_cond_;
-    ACE_Condition<ACE_Thread_Mutex> recv_cond_;
-
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
-
-    bool failed_;
-
-    MessageQueue  in_send_data_;
-    MessageQueue  in_recv_data_;
-    MessageQueue  in_control_;
-
-    auto_ptr<Scheduler> scheduler_;
-
-    MessageQueue& out_data_;
-  };
-
-
-  // Group
-  //
-  //
-  Group::
-  Group (ACE_INET_Addr const& addr, char const* id)
-    throw (Group::Failed)
-      : pimpl_ (new GroupImpl (addr, id))
-  {
-  }
-
-  Group::
-  ~Group ()
-  {
-  }
-
-  void 
-  Group::send (void const* msg, size_t size) throw (Group::InvalidArg, Group::Failed, Group::Aborted)
-  {
-    pimpl_->send (msg, size);
-  }
-
-  size_t 
-  Group::recv (void* msg, size_t size) throw (Group::Failed, Group::InsufficienSpace)
-  {
-    return pimpl_->recv (msg, size);
-  }
-}
diff --git a/protocols/ace/TMCast/Group.hpp b/protocols/ace/TMCast/Group.hpp
deleted file mode 100644
index 416cea0a17d..00000000000
--- a/protocols/ace/TMCast/Group.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// file      : TMCast/Group.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_GROUP_HPP
-#define TMCAST_GROUP_HPP
-
-#include <ace/Auto_Ptr.h>
-#include <ace/INET_Addr.h>
-
-#include "Export.hpp"
-
-namespace TMCast
-{
-  class TMCast_Export Group
-  {
-  public:
-    class Aborted {};
-    class Failed {};
-    class InvalidArg {};
-    class InsufficienSpace {};
-
-  public:
-    ~Group ();
-
-    Group (ACE_INET_Addr const& addr, char const* id) throw (Failed);
-
-  public:
-    void
-    send (void const* msg, size_t size) throw (InvalidArg, Failed, Aborted);
-
-    size_t
-    recv (void* msg, size_t size) throw (Failed, InsufficienSpace);
-
-  private:
-    bool
-    failed ();
-
-  private:
-    class GroupImpl;
-    auto_ptr<GroupImpl> pimpl_;
-
-  private:
-    Group (Group const&);
-
-    Group&
-    operator= (Group const&);
-  };
-}
-
-#endif // TMCAST_GROUP_HPP
diff --git a/protocols/ace/TMCast/GroupFwd.hpp b/protocols/ace/TMCast/GroupFwd.hpp
deleted file mode 100644
index beba06df79d..00000000000
--- a/protocols/ace/TMCast/GroupFwd.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// file      : TMCast/GroupFwd.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_GROUP_FWD_HPP
-#define TMCAST_GROUP_FWD_HPP
-
-#include "Export.hpp"
-
-namespace TMCast
-{
-  class TMCast_Export Group;
-}
-
-#endif // TMCAST_GROUP_FWD_HPP
diff --git a/protocols/ace/TMCast/LinkListener.hpp b/protocols/ace/TMCast/LinkListener.hpp
deleted file mode 100644
index cbb7fd1d5ce..00000000000
--- a/protocols/ace/TMCast/LinkListener.hpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// file      : TMCast/LinkListener.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-// OS primitives
-#include <ace/Synch.h>
-#include <ace/SOCK_Dgram_Mcast.h>
-#include <ace/Refcounted_Auto_Ptr.h>
-
-
-#include "Messaging.hpp"
-
-namespace TMCast
-{
-  //
-  //
-  //
-  class LinkFailure : public virtual Message {};
-
-
-  //
-  //
-  //
-  class LinkData : public virtual Message
-  {
-  public:
-    LinkData (Protocol::MessageHeader const* header,
-              void* payload,
-              size_t size)
-        : size_ (size)
-    {
-      ACE_OS::memcpy (&header_, header, sizeof (Protocol::MessageHeader));
-      ACE_OS::memcpy (payload_, payload, size_);
-    }
-
-    Protocol::MessageHeader const&
-    header () const
-    {
-      return header_;
-    }
-
-    void const*
-    payload () const
-    {
-      return payload_;
-    }
-
-    size_t
-    size () const
-    {
-      return size_;
-    }
-
-  private:
-    Protocol::MessageHeader header_;
-    char payload_[Protocol::MAX_MESSAGE_SIZE];
-    size_t size_;
-  };
-
-  typedef
-  ACE_Refcounted_Auto_Ptr<LinkData, ACE_Null_Mutex>
-  LinkDataPtr;
-
-  //
-  //
-  //
-  class LinkListener
-  {
-  private:
-    class Terminate : public virtual Message {};
-
-  public:
-    LinkListener (ACE_SOCK_Dgram_Mcast& sock, MessageQueue& out)
-        : sock_(sock), out_ (out)
-    {
-      if (ACE_OS::thr_create (&thread_thunk,
-                              this,
-                              THR_JOINABLE,
-                              &thread_) != 0) ::abort ();
-    }
-
-    ~LinkListener ()
-    {
-      {
-        MessageQueueAutoLock lock (control_);
-
-        control_.push (MessagePtr (new Terminate));
-      }
-
-      if (ACE_OS::thr_join (thread_, &thread_, 0) != 0) ::abort ();
-
-      // cerr << "Link listener is down." << endl;
-    }
-
-
-    static ACE_THR_FUNC_RETURN
-    thread_thunk (void* arg)
-    {
-      LinkListener* obj = reinterpret_cast<LinkListener*> (arg);
-
-      obj->execute ();
-      return 0;
-    }
-
-    void
-    execute ()
-    {
-      char msg[Protocol::MAX_MESSAGE_SIZE];
-
-      ssize_t header_size = sizeof (Protocol::MessageHeader);
-
-      // OS::Time timeout (1000000); // one millisecond
-
-      ACE_Time_Value timeout (0, 1000); // one millisecond
-
-      try
-      {
-        while (true)
-        {
-          // Check control message queue
-
-          {
-            MessageQueueAutoLock lock (control_);
-
-            if (!control_.empty ()) break;
-          }
-
-          ACE_INET_Addr junk;
-          ssize_t n = sock_.recv (msg,
-                                  Protocol::MAX_MESSAGE_SIZE,
-                                  junk,
-                                  0,
-                                  &timeout);
-
-          if (n != -1)
-          {
-            if (n < header_size) throw false;
-
-            Protocol::MessageHeader* header =
-              reinterpret_cast<Protocol::MessageHeader*> (msg);
-
-            MessageQueueAutoLock lock (out_);
-
-            out_.push (MessagePtr (new LinkData (header,
-                                                 msg + header_size,
-                                                 n - header_size)));
-          }
-        }
-      }
-      catch (...)
-      {
-        MessageQueueAutoLock lock (out_);
-
-        out_.push (MessagePtr (new LinkFailure));
-      }
-    }
-
-  private:
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
-
-    ACE_thread_t thread_;
-    ACE_SOCK_Dgram_Mcast& sock_;
-    MessageQueue& out_;
-    MessageQueue  control_;
-  };
-}
diff --git a/protocols/ace/TMCast/MTQueue.hpp b/protocols/ace/TMCast/MTQueue.hpp
deleted file mode 100644
index 429a73d45ba..00000000000
--- a/protocols/ace/TMCast/MTQueue.hpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// file      : TMCast/MTQueue.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_MT_QUEUE_HPP
-#define TMCAST_MT_QUEUE_HPP
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Unbounded_Set.h"
-#include "ace/Unbounded_Queue.h"
-#include "ace/os_include/sys/os_types.h"
-
-namespace TMCast
-{
-  template <typename T,
-            typename M,
-            typename C,
-            typename Q = ACE_Unbounded_Queue<T> >
-  class MTQueue
-  {
-  public:
-    typedef T ElementType;
-    typedef M MutexType;
-    typedef C ConditionalType;
-    typedef Q QueueType;
-
-  public:
-
-    MTQueue ()
-        : mutexp_ (new MutexType),
-          mutex_ (*mutexp_),
-          queue_ (),
-          signal_ (false)
-    {
-    }
-
-    MTQueue (MutexType& mutex)
-        : mutexp_ (),
-          mutex_ (mutex),
-          queue_ (),
-          signal_ (false)
-    {
-    }
-
-  public:
-    bool
-    empty () const
-    {
-      return queue_.is_empty ();
-    }
-
-    size_t
-    size () const
-    {
-      return queue_.size ();
-    }
-
-    // typedef typename QueueType::Empty Empty;
-
-    class Empty {};
-
-    T&
-    front ()
-    {
-      ACE_Unbounded_Queue_Iterator<T> f (queue_);
-      T* tmp;
-      if (!f.next (tmp)) throw Empty ();
-
-      return *tmp;
-    }
-
-
-    T const&
-    front () const
-    {
-      ACE_Unbounded_Queue_Const_Iterator<T> f (queue_);
-      T* tmp;
-      if (!f.next (tmp)) throw Empty ();
-
-      return *tmp;
-    }
-
-    /*
-      T&
-      back ()
-      {
-      return queue_.back ();
-      }
-
-
-      T const&
-      back () const
-      {
-      return queue_.back ();
-      }
-    */
-
-    void
-    push (T const& t)
-    {
-      signal_ = empty ();
-      queue_.enqueue_tail (t);
-    }
-
-    void
-    pop ()
-    {
-      T junk;
-      queue_.dequeue_head (junk);
-    }
-
-  public:
-    void
-    lock () const
-    {
-      mutex_.acquire ();
-    }
-
-    void
-    unlock () const
-    {
-      if (signal_)
-      {
-        signal_ = false;
-
-        for (ConditionalSetConstIterator_ i (cond_set_);
-             !i.done ();
-             i.advance ())
-        {
-          ConditionalType** c;
-
-          i.next (c);
-
-          (*c)->signal ();
-        }
-      }
-
-      mutex_.release ();
-    }
-
-    void
-    subscribe (ConditionalType& c)
-    {
-      //@@ should check for duplicates
-      //
-      cond_set_.insert (&c);
-    }
-
-    void
-    unsubscribe (ConditionalType& c)
-    {
-      //@@ should check for absence
-      //
-      cond_set_.remove (&c);
-    }
-
-  private:
-    auto_ptr<MutexType> mutexp_;
-    MutexType& mutex_;
-    QueueType queue_;
-
-    typedef
-    ACE_Unbounded_Set<ConditionalType*>
-    ConditionalSet_;
-
-    typedef
-    ACE_Unbounded_Set_Const_Iterator<ConditionalType*>
-    ConditionalSetConstIterator_;
-
-    ConditionalSet_ cond_set_;
-
-    mutable bool signal_;
-  };
-}
-
-#endif // TMCAST_MT_QUEUE_HPP
diff --git a/protocols/ace/TMCast/Messaging.hpp b/protocols/ace/TMCast/Messaging.hpp
deleted file mode 100644
index 6a1000c3265..00000000000
--- a/protocols/ace/TMCast/Messaging.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// file      : TMCast/Messaging.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_MESSAGING_HPP
-#define TMCAST_MESSAGING_HPP
-
-#include <ace/Synch.h>
-#include <ace/Refcounted_Auto_Ptr.h>
-
-#include "MTQueue.hpp"
-
-namespace TMCast
-{
-  class Message
-  {
-  public:
-    virtual
-    ~Message () {}
-  };
-
-  typedef
-  ACE_Refcounted_Auto_Ptr<Message, ACE_Null_Mutex>
-  MessagePtr;
-
-  typedef
-  MTQueue<MessagePtr, ACE_Thread_Mutex, ACE_Condition<ACE_Thread_Mutex> >
-  MessageQueue;
-
-  struct MessageQueueAutoLock
-  {
-    MessageQueueAutoLock (MessageQueue& q)
-        : q_ (q)
-    {
-      q_.lock ();
-    }
-
-    void
-    unlock ()
-    {
-      q_.unlock ();
-    }
-
-    ~MessageQueueAutoLock ()
-    {
-    q_.unlock ();
-    }
-
-  private:
-    MessageQueue& q_;
-  };
-}
-
-#endif // TMCAST_MESSAGING_HPP
diff --git a/protocols/ace/TMCast/Protocol.cpp b/protocols/ace/TMCast/Protocol.cpp
deleted file mode 100644
index 9d57a97f221..00000000000
--- a/protocols/ace/TMCast/Protocol.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// file      : TMCast/Protocol.cpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "Protocol.hpp"
-
-namespace TMCast
-{
-  namespace Protocol
-  {
-    /*
-      namespace
-      {
-      char const* labels[] = {
-      "NONE", "BEGIN", "COMMIT", "ABORT", "COMMITED", "ABORTED"};
-      }
-
-      std::string
-      tslabel (Protocol::TransactionStatus s)
-      {
-      return labels[s];
-      }
-
-      std::ostream&
-      operator << (std::ostream& o, Transaction const& t)
-      {
-      return o << "{" << t.id << "; " << tslabel (t.status) << "}";
-      }
-    */
-  }
-}
diff --git a/protocols/ace/TMCast/Protocol.hpp b/protocols/ace/TMCast/Protocol.hpp
deleted file mode 100644
index d5ae6a50cd6..00000000000
--- a/protocols/ace/TMCast/Protocol.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// file      : TMCast/Protocol.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_PROTOCOL_HPP
-#define TMCAST_PROTOCOL_HPP
-
-namespace TMCast
-{
-  namespace Protocol
-  {
-    //
-    //
-    //
-    unsigned long const MEMBER_ID_LENGTH = 38;
-
-    struct MemberId
-    {
-      char id[MEMBER_ID_LENGTH];
-      /*
-        unsigned long  ip;
-        unsigned short port;
-      */
-    };
-
-    //
-    //
-    //
-    typedef unsigned short TransactionId;
-
-
-
-    typedef unsigned char  TransactionStatus;
-
-    TransactionStatus const TS_BEGIN    = 1;
-    TransactionStatus const TS_COMMIT   = 2;
-    TransactionStatus const TS_ABORT    = 3;
-    TransactionStatus const TS_COMMITED = 4;
-    TransactionStatus const TS_ABORTED  = 5;
-
-    struct Transaction
-    {
-      TransactionId id;
-      TransactionStatus status;
-    };
-
-    // Transaction List (TL)
-
-    // unsigned long const TL_LENGTH = 1;
-
-    // typedef Transaction TransactionList[TL_LENGTH];
-
-
-    //
-    //
-    //
-    struct MessageHeader
-    {
-      unsigned long length;
-
-      unsigned long check_sum;
-
-      MemberId member_id;
-
-      Transaction current;
-
-      //TransactionList transaction_list;
-    };
-
-
-    //
-    //
-    //
-
-    unsigned long const MAX_MESSAGE_SIZE = 768;
-
-    unsigned long const
-    MAX_PAYLOAD_SIZE = MAX_MESSAGE_SIZE - sizeof (MessageHeader);
-
-    // Protocol timing
-    //
-    //
-
-    unsigned long const SYNC_PERIOD = 30000;    // in mks
-
-    unsigned short const VOTING_FRAME = 4;      // in SYNC_PERIOD's
-    unsigned short const SEPARATION_FRAME = 5;  // in SYNC_PERIOD's
-
-    // FATAL_SILENCE_FRAME in SYNC_PERIOD's
-    // Generally it's a good idea to set it to < VOTING_FRAME + SEPARATION_FRAME
-    //
-
-    short const FATAL_SILENCE_FRAME = VOTING_FRAME + SEPARATION_FRAME - 2;
-
-    // short const FATAL_SILENCE_FRAME = 10000;
-
-    // Helpers
-
-    // std::string
-    // tslabel (Protocol::TransactionStatus s);
-
-    // std::ostream&
-    // operator << (std::ostream& o, Transaction const& t);
-  }
-}
-
-#endif // TMCAST_PROTOCOL_HPP
diff --git a/protocols/ace/TMCast/README b/protocols/ace/TMCast/README
deleted file mode 100644
index 9600b17fe2c..00000000000
--- a/protocols/ace/TMCast/README
+++ /dev/null
@@ -1,240 +0,0 @@
-
-
-Introduction
-------------
-
-TMCast (stands for Transaction MultiCast) is an implementation of a
-transactional multicast protocol. In essence, the idea is to represent
-each message delivery to members of a multicast group as a transaction
-- an atomic, consistent and isolated action. A multicast transaction
-can be viewed as an atomic transition of the group members to a new
-state.  If we define [Mo] as a set of operational (non-faulty) members
-of the group, [Mf] as a set of faulty members of the group, [Ma] as a
-set of members that view transition [Tn] as aborted and [Mc] as a set
-of members that view transition [Tn] as committed, then this atomic
-transition [Tn] should satisfy one of the following equations:
-
-Mo(Tn-1) = Ma(T) U Mf(T)
-Mo(Tn-1) = Mc(T) U Mf(T)
-
-Or, in other words, after transaction T has been committed (aborted), 
-all operational (before transaction T) members are either in the
-committed (aborted) or failed state.
-
-Thus, for each member of the group, outcome of the transaction can be
-commit, abort or a member failure. It is important for a member to
-exhibit a failfast (error latency is less than transaction cycle)
-behavior. Or, in other words, if a member transitioned into a wrong
-state, it is guaranteed to fail instead of delivering a wrong result.
-
-In order to achieve such an error detection in a decentralized
-environment, certain limitations were imposed. One of the most
-user-visible limitation is the fact that the lifetime of the group
-with only one member is very short. This is because there is not way
-for a member to distinguish "no members yet" case from "my link to the
-group is down". In such a situation, the member assumes the latter
-case.  There is also a military saying that puts it quite nicely: two
-is one, one is nothing.
-
-
-
-State of Implementation
------------------------
-
-The current implementation is in a prototypical stage. The following 
-parts are not implemented or still under development:
-
-* Handling of network partitioning (TODO)
-
-* Redundant network support (TODO)
-
-* Member failure detection (partial implementation)
-
-
-Examples
---------
-
-There is a simple example available in examples/TMCast/Member with 
-the corresponding README.
-
-
-Architecture
-------------
-
-Primary goals of the protocol are to (1) mask transient failures of the
-underlying multicast protocol (or, more precisely, allow to recover 
-from transient failures) and (2) exhibit failfast behavior in cases of
-permanent failures.
-
-The distinction between transient and permanent failures is based on
-timeouts thus what can be a transient failure in one configuration of
-the protocol could be a permanent failure in the other.
-
-[Maybe talk more about a transient/permanent threshold and its effect
-on performance/resource utilization/etc.]
-
-[Maybe add a terminology section.]
-
-Each member of a multicast group has its unique (group-wise) id:
-
-struct MemberId
-{
-  char id[MEMBER_ID_LENGTH];
-};
-
-Each payload delivery is part of a transaction. Each transaction is 
-identified by TransactionId:
-
-typedef unsigned short TransactionId;
-
-
-Each transaction has a status code which identifies its state, as viewed by 
-a group member:
-
-
-typedef unsigned char  TransactionStatus;
-
-TransactionStatus const TS_BEGIN     = 1;
-TransactionStatus const TS_COMMIT    = 2;
-TransactionStatus const TS_ABORT     = 3;
-TransactionStatus const TS_COMMITTED = 4;
-TransactionStatus const TS_ABORTED   = 5;
-
-Thus each transaction is described by its id and status:
-
-struct Transaction
-{
-  TransactionId id;
-  TransactionStatus status;
-};
-
-The outcome of some predefined number of recent transactions is stored 
-in TransactionList:
-
-typedef Transaction TransactionList[TL_LENGTH];
-
-
-Each message sent to a multicast group has the following header:
-
-struct MessageHeader
-{
-  unsigned long length;
-  unsigned long check_sum;
-  MemberId member_id;
-  Transaction current;
-  TransactionList transaction_list;
-};
-
-[Maybe describe each field here.]
-
-A new member joins the group with transaction id 0 and status 
-TS_COMMITTED.
-
-Each member sends a periodic 'pulse' messages with some predefined interval
-advertising its current view of the group. This includes the state of the
-current transaction and the history of the recent transactions.
-
-
-If a member of the group needs a payload delivery it starts a new 
-transaction by sending a message with current transaction set to
-
-{++current_id, TS_BEGIN} 
-
-and payload appended after the header.
-
-
-Each member joins a transaction in one of the following ways:
-
-* A member that began the transaction joins it 'to commit' (TS_COMMIT)
-
-* A member that received TS_BEGIN joins current transaction 'to commit' 
-  (TS_COMMIT).
-
-* A member that received TS_COMMIT or TS_ABORT but did not receive TS_BEGIN
-  joins current transaction 'to abort' (TS_ABORT).
-
-
-After a member has joined the transaction it starts participating in the 
-transaction's voting phase. On this phase members of the group decide the 
-fate of the transaction. Each member sends a predefined number of messages 
-where it announces its vote. In between those messages the member is receiving
-and processing votes from other members and can be influenced by their
-'opinion'. 
-
-In their decision-making, members follow the principle of the majority. As 
-the voting progresses (and comes close to an end) members become more and 
-more reluctant to deviate from the decision of the majority.
-
-[Maybe add an equation that measures member's willingness to change
-its mind.]
-
-At the end of the voting phase each member declares the current transaction
-either committed (TS_COMMITTED) or aborted (TS_ABORTED). If this decision does
-not agree with the majority the member declares itself failed.
-
-In addition, each member builds a 'majority view' of the transaction history
-(based on transaction_list). If it deviates from the member's own history the
-member declares itself failed.
-
-Here are some example scenarios of how the protocol behaves in different 
-situations. Let's say we have three members of the group S, R1, R2. S 
-initiates a transaction. R1 and R2 join it.
-
-Scenario 1. (two-step voting)
-
-1.  S  initiates a transaction (TS_BEGIN)
-2a. R1 receives TS_BEGIN, joins for commit
-2b. R2 receives TS_BEGIN, joins for commit
-3a. S  announces TS_COMMIT (first vote)
-3b. R1 announces TS_COMMIT (first vote)
-3c. R2 announces TS_COMMIT (first vote)
-4a. S  announces TS_COMMIT (second vote)
-4b. R1 announces TS_COMMIT (second vote)
-4c. R2 announces TS_COMMIT (second vote)
-5a. S  announces TS_COMMITTED (end of vote)
-5b. R1 announces TS_COMMITTED (end of vote)
-5c. R2 announces TS_COMMITTED (end of vote)
-
-
-Scenario 2. (two-step voting)
-
-1.  S  initiates a transaction (TS_BEGIN)
-2a. R1 receives TS_BEGIN, joins for commit
-2b. R2 didn't receive TS_BEGIN 
-3a. S  announces TS_COMMIT (first vote)
-3b. R1 announces TS_COMMIT (first vote)
-3c. R2 received R1's TS_COMMIT announces TS_ABORT (first vote)
-4a. S  received R2's TS_ABORT announces TS_ABORT (second vote)
-4b. R1 received R2's TS_ABORT announces TS_ABORT (second vote)
-4c. R2 announces TS_ABORT (second vote)
-5a. S  announces TS_ABORTED (end of vote)
-5b. R1 announces TS_ABORTED (end of vote)
-5c. R2 announces TS_ABORTED (end of vote)
-
-
-Scenario 3. (three-step voting)
-
-1.  S  initiates a transaction (TS_BEGIN)
-2a. R1 receives TS_BEGIN, joins for commit
-2b. R2 didn't receive TS_BEGIN 
-3a. S  announces TS_COMMIT (first vote)
-3b. R1 announces TS_COMMIT (first vote)
-3c. R2 still didn't receive anything
-4a. S  announces TS_COMMIT (second vote)
-4b. R1 announces TS_COMMIT (second vote)
-4c. R2 received R1's TS_COMMIT, announces TS_ABORT (first vote)
-
-5a. S  received R2's TS_ABORT but it is the end of the voting phase and
-       majority (S and R1) vote for commit, announces TS_COMMIT (third vote)
-5b. R1 received R2's TS_ABORT but it is the end of the voting phase and
-       majority (S and R1) vote for commit, announces TS_COMMIT (third vote)
-5c. R2 announces TS_ABORT (second vote)
-
-6a. S  announces TS_COMMITTED (end of vote)
-6b. R1 announces TS_COMMITTED (end of vote)
-6c. R2 discovers that the the majority has declared current transaction 
-       committed and thus declares itself failed.
-
-
--- 
-Boris Kolpackov <boris@dre.vanderbilt.edu>
diff --git a/protocols/ace/TMCast/TMCast.mpc b/protocols/ace/TMCast/TMCast.mpc
deleted file mode 100644
index 7826b439836..00000000000
--- a/protocols/ace/TMCast/TMCast.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-//  -*- MPC -*-
-// $Id$
-
-project : acelib, core {
-  requires     += exceptions threads
-  sharedname    = TMCast
-  dynamicflags += TMCAST_BUILD_DLL
-}
diff --git a/protocols/ace/TMCast/TransactionController.hpp b/protocols/ace/TMCast/TransactionController.hpp
deleted file mode 100644
index f1108963ffa..00000000000
--- a/protocols/ace/TMCast/TransactionController.hpp
+++ /dev/null
@@ -1,387 +0,0 @@
-// file      : TMCast/TransactionController.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "ace/OS_NS_string.h"
-#include "ace/Synch.h"
-#include "ace/Refcounted_Auto_Ptr.h"
-
-#include "Protocol.hpp"
-#include "Messaging.hpp"
-
-#include <typeinfo>
-
-namespace TMCast
-{
-
-  // Messages
-  //
-  //
-  class Send : public virtual Message
-  {
-  public:
-    Send (void const* msg, size_t size)
-        : size_ (size)
-    {
-      ACE_OS::memcpy (payload_, msg, size_);
-    }
-
-    void const*
-    payload () const
-    {
-      return payload_;
-    }
-
-    size_t
-    size () const
-    {
-      return size_;
-    }
-
-  private:
-    size_t size_;
-    char payload_[Protocol::MAX_PAYLOAD_SIZE];
-  };
-
-  typedef
-  ACE_Refcounted_Auto_Ptr<Send, ACE_Null_Mutex>
-  SendPtr;
-
-
-  class Recv : public virtual Message
-  {
-  public:
-    Recv (void const* msg, size_t size)
-        : size_ (size)
-    {
-      ACE_OS::memcpy (payload_, msg, size_);
-    }
-
-    void const*
-    payload () const
-    {
-      return payload_;
-    }
-
-    size_t
-    size () const
-    {
-      return size_;
-    }
-
-  private:
-    size_t size_;
-    char payload_[Protocol::MAX_PAYLOAD_SIZE];
-  };
-
-  typedef
-  ACE_Refcounted_Auto_Ptr<Recv, ACE_Null_Mutex>
-  RecvPtr;
-
-  class Aborted : public virtual Message {};
-
-  class Commited : public virtual Message {};
-
-
-  //
-  //
-  //
-  class TransactionController
-  {
-  public:
-    TransactionController (MessageQueue& in,
-                           MessageQueue& send_out,
-                           MessageQueue& recv_out)
-        : trace_ (false),
-          voting_duration_ (0),
-          separation_duration_ (0),
-          in_ (in),
-          send_out_ (send_out),
-          recv_out_ (recv_out)
-    {
-      current_.id = 0;
-      current_.status = Protocol::TS_COMMITED;
-    }
-
-  public:
-    class Failure {};
-
-
-    void
-    outsync (Protocol::Transaction& c, void* payload, size_t& size)
-    {
-      if (current_.status == Protocol::TS_COMMIT ||
-          current_.status == Protocol::TS_ABORT)
-      {
-        if (++voting_duration_ >= Protocol::VOTING_FRAME)
-        {
-          // end of voting frame
-
-          if (current_.status == Protocol::TS_COMMIT)
-          {
-            {
-              if (initiated_)
-              {
-                MessageQueueAutoLock lock (send_out_);
-                send_out_.push (MessagePtr (new Commited));
-              }
-              else // joined transaction
-              {
-                MessageQueueAutoLock lock (recv_out_);
-                recv_out_.push (MessagePtr (recv_.release ()));
-                recv_ = RecvPtr ();
-              }
-            }
-
-            current_.status = Protocol::TS_COMMITED;
-
-            // if (trace_) cerr << "commited transaction with id "
-            //                  << current_.id << endl;
-          }
-          else // TS_ABORT
-          {
-            if (initiated_)
-            {
-              MessageQueueAutoLock lock (send_out_);
-              send_out_.push (MessagePtr (new Aborted));
-            }
-            else
-            {
-              // free revc_ buffer if necessary
-              //
-              if (recv_.get ()) recv_ = RecvPtr ();
-            }
-
-
-            current_.status = Protocol::TS_ABORTED;
-
-            // if (trace_) cerr << "aborted transaction with id "
-            //                  << current_.id << endl;
-          }
-
-          // start transaction separation frame (counts down)
-          // +1 because it will be decremented on this iteration
-          separation_duration_ = Protocol::SEPARATION_FRAME + 1;
-        }
-      }
-
-      // Set current outsync info
-
-      c.id = current_.id;
-      c.status = current_.status;
-
-
-      // Do some post-processing
-
-      switch (current_.status)
-      {
-      case Protocol::TS_COMMITED:
-      case Protocol::TS_ABORTED:
-        {
-          if (separation_duration_ > 0) --separation_duration_;
-          break;
-        }
-      case Protocol::TS_BEGIN:
-        {
-          // transfer payload
-
-          size = send_->size ();
-          memcpy (payload, send_->payload (), size);
-
-          send_ = SendPtr ();
-
-          // get redy to vote for 'commit'
-
-          current_.status = Protocol::TS_COMMIT;
-          voting_duration_ = 0;
-        }
-      }
-    }
-
-    void
-    current_transaction (Protocol::Transaction const& t,
-                         void const* payload,
-                         size_t size)
-    {
-      Protocol::TransactionId& id = current_.id;
-      Protocol::TransactionStatus& s = current_.status;
-
-      if (id == 0 && t.id != 0) // catch up
-      {
-        switch (t.status)
-        {
-        case Protocol::TS_BEGIN:
-        case Protocol::TS_COMMIT:
-        case Protocol::TS_ABORT:
-          {
-            id = t.id - 1;
-            s = Protocol::TS_COMMITED;
-            break;
-          }
-        case Protocol::TS_ABORTED:
-        case Protocol::TS_COMMITED:
-          {
-            id = t.id;
-            s = t.status;
-            break;
-          }
-        }
-
-        // if (trace_) cerr << "caught up with id " << id << endl;
-      }
-
-      bool stable (s == Protocol::TS_COMMITED || s == Protocol::TS_ABORTED);
-
-      switch (t.status)
-      {
-      case Protocol::TS_BEGIN:
-        {
-          if (!stable || t.id != id + 1)
-          {
-            // Transaction is in progress or hole in transaction id's
-
-            // cerr << "unexpected request to join " << t
-            //     << " while on " << current_ << endl;
-
-            // if (!stable) cerr << "voting progress is " << voting_duration_
-            //                  << "/" << Protocol::VOTING_FRAME << endl;
-
-            if (t.id == id) // collision
-            {
-              if (!stable && s != Protocol::TS_ABORT)
-              {
-                // abort both
-                // cerr << "aborting both transactions" << endl;
-
-                s = Protocol::TS_ABORT;
-                voting_duration_ = 0; //@@ reset voting frame
-              }
-            }
-            else
-            {
-              // @@ delicate case. need to think more
-
-              // cerr << "Declaring node failed." << endl;
-              throw Failure ();
-            }
-          }
-          else
-          {
-            // join the transaction
-
-            initiated_ = false;
-
-            recv_ = RecvPtr (new Recv (payload, size));
-
-            id = t.id;
-            s = Protocol::TS_COMMIT;
-            voting_duration_ = 0;
-
-            // if (trace_) cerr << "joining-for-commit transaction with id "
-            //                  << id << endl;
-          }
-          break;
-        }
-      case Protocol::TS_COMMIT:
-        {
-          if (stable && id == t.id - 1)
-          {
-            // not begin and and we haven't joined
-
-            // join for abort
-
-            initiated_ = false;
-
-            current_.id = t.id;
-            current_.status = Protocol::TS_ABORT;
-            voting_duration_ = 0;
-
-            // if (trace_) cerr << "joining-for-abort transaction with id "
-            //                  << current_.id << endl;
-          }
-          break;
-        }
-      case Protocol::TS_ABORT:
-        {
-          if ((!stable && id == t.id && s == Protocol::TS_COMMIT) ||
-              (stable && id == t.id - 1)) // abort current || new transaction
-          {
-            // if (trace_) cerr << "voting-for-abort on transaction with id "
-            //                  << current_.id << endl;
-
-            id = t.id;
-            s = Protocol::TS_ABORT;
-
-            voting_duration_ = 0; //@@ reseting voting_duration_
-          }
-          else
-          {
-          }
-
-          break;
-        }
-      case Protocol::TS_ABORTED:
-      case Protocol::TS_COMMITED:
-        {
-          // nothing for now
-          break;
-        }
-      }
-    }
-
-    void
-    api ()
-    {
-      if ((current_.status == Protocol::TS_COMMITED ||
-           current_.status == Protocol::TS_ABORTED) &&
-          separation_duration_ == 0) // no transaction in progress
-      {
-        // start new transaction
-
-        // Note that in_ is already locked by Scheduler
-
-        MessagePtr m (in_.front ());
-        in_.pop ();
-
-        if (typeid (*m) == typeid (Send))
-        {
-          send_ = SendPtr (dynamic_cast<Send*> (m.release ()));
-        }
-        else
-        {
-          // cerr << "Expecting Send but received " << typeid (*m).name ()
-          //      << endl;
-
-          ::abort ();
-        }
-
-        current_.id++;
-        current_.status = Protocol::TS_BEGIN;
-
-        initiated_ = true;
-
-        // if (trace_) cerr << "starting transaction with id " << current_.id
-        //                  << endl;
-      }
-    }
-
-  private:
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
-
-    bool trace_;
-
-    Protocol::Transaction current_;
-
-    bool initiated_;
-
-    unsigned short voting_duration_;
-    unsigned short separation_duration_;
-
-    MessageQueue& in_;
-    MessageQueue& send_out_;
-    MessageQueue& recv_out_;
-
-    SendPtr send_;
-    RecvPtr recv_;
-  };
-}
diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp
index 7df2604225e..cd7c58f6174 100644
--- a/tests/Basic_Types_Test.cpp
+++ b/tests/Basic_Types_Test.cpp
@@ -75,6 +75,8 @@ run_main (int, ACE_TCHAR *[])
   errors += check (ACE_TEXT ("ACE_SIZEOF_CHAR: %u%s"),
                    sizeof (char), ACE_SIZEOF_CHAR);
 #if defined (ACE_HAS_WCHAR)
+  // This is pointless - since ACE_SIZEOF_WCHAR is defined to sizeof (wchar_t)
+  // but oh well...
   errors += check (ACE_TEXT ("ACE_SIZEOF_WCHAR: %u%s"),
                    sizeof (wchar_t), ACE_SIZEOF_WCHAR);
 #endif /* ACE_HAS_WCHAR */
diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp
index 49582de3872..ed4fff4a373 100644
--- a/tests/CDR_Test.cpp
+++ b/tests/CDR_Test.cpp
@@ -449,17 +449,6 @@ run_main (int argc, ACE_TCHAR *argv[])
         }
     }
 
-  // Sanity checks.
-  ACE_ASSERT (sizeof (ACE_CDR::Boolean)    == 1);
-  ACE_ASSERT (sizeof (ACE_CDR::Octet)      == 1);
-  ACE_ASSERT (sizeof (ACE_CDR::WChar)      >= 2);
-  ACE_ASSERT (sizeof (ACE_CDR::Short)      == 2);
-  ACE_ASSERT (sizeof (ACE_CDR::Long)       == 4);
-  ACE_ASSERT (sizeof (ACE_CDR::LongLong)   == 8);
-  ACE_ASSERT (sizeof (ACE_CDR::Float)      == 4);
-  ACE_ASSERT (sizeof (ACE_CDR::Double)     == 8);
-  ACE_ASSERT (sizeof (ACE_CDR::LongDouble) == 16);
-
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing ACE CDR functions - short stream\n\n")));
 
diff --git a/tests/Cached_Allocator_Test.cpp b/tests/Cached_Allocator_Test.cpp
index 78cab3e70e4..0e5bcf5f28f 100644
--- a/tests/Cached_Allocator_Test.cpp
+++ b/tests/Cached_Allocator_Test.cpp
@@ -149,7 +149,6 @@ run_main (int argc, ACE_TCHAR *argv[])
   size_t chunk_size = 0;
   size_t n_chunks   = 0;
   size_t requested_size = 0;
-  size_t depth = 0;
   char *ptr1 = 0;
   char *ptr2 = 0;
   char *ptr3 = 0;
@@ -175,12 +174,6 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   DYNAMIC_ALLOCATOR allocator (n_chunks, chunk_size);
 
-  if ((depth = allocator.pool_depth ()) != n_chunks)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Expected pool depth ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT (" but reported ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT ("\n"),
-                n_chunks, depth));
   requested_size = chunk_size;
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT (" (%t) Allocating chunk 1: %d bytes, should succeed...\n"),
@@ -191,12 +184,6 @@ run_main (int argc, ACE_TCHAR *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%t) Failed, exiting.\n")), -1);
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) OK, succeeded.\n")));
-  if ((depth = allocator.pool_depth ()) != (n_chunks - 1))
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Expected pool depth ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT (" but reported ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT ("\n"),
-                n_chunks - 1, depth));
 
   requested_size = chunk_size + 1;
   ACE_DEBUG ((LM_INFO,
@@ -221,12 +208,6 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) OK, succeeded.\n")));
 
   // One chunk too far...
-  if ((depth = allocator.pool_depth ()) != 0)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Expected pool depth 0")
-                ACE_TEXT (" but reported ") ACE_SIZE_T_FORMAT_SPECIFIER
-                ACE_TEXT ("\n"),
-                depth));
   requested_size = chunk_size;
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT (" (%t) Allocating chunk 4: %d bytes, no free chunks,")
diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp
index 81d8e606fb7..6fe3e5b0dfd 100644
--- a/tests/Config_Test.cpp
+++ b/tests/Config_Test.cpp
@@ -1428,7 +1428,7 @@ Config_Test::get_section_boolean (ACE_Configuration&             config,
            pSrc++)
         // Convert to uppercase
         if (ACE_OS::ace_islower (*pSrc))
-          *pSrc = ACE_OS::ace_tolower (*pSrc);
+          *pSrc = ACE_OS::to_lower (*pSrc);
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("%s = %s\n"),
diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp
index ba2f45cbe29..dcd2879b979 100644
--- a/tests/Dirent_Test.cpp
+++ b/tests/Dirent_Test.cpp
@@ -41,16 +41,8 @@ ACE_RCSID (tests,
 #define TEST_DIR "log"
 #define TEST_ENTRY ".."
 #else
-#  define TEST_DIR "../tests"
-#  if defined (ACE_LACKS_STRUCT_DIR) || !defined (ACE_HAS_SCANDIR)
-#    define DIR_DOT ACE_TEXT (".")
-#    define DIR_DOT_DOT ACE_TEXT ("..")
-#    define TEST_ENTRY ACE_TEXT ("run_test.lst")
-#  else
-#    define DIR_DOT "."
-#    define DIR_DOT_DOT ".."
-#    define TEST_ENTRY "run_test.lst"
-#  endif /* ACE_LACKS_STRUCT_DIR */
+#define TEST_DIR "../tests"
+#define TEST_ENTRY "run_test.lst"
 #endif /* VXWORKS || CHORUS */
 
 static const int RECURSION_INDENT = 3;
@@ -61,13 +53,13 @@ static int entrycount = 0;
 static int
 selector (const dirent *d)
 {
-  return ACE_OS::strcmp (d->d_name, TEST_ENTRY) == 0;
+  return ACE_OS_String::strcmp (d->d_name, ACE_TEXT (TEST_ENTRY)) == 0;
 }
 
 static int
 comparator (const dirent **d1, const dirent **d2)
 {
-  return ACE_OS::strcmp ((*d1)->d_name, (*d2)->d_name);
+  return ACE_OS_String::strcmp ((*d1)->d_name, (*d2)->d_name);
 }
 
 static int
@@ -87,7 +79,7 @@ dirent_selector_test (void)
 
   for (n = 0; n < sds.length (); ++n)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Sorted: %d: %C\n"),
+                "Sorted: %d: %s\n",
                 n,
                 sds[n]->d_name));
 
@@ -104,7 +96,7 @@ dirent_selector_test (void)
 
   for (n = 0; n < ds.length (); ++n)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Entry %d: %C\n"),
+                "Entry %d: %s\n",
                 n,
                 ds[n]->d_name));
 
@@ -123,24 +115,24 @@ dirent_test (void)
        (directory = dir.read ()) != 0;
        entrycount++)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Entry %d: %C\n"),
+                "Entry %d: %s\n",
                 entrycount,
                 directory->d_name));
   switch (entrycount)
     {
     case 0:
-      ACE_ERROR_RETURN
-        ((LM_ERROR, ACE_TEXT ("readdir failed to read anything\n")), -1);
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "readdir failed to read anything\n"),
+                        -1);
       /* NOTREACHED */
     case 1:
-      ACE_ERROR_RETURN
-        ((LM_ERROR,
-          ACE_TEXT ("readdir failed, only matched directory name\n")),
-         -1);
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "readdir failed, only matched directory name\n"),
+                        -1);
       /* NOTREACHED */
     default:
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("readdir succeeded, read %d entries\n"),
+                  "readdir succeeded, read %d entries\n",
                   entrycount));
     }
   return 0;
@@ -154,42 +146,29 @@ dirent_count (const ACE_TCHAR *dir_path,
 {
   if (ACE_OS::chdir (dir_path) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("chdir: %p\n"),
+                       "chdir: %p\n",
                        dir_path),
                       -1);
   ACE_Dirent dir (ACE_TEXT ("."));
 
-  // Since the dir struct d_name type changes depending on the setting
-  // of ACE_LACKS_STRUCT_DIR, copy each name into a neutral format
-  // array to work on it.
-  const size_t maxnamlen = MAXNAMLEN;
-  ACE_TCHAR tname[maxnamlen + 1];
-
   int entry_count = 0;
 
   for (dirent *directory; (directory = dir.read ()) != 0;)
     {
       // Skip the ".." and "." files.
-      if (ACE_OS::strcmp (directory->d_name, DIR_DOT) == 0
-          || ACE_OS::strcmp (directory->d_name, DIR_DOT_DOT) == 0)
+      if (ACE_OS_String::strcmp (directory->d_name, ACE_TEXT (".")) == 0
+          || ACE_OS_String::strcmp (directory->d_name, ACE_TEXT ("..")) == 0)
         continue;
       entry_count++;
 
-#if !defined (ACE_LACKS_STRUCT_DIR)
-      ACE_OS::strncpy (tname,
-                       ACE_TEXT_CHAR_TO_TCHAR (directory->d_name),
-                       maxnamlen);
-#else
-      ACE_OS::strncpy (tname, directory->d_name, maxnamlen);
-#endif /* ACE_LACKS_STRUCT_DIR */
-
       int local_file_count = 0;
       int local_dir_count = 0;
       ACE_stat stat_buf;
+
       if (ACE_OS::lstat (directory->d_name, &stat_buf) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           tname),
+                           "%p\n",
+                           directory->d_name),
                           -1);
 
       switch (stat_buf.st_mode & S_IFMT)
@@ -201,8 +180,8 @@ dirent_count (const ACE_TCHAR *dir_path,
         case S_IFLNK: // Either a file or directory link, so let's find out.
           if (ACE_OS::stat (directory->d_name, &stat_buf) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               tname),
+                               "%p\n",
+                               directory->d_name),
                               -1);
 
           if ((stat_buf.st_mode & S_IFMT) == S_IFDIR)
@@ -215,27 +194,26 @@ dirent_count (const ACE_TCHAR *dir_path,
         default: // Must be a directory.
           ACE_DEBUG ((LM_DEBUG, "%*sentering subdirectory %s\n",
                       recursion_level * RECURSION_INDENT,
-                      ACE_TEXT (""),
-                      tname));
-          if (dirent_count (tname,
+                      "",
+                      directory->d_name));
+          if (dirent_count (directory->d_name,
                             local_dir_count,
                             local_file_count,
                             recursion_level + 1) != -1)
             {
-              ACE_DEBUG
-                ((LM_DEBUG,
-                  ACE_TEXT ("%*ssubdirectory %s has %d files and %d subdirectories.\n"),
-                  recursion_level * RECURSION_INDENT,
-                  ACE_TEXT (""),
-                  tname,
-                  local_file_count,
-                  local_dir_count));
+              ACE_DEBUG ((LM_DEBUG,
+                          "%*ssubdirectory %s has %d files and %d subdirectories.\n",
+                          recursion_level * RECURSION_INDENT,
+                          "",
+                          directory->d_name,
+                          local_file_count,
+                          local_dir_count));
               dir_count++;
 
               // Move back up a level.
               if (ACE_OS::chdir (ACE_TEXT ("..")) == -1)
                 ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("chdir: %p\n"),
+                                   "chdir: %p\n",
                                    dir_path),
                                   -1);
             }
@@ -253,7 +231,7 @@ dirent_recurse_test (void)
   int total_files = 0;
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Starting directory recursion test for %s\n"),
+              "Starting directory recursion test for %s\n",
               ACE_TEXT (TEST_DIR)));
 
   if (dirent_count (ACE_TEXT (TEST_DIR),
@@ -261,11 +239,11 @@ dirent_recurse_test (void)
                     total_files,
                     1) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Directory recursion test failed for %s\n"),
+                       "Directory recursion test failed for %s\n",
                        ACE_TEXT (TEST_DIR)),
                       -1);
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Directory recursion test succeeded for %s, read %d files %d dirs\n"),
+              "Directory recursion test succeeded for %s, read %d files %d dirs\n",
               ACE_TEXT (TEST_DIR),
               total_files,
               total_dirs));
diff --git a/tests/Dynamic_Priority_Test.cpp b/tests/Dynamic_Priority_Test.cpp
index 665670bb309..802175592be 100644
--- a/tests/Dynamic_Priority_Test.cpp
+++ b/tests/Dynamic_Priority_Test.cpp
@@ -411,7 +411,6 @@ performance_producer (void *args)
 
       // Set a character in the current message block at its
       // read pointer position, and adjust the write pointer.
-      mb->reset();
       *mb->wr_ptr () = 'a';
       mb->wr_ptr (1);
 
diff --git a/tests/Enum_Interfaces_Test.cpp b/tests/Enum_Interfaces_Test.cpp
index b9bd438c6c0..71f409dfae9 100644
--- a/tests/Enum_Interfaces_Test.cpp
+++ b/tests/Enum_Interfaces_Test.cpp
@@ -10,10 +10,11 @@
 //    Enum_interfaces.cpp
 //
 // = DESCRIPTION
-//     This is a simple test of <ACE::get_ip_interfaces>.  This call
-//     retrieves the IP addresses assigned to the host by
-//     interrogating the kernel.  Network applications typically
-//     assume gethostbyname(uname()) will work, but this is just a
+//     This is a simple test of
+//     <ACE_Sock_Connection::get_ip_interfaces>.  This call retrieves
+//     the IP addresses assigned to the host by interrogating the
+//     kernel.  Network applications typically assume
+//     gethostbyname(uname()) will work, but this is just a
 //     convention. It is also problematic if the resolver code
 //     (DNS/NIS+...) is misconfigured. This happens more than
 //     programmers realize. It is better to find out by asking the
@@ -48,26 +49,27 @@ run_main (int, ACE_TCHAR *[])
   ACE_INET_Addr *the_addr_array;
   size_t how_many = 0;
 
-  int rc = ACE::get_ip_interfaces (how_many, the_addr_array);
+  int rc = ACE_Sock_Connect::get_ip_interfaces (how_many, the_addr_array);
 
   if (rc != 0)
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("%p\n"),
-                ACE_TEXT ("ACE::get_ip_interfaces failed")));
+		ACE_TEXT ("%p\n"),
+		ACE_TEXT ("ACE_Sock_Connect::get_ip_interfaces failed")));
   else if (how_many == 0)
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("No interfaces presently configured in the kernel\n")));
+		ACE_TEXT ("No interfaces presently configured in the kernel\n")));
   else
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("there are %d interfaces\n"), how_many));
 
       for (size_t i = 0; i < how_many; i++)
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\t%s\n"),
+	ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\t%s\n"),
                     ACE_TEXT_CHAR_TO_TCHAR (the_addr_array[i].get_host_addr ())));
 
       delete [] the_addr_array;
     }
 
   ACE_END_TEST;
-  return rc != 0;       // return 1 if get_ip_interfaces() failed
+  return rc != 0;	// return 1 if get_ip_interfaces() failed
 }
+
diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp
index ca9674127a0..131197fdd45 100644
--- a/tests/Env_Value_Test.cpp
+++ b/tests/Env_Value_Test.cpp
@@ -44,15 +44,8 @@ run_main (int argc, ACE_TCHAR* [])
 {
   ACE_UNUSED_ARG (argc);
 
-  // Only Win32 can set wide-char environment strings. So, for all
-  // others, use char string literals regardless of ACE_USES_WCHAR.
-#  if defined (ACE_WIN32)
   ACE_OS::putenv (ACE_TEXT ("TEST_VALUE_POSITIVE=10.2"));
   ACE_OS::putenv (ACE_TEXT ("TEST_VALUE_NEGATIVE=-10.2"));
-#  else
-  ACE_OS::putenv ("TEST_VALUE_POSITIVE=10.2");
-  ACE_OS::putenv ("TEST_VALUE_NEGATIVE=-10.2");
-#  endif /* ACE_WIN32 */
 #else  /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER  &&  ! ACE_LACKS_FORK */
 run_main (int argc, ACE_TCHAR * [], ACE_TCHAR *envp[])
 {
diff --git a/tests/FIFO_Test.cpp b/tests/FIFO_Test.cpp
index 378a1d188db..f8f69e356d5 100644
--- a/tests/FIFO_Test.cpp
+++ b/tests/FIFO_Test.cpp
@@ -36,7 +36,8 @@ ACE_RCSID(tests, SOCK_Test, "$Id$")
 
 #if !defined (ACE_WIN32)
 
-static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
+static const ACE_TCHAR ACE_ALPHABET[] =
+  ACE_TEXT ("abcdefghijklmnopqrstuvwxyz");
 
 // This length is used for the "big buffer" send/receive.
 static const size_t big_size = (BUFSIZ * 4);
@@ -115,9 +116,9 @@ server (void *arg)
 
   // On AIX, select() always seems to select a fifo handle as a normal file,
   // always readable. Just wait a second...
-# if defined (AIX) || defined (HPUX)
+# if defined (AIX)
   ACE_OS::sleep (1);
-# endif /* AIX || HPUX */
+# endif /* AIX */
 
   // Read the things the client is sending; alphabet, huge overflow, then
   // alphabet.
@@ -193,7 +194,7 @@ test_fifo_msg (void)
   // Reader side opens first - it may fail if fifo not supported on this
   // platform.
   ACE_TCHAR fifo_path[MAXPATHLEN];
-  if (ACE::get_temp_dir (fifo_path, MAXPATHLEN) == -1)
+  if (ACE_Lib_Find::get_temp_dir (fifo_path, MAXPATHLEN) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
                        ACE_TEXT ("get_temp_dir")), 1);
   ACE_OS::strcat (fifo_path, ACE_TEXT ("FIFO_Test"));
@@ -224,7 +225,7 @@ test_fifo_msg (void)
   int status = 0;    // Test status; innocent until proven guilty.
 
 #if !defined (ACE_LACKS_FORK)
-  switch (ACE_OS::fork (ACE_TEXT ("child")))
+  switch (ACE_OS::fork ("child"))
     {
     case -1:
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("fork failed")));
diff --git a/tests/INET_Addr_Test.cpp b/tests/INET_Addr_Test.cpp
index 5a25bd54fba..4f026f19114 100644
--- a/tests/INET_Addr_Test.cpp
+++ b/tests/INET_Addr_Test.cpp
@@ -46,10 +46,10 @@ int check_type_consistency (const ACE_INET_Addr &addr)
   if (addr.get_type () != family)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Inconsistency between ACE_SOCK::addr_type_ (%d) ")
-                  ACE_TEXT ("and the sockaddr family (%d)\n"),
-                  addr.get_type (),
-                  family));
+		  ACE_TEXT ("Inconsistency between ACE_SOCK::addr_type_ (%d) ")
+		  ACE_TEXT ("and the sockaddr family (%d)\n"),
+		  addr.get_type (),
+		  family));
       return 1;
     }
   return 0;
@@ -189,7 +189,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
     }
 
 #if defined (ACE_HAS_IPV6)
-  if (ACE::ipv6_enabled ())
+  if (ACE_Sock_Connect::ipv6_enabled ())
     {
       const char *ipv6_addresses[] = {
         "1080::8:800:200c:417a", // unicast address
@@ -202,7 +202,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
       for (int i=0; ipv6_addresses[i] != 0; i++)
         {
           ACE_INET_Addr addr (80, ipv6_addresses[i]);
-          status |= check_type_consistency (addr);
+	  status |= check_type_consistency (addr);
 
           if (0 != ACE_OS::strcmp (addr.get_host_addr (), ipv6_addresses[i]))
             {
diff --git a/tests/INET_Addr_Test_IPV6.cpp b/tests/INET_Addr_Test_IPV6.cpp
index 96c4ed12cc8..12a9bb51459 100644
--- a/tests/INET_Addr_Test_IPV6.cpp
+++ b/tests/INET_Addr_Test_IPV6.cpp
@@ -64,7 +64,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
   int status = 0;     // Innocent until proven guilty
 
 #if defined (ACE_HAS_IPV6)
-  if (ACE::ipv6_enabled ())
+  if (ACE_Sock_Connect::ipv6_enabled ())
     {
       ACE_INET_Addr addr ("::");
 
diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp
index 4a57d519156..4beddee0aa0 100644
--- a/tests/IOStream_Test.cpp
+++ b/tests/IOStream_Test.cpp
@@ -28,8 +28,6 @@
 ACE_RCSID (tests, IOStream_Test, "$Id$")
 
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
-#  include "ace/OS_NS_unistd.h"
-#  include "ace/os_include/os_ctype.h"  // Needed for isspace() function
 
 typedef ACE_IOStream<ACE_SOCK_Stream> ACE_SOCK_IOStream;
 
diff --git a/tests/Log_Msg_Test.cpp b/tests/Log_Msg_Test.cpp
index daff113d3b4..1afdfb6c737 100644
--- a/tests/Log_Msg_Test.cpp
+++ b/tests/Log_Msg_Test.cpp
@@ -225,7 +225,7 @@ test_log_msg_features (const ACE_TCHAR *program)
   if (ACE_OS::open (badname,
                     O_RDONLY) == ACE_INVALID_HANDLE)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("%n: (%x), can't open %C%r\n"),
+                ACE_TEXT ("%n: (%x), can't open %s%r\n"),
                 10000,
                 badname,
                 cleanup));
@@ -415,7 +415,7 @@ test_ostream (void)
 
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("%C"),
+              ACE_TEXT ("%s"),
               buffer));
 
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp
index 7032700efc1..100327c72d4 100644
--- a/tests/MEM_Stream_Test.cpp
+++ b/tests/MEM_Stream_Test.cpp
@@ -34,10 +34,10 @@
 
 ACE_RCSID(tests, MEM_Stream_Test, "$Id$")
 
-#if (defined (ACE_HAS_THREADS) || defined (ACE_HAS_PROCESS_SPAWN)) && \
+#if (defined (ACE_HAS_THREADS) || !defined (ACE_LACKS_FORK)) && \
     (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
-#if !defined (ACE_HAS_PROCESS_SPAWN) && defined (ACE_HAS_THREADS)
+#if defined (ACE_LACKS_FORK) && defined (ACE_HAS_THREADS)   // Win32, et al
 #  define _TEST_USES_THREADS
 #else
 #  define _TEST_USES_PROCESSES
@@ -219,7 +219,6 @@ run_client (u_short port,
   return status;
 }
 
-#if defined (_TEST_USES_THREADS)
 static ACE_THR_FUNC_RETURN
 connect_client (void *arg)
 {
@@ -227,7 +226,6 @@ connect_client (void *arg)
   run_client (*sport, client_strategy);
   return 0;
 }
-#endif
 
 static void
 create_reactor (void)
@@ -287,13 +285,9 @@ test_reactive (const ACE_TCHAR *prog,
                                                 &sport) == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n ()")));
 #else
+  ACE_UNUSED_ARG (connect_client);
   ACE_Process_Options opts;
-#  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-  const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -p%d -r");
-#  else
-  const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -p%d -r");
-#  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
-  opts.command_line (cmdline_fmt, prog, sport);
+  opts.command_line (ACE_TEXT ("%s -p%d -r"), prog, sport);
   if (ACE_Process_Manager::instance ()->spawn_n (NUMBER_OF_REACTIVE_CONNECTIONS,
                                                  opts) == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n ()")));
@@ -378,13 +372,9 @@ test_concurrent (const ACE_TCHAR *prog,
                                                 &sport) == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n()")));
 #else
+  ACE_UNUSED_ARG (connect_client);
   ACE_Process_Options opts;
-#  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-  const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -p%d -m");
-#  else
-  const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -p%d -m");
-#  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
-  opts.command_line (cmdline_fmt, prog, sport);
+  opts.command_line (ACE_TEXT ("%s -p%d -m"), prog, sport);
   if (ACE_Process_Manager::instance ()->spawn_n (NUMBER_OF_MT_CONNECTIONS,
                                                  opts) == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n()")));
@@ -554,4 +544,4 @@ run_main (int, ACE_TCHAR *[])
   ACE_END_TEST;
   return 0;
 }
-#endif /* (ACE_HAS_THREADS || ACE_HAS_PROCESS_SPAWN) && ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
+#endif /* (ACE_HAS_THREADS || ACE_HAS_FORK) && ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp
index 755bf7964e5..0234d1a558f 100644
--- a/tests/Malloc_Test.cpp
+++ b/tests/Malloc_Test.cpp
@@ -30,7 +30,7 @@
 
 ACE_RCSID(tests, Malloc_Test, "Malloc_Test.cpp,v 4.22 1999/12/13 22:24:42 nanbor Exp")
 
-#if !defined (__Lynx__) && defined (ACE_HAS_PROCESS_SPAWN)
+#if !defined (__Lynx__) && (!defined (ACE_LACKS_FORK) || defined (ACE_WIN32))
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 typedef ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> MALLOC;
@@ -461,4 +461,4 @@ run_main (int, ACE_TCHAR *[])
   ACE_END_TEST;
   return 0;
 }
-#endif /* ! __Lynx__  &&  ACE_HAS_PROCESS_SPAWN */
+#endif /* ! __Lynx__  &&  (! ACE_LACKS_FORK || ACE_WIN32) */
diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp
index ed78cfcc93e..66f7ef98d32 100644
--- a/tests/Message_Queue_Notifications_Test.cpp
+++ b/tests/Message_Queue_Notifications_Test.cpp
@@ -218,9 +218,6 @@ Watermark_Test::producer (void)
       this->put_message ();
       this->print_producer_debug_message ();
       i--;
-      if (this->msg_queue ()->is_full ())
-        break;
-
     }
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) Producer: High water mark hit ---- \n")));
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index af5f2faf0e6..26b50b3f501 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -87,11 +87,11 @@ iterator_test (void)
 {
   const int ITERATIONS = 5;
   ACE_TCHAR buffer[ITERATIONS][BUFSIZ];
-  // Use queue size from of 32 Kb (more if using wide-char), instead of the
-  // default of 16 Kb (defined by ACE_Message_Queue_Base::DEFAULT_HWM),
-  // so that the test runs on machines with 8Kb pagesizes.
+  // Use queue size from of 32 Kb, instead of the default of 16 Kb
+  // (defined by ACE_Message_Queue_Base::DEFAULT_HWM), so that the
+  // test runs on machines with 8Kb pagesizes.
 #if !defined(_UNICOS)
-  QUEUE queue (32 * 1024 * sizeof (ACE_TCHAR));
+  QUEUE queue (32 * 1024);
 #else
   // this works on the Cray, where BUFSIZ is defined as 32Kb
   QUEUE queue (ITERATIONS * BUFSIZ - 1);
diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp
index 9b26a1b34a2..b67ed272077 100644
--- a/tests/OS_Test.cpp
+++ b/tests/OS_Test.cpp
@@ -781,44 +781,6 @@ string_convert_test (void)
 #endif /* ACE_HAS_WCHAR */
 }
 
-// Test the methods for getting cpu info
-int
-cpu_info_test (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Testing cpu info methods\n")));
-
-  long number_processors = ACE_OS::num_processors();
-  long number_processors_online = ACE_OS::num_processors_online();
-
-  if (number_processors == -1)
-    {
-      ACE_ERROR ((LM_INFO,
-                  ACE_TEXT ("number of processors not supported on ")
-                  ACE_TEXT ("this platform\n")));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("This system has %d processors\n"),
-                  number_processors));
-    }
-
-  if (number_processors_online == -1)
-    {
-      ACE_ERROR ((LM_INFO,
-                  ACE_TEXT ("number of processors online not supported on ")
-                  ACE_TEXT ("this platform\n")));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("This system has %d processors online\n"),
-                  number_processors_online));
-    }
-
-  return 0;
-}
 
 int
 run_main (int, ACE_TCHAR *[])
@@ -840,10 +802,7 @@ run_main (int, ACE_TCHAR *[])
   if ((result = ctime_r_test ()) != 0)
     status = result;
 
-  if ((result = string_strsncpy_test ()) != 0)
-      status = result;
-
-  if ((result = cpu_info_test ()) != 0)
+  if ((result =  string_strsncpy_test ()) != 0)
       status = result;
 
   ACE_END_TEST;
diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp
index 9e1012cd594..a3ce1b084d5 100644
--- a/tests/Proactor_Test.cpp
+++ b/tests/Proactor_Test.cpp
@@ -96,14 +96,14 @@ static int loglevel;       // 0 full , 1 only errors
 
 static size_t xfer_limit;  // Number of bytes for Sender to send.
 
-static char complete_message[] =
-  "GET / HTTP/1.1\r\n"
-  "Accept: */*\r\n"
-  "Accept-Language: C++\r\n"
-  "Accept-Encoding: gzip, deflate\r\n"
-  "User-Agent: Proactor_Test/1.0 (non-compatible)\r\n"
-  "Connection: Keep-Alive\r\n"
-  "\r\n";
+static ACE_TCHAR complete_message[] =
+  ACE_TEXT ("GET / HTTP/1.1\r\n")
+  ACE_TEXT ("Accept: */*\r\n")
+  ACE_TEXT ("Accept-Language: C++\r\n")
+  ACE_TEXT ("Accept-Encoding: gzip, deflate\r\n")
+  ACE_TEXT ("User-Agent: Proactor_Test/1.0 (non-compatible)\r\n")
+  ACE_TEXT ("Connection: Keep-Alive\r\n")
+  ACE_TEXT ("\r\n");
 
 class LogLocker
 {
@@ -1704,7 +1704,7 @@ set_proactor_type (const ACE_TCHAR *ptype)
   if (!ptype)
     return 0;
 
-  switch (ACE_OS::ace_toupper (*ptype))
+  switch (ACE_OS::to_upper (*ptype))
     {
     case 'D':
       proactor_type = DEFAULT;
diff --git a/tests/Proactor_Test_IPV6.cpp b/tests/Proactor_Test_IPV6.cpp
index 45d32db07c5..35688cc3f78 100644
--- a/tests/Proactor_Test_IPV6.cpp
+++ b/tests/Proactor_Test_IPV6.cpp
@@ -90,14 +90,14 @@ static int loglevel;       // 0 full , 1 only errors
 
 static size_t xfer_limit;  // Number of bytes for Sender to send.
 
-static char complete_message[] =
-  "GET / HTTP/1.1\r\n"
-  "Accept: */*\r\n"
-  "Accept-Language: C++\r\n"
-  "Accept-Encoding: gzip, deflate\r\n"
-  "User-Agent: Proactor_Test_IPv6/1.0 (non-compatible)\r\n"
-  "Connection: Keep-Alive\r\n"
-  "\r\n";
+static ACE_TCHAR complete_message[] =
+  ACE_TEXT ("GET / HTTP/1.1\r\n")
+  ACE_TEXT ("Accept: */*\r\n")
+  ACE_TEXT ("Accept-Language: C++\r\n")
+  ACE_TEXT ("Accept-Encoding: gzip, deflate\r\n")
+  ACE_TEXT ("User-Agent: Proactor_Test_IPv6/1.0 (non-compatible)\r\n")
+  ACE_TEXT ("Connection: Keep-Alive\r\n")
+  ACE_TEXT ("\r\n");
 
 class LogLocker
 {
@@ -1737,7 +1737,7 @@ set_proactor_type (const ACE_TCHAR *ptype)
   if (!ptype)
     return 0;
 
-  switch (ACE_OS::ace_toupper (*ptype))
+  switch (ACE_OS::to_upper (*ptype))
     {
     case 'D':
       proactor_type = DEFAULT;
diff --git a/tests/Process_Manager_Test.cpp b/tests/Process_Manager_Test.cpp
index 27150e6f848..34c3010640e 100644
--- a/tests/Process_Manager_Test.cpp
+++ b/tests/Process_Manager_Test.cpp
@@ -76,16 +76,9 @@ spawn_child (const ACE_TCHAR *argv0,
              ACE_Process_Manager &mgr,
              int sleep_time = 0)
 {
-#if defined (ACE_WIN32)
-const ACE_TCHAR *cmdline_format = ACE_TEXT("\"%s\" %s %d");
-#elif !defined (ACE_USES_WCHAR)
-const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT("%s %s %d");
-#else
-const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT("%ls %ls %d");
-#endif
   ACE_Process_Options opts;
 
-  opts.command_line (cmdline_format,
+  opts.command_line (ACE_TEXT("%s %s %d"),
                      argv0,
                      debug_test ? ACE_TEXT ("-d") : ACE_TEXT (""),
                      sleep_time);
diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp
index 279e1a40b6f..98ae4330f82 100644
--- a/tests/Process_Mutex_Test.cpp
+++ b/tests/Process_Mutex_Test.cpp
@@ -132,11 +132,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   // Child process code.
   if (child_process)
     {
-      ACE_TCHAR lognm[MAXPATHLEN];
-      int mypid (ACE_OS::getpid ());
-      ACE_OS::sprintf(lognm, ACE_TEXT ("Process_Mutex_Test-child-%d"), mypid);
-
-      ACE_START_TEST (lognm);
+      ACE_APPEND_LOG (ACE_TEXT("Process_Mutex_Test-children"));
       acquire_release ();
       ACE_END_LOG;
     }
@@ -151,27 +147,20 @@ run_main (int argc, ACE_TCHAR *argv[])
       // Process_Mutex shall control the destruction of mutex better.
       ACE_Process_Mutex mutex( mutex_name );
 #     endif
+      ACE_INIT_LOG (ACE_TEXT("Process_Mutex_Test-children"));
 
       ACE_Process_Options options;
       if (release_mutex == 0)
         options.command_line (ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR
                               ACE_TEXT ("Process_Mutex_Test")
                               ACE_PLATFORM_EXE_SUFFIX
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                              ACE_TEXT (" -c -n %ls -d"),
-#else
                               ACE_TEXT (" -c -n %s -d"),
-#endif /* !ACE_WIN32 && ACE_USES_WCHAR */
                               mutex_name);
       else
         options.command_line (ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR
                               ACE_TEXT ("Process_Mutex_Test")
                               ACE_PLATFORM_EXE_SUFFIX
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                              ACE_TEXT (" -c -n %ls"),
-#else
                               ACE_TEXT (" -c -n %s"),
-#endif /* !ACE_WIN32 && ACE_USES_WCHAR */
                               mutex_name);
 
       // Spawn <n_processes> child processes that will contend for the
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index 46104a724f0..4bba7e29cfa 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -680,7 +680,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
 #if !defined (ACE_LACKS_FORK)
       // We're running the client and serve as separate processes.
-      pid_t pid = ACE::fork (ACE_TEXT ("child"),
+      pid_t pid = ACE::fork ("child",
                              1); // Avoid zombies.
 
       switch (pid)
diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp
index c59ff63e537..997621ec257 100644
--- a/tests/SOCK_Connector_Test.cpp
+++ b/tests/SOCK_Connector_Test.cpp
@@ -113,20 +113,18 @@ find_another_host (ACE_TCHAR other_host[])
       // an infinite loop on Linux --mas 03-08-2001
       while ((h = gethostent ()) != NULL)
         {
-          if (ACE_OS::strcmp (h->h_name,
-                              ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0)
+          if (ACE_OS::strcmp (h->h_name, ACE_DEFAULT_SERVER_HOST) == 0)
             continue;
           // AIX just _has_ to be different
           if (ACE_OS::strcmp (h->h_name, "loopback") == 0)
             continue;
 
           // If not me.
-          if (ACE_OS::strcmp
-                (h->h_name, ACE_TEXT_ALWAYS_CHAR (other_host)) != 0
+          if (ACE_OS::strcmp (h->h_name, other_host) != 0
               && ACE_OS::strcmp (h->h_name, un.nodename) != 0)
             {
                ACE_OS::strcpy (candidate[candidate_count].host_name,
-                               ACE_TEXT_CHAR_TO_TCHAR (h->h_name));
+                               h->h_name);
                if (++candidate_count >= MAX_CANDIDATES)
                  break;
             }
diff --git a/tests/SOCK_Dgram_Bcast_Test.cpp b/tests/SOCK_Dgram_Bcast_Test.cpp
index 080a4b2cdee..dae49da7afe 100644
--- a/tests/SOCK_Dgram_Bcast_Test.cpp
+++ b/tests/SOCK_Dgram_Bcast_Test.cpp
@@ -119,7 +119,7 @@ int run_receiver ()
                      ACE_TEXT ("Cannot open broadcast socket")), -1);
 }
 
-#if !defined (ACE_HAS_PROCESS_SPAWN) && defined (ACE_HAS_THREADS)
+#if defined (ACE_LACKS_FORK) && defined (ACE_HAS_THREADS)
 /* \brief Thread main function to run run_receiver function
    \note run_receiver return valu is stored in receiver_exit_code global variable
 */
@@ -128,7 +128,7 @@ static ACE_THR_FUNC_RETURN run_thread_receiver (void *)
   receiver_exit_code = run_receiver ();
   return 0;
 }
-#endif /* !defined (ACE_HAS_PROCESS_SPAWN) && defined (ACE_HAS_THREADS) */
+#endif /* defined (ACE_LACKS_FORK) && defined (ACE_HAS_THREADS) */
 
 /* \brief Just runs automatic tests
 
@@ -139,7 +139,7 @@ tries to receive at least one datagram.
 */
 int run_auto_test (const ACE_TCHAR *prog_name)
 {
-#if defined (ACE_HAS_PROCESS_SPAWN)
+#if !defined (ACE_LACKS_FORK)
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("Running auto_tests in process mode\n")));
 
   ACE_Process_Options opts;
@@ -160,7 +160,7 @@ int run_auto_test (const ACE_TCHAR *prog_name)
   ACE_ERROR_RETURN ((LM_ERROR,
                      ACE_TEXT ("Cannot run in auto_test mode without fork or threads.\n")),
                       -1);
-#endif /* defined (ACE_HAS_PROCESS_SPAWN) */
+#endif /* !defined (ACE_LACKS_FORK) */
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Sending datagrams on port %d in auto_test mode\n"),
@@ -175,7 +175,7 @@ int run_auto_test (const ACE_TCHAR *prog_name)
         {
           send_datagram (socket, dgrams_no--);
           ACE_Time_Value child_timeout (1);
-#if defined (ACE_HAS_PROCESS_SPAWN)
+#if !defined (ACE_LACKS_FORK)
 
           if (ACE_Process_Manager::instance ()->wait (child_pid,
                                                       child_timeout,
diff --git a/tests/SOCK_Dgram_Test.cpp b/tests/SOCK_Dgram_Test.cpp
index 54bbd705204..3f600b18ef2 100644
--- a/tests/SOCK_Dgram_Test.cpp
+++ b/tests/SOCK_Dgram_Test.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// // $Id$
 // ===========================================================================
 //
 // = LIBRARY
@@ -152,7 +152,7 @@ spawn (int proto)
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) started server at port %d\n"),
                   server_addr.get_port_number ()));
 #if !defined (ACE_LACKS_FORK)
-      switch (ACE_OS::fork (ACE_TEXT ("child")))
+      switch (ACE_OS::fork ("child"))
         {
         case -1:
           ACE_ERROR ((LM_ERROR,
diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp
index 5ceb4ca60c7..8b393e86534 100644
--- a/tests/SOCK_Send_Recv_Test.cpp
+++ b/tests/SOCK_Send_Recv_Test.cpp
@@ -338,7 +338,7 @@ spawn (void)
                   server_addr.get_port_number ()));
 
 #if !defined (ACE_LACKS_FORK)
-      switch (ACE_OS::fork (ACE_TEXT ("child")))
+      switch (ACE_OS::fork ("child"))
         {
         case -1:
           ACE_ERROR ((LM_ERROR,
diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp
index 6472711a857..bbd39ee6748 100644
--- a/tests/SOCK_Test.cpp
+++ b/tests/SOCK_Test.cpp
@@ -226,7 +226,7 @@ spawn (void)
                   server_addr.get_port_number ()));
 
 #if !defined (ACE_LACKS_FORK)
-      switch (ACE_OS::fork (ACE_TEXT ("child")))
+      switch (ACE_OS::fork ("child"))
         {
         case -1:
           ACE_ERROR ((LM_ERROR,
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index 7f22a2da468..9e11ef2d443 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -174,7 +174,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (parent_synch->open (SEM_KEY_2,
                                   ACE_SV_Semaphore_Complex::ACE_CREATE,
                                   0) != -1);
-  switch (ACE_OS::fork (ACE_TEXT ("SV_Shared_Memory_Test.cpp")))
+  switch (ACE_OS::fork ("SV_Shared_Memory_Test.cpp"))
     {
     case -1:
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp
index 6006d661a6f..1a9e4fe7817 100644
--- a/tests/Service_Config_Test.cpp
+++ b/tests/Service_Config_Test.cpp
@@ -122,29 +122,23 @@ run_test (int argc, ACE_TCHAR *argv[])
 {
   ACE_ARGV new_argv;
 
-#if defined (ACE_USES_WCHAR)
-  // When using full Unicode support, use the version of the Service
-  // Configurator file appropriate to the platform.
-  // For example, Windows Unicode uses UTF-16.
-  //
-  //          iconv(1) found on Linux and Solaris, for example, can
-  //          be used to convert between encodings.
-  //
-  //          Byte ordering is also an issue, so we should be
-  //          generating this file on-the-fly from the UTF-8 encoded
-  //          file by using functions like iconv(1) or iconv(3).
-#  if defined (ACE_WIN32)
   const ACE_TCHAR svc_conf[] =
+#if defined (ACE_USES_WCHAR)
+    // When using full Unicode support, use the version of the Service
+    // Configurator file that is UTF-16 encoded.
+    //
+    // @@ Note: Some platforms may want other encoding (e.g. UTF-32).
+    //
+    //          iconv(1) found on Linux and Solaris, for example, can
+    //          be used to convert between encodings.
+    //
+    //          Byte ordering is also an issue, so we should be
+    //          generating this file on-the-fly from the UTF-8 encoded
+    //          file by using functions like iconv(1) or iconv(3).
     ACE_TEXT ("Service_Config_Test.UTF-16")
     ACE_TEXT (ACE_DEFAULT_SVC_CONF_EXT);
-#  else
-  const ACE_TCHAR svc_conf[] =
-    ACE_TEXT ("Service_Config_Test.WCHAR_T")
-    ACE_TEXT (ACE_DEFAULT_SVC_CONF_EXT);
-#  endif /* ACE_WIN32 */
 #else
     // ASCII (UTF-8) encoded Service Configurator file.
-  const ACE_TCHAR svc_conf[] =
     ACE_TEXT ("Service_Config_Test")
     ACE_TEXT (ACE_DEFAULT_SVC_CONF_EXT);
 #endif  /* ACE_USES_WCHAR */
diff --git a/tests/Signal_Test.cpp b/tests/Signal_Test.cpp
index c13467e6773..5d8ddda4b1f 100644
--- a/tests/Signal_Test.cpp
+++ b/tests/Signal_Test.cpp
@@ -244,7 +244,7 @@ worker_parent (void *arg)
   // Store the parent's process id so we can pass it to the child
   // portably.  Also, pass the test number, as well.
   ACE_OS::sprintf (pid_str,
-                   ACE_TEXT ("-p %ld -t %d"),
+                   "-p %ld -t %d",
                    ACE_static_cast (long, parent_pid),
                    test_number);
 
@@ -370,9 +370,9 @@ run_test (ACE_THR_FUNC worker,
 // Parse the command-line arguments and set options.
 
 static void
-parse_args (int argc, ACE_TCHAR *argv[])
+parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:chp:t:"));
+  ACE_Get_Opt get_opt (argc, argv, "i:chp:t:");
 
   int c;
 
diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp
index a148559c49a..91be070c1fd 100644
--- a/tests/TSS_Test.cpp
+++ b/tests/TSS_Test.cpp
@@ -49,11 +49,7 @@ static u_int errors = 0;
   // to be available.
   static const int ITERATIONS = 1;
 #else
-  // POSIX requires at least _POSIX_THREAD_KEYS_MAX (128) keys.  25
-  // iterations with 4 worker threads should be sufficient to check
-  // the TSS wrappers without exceeding the minimum requirements.
-
-  static const int ITERATIONS = 25;
+  static const int ITERATIONS = 100;
 #endif /* ACE_DEFAULT_THREAD_KEYS */
 
 // Static variables.
diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp
index ca52863c3b7..4d4171f13be 100644
--- a/tests/Test_Output.cpp
+++ b/tests/Test_Output.cpp
@@ -18,7 +18,6 @@
 
 #include "tests/test_config.h"
 #include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/Guard_T.h"
 #include "ace/Object_Manager.h"
@@ -75,32 +74,18 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   const ACE_TCHAR *test_dir;
 
 #if !defined (ACE_HAS_WINCE)
-#  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
   test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR"));
-#  else
-  ACE_TCHAR tempenv[MAXPATHLEN];
-  char *test_dir_n = ACE_OS::getenv ("ACE_TEST_DIR");
-  if (test_dir_n == 0)
-    test_dir = 0;
-  else
-    {
-      ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n));
-      test_dir = tempenv;
-    }
-#  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
   if (test_dir == 0)
 #endif /* ACE_HAS_WINCE */
     test_dir = ACE_TEXT ("");
 
-  // This could be done with ACE_OS::sprintf() but it requires different
-  // format strings for wide-char POSIX vs. narrow-char POSIX and Windows.
-  // Easier to keep straight like this.
-  ACE_OS_String::strcpy (temp, test_dir);
-  ACE_OS_String::strcat (temp, ACE_LOG_DIRECTORY);
-  ACE_OS_String::strcat
-    (temp, ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR));
-  ACE_OS_String::strcat (temp, ACE_LOG_FILE_EXT_NAME);
+  ACE_OS::sprintf (temp,
+                   ACE_TEXT ("%s%s%s%s"),
+                   test_dir,
+                   ACE_LOG_DIRECTORY,
+                   ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR),
+                   ACE_LOG_FILE_EXT_NAME);
 
 #if defined (VXWORKS)
   // This is the only way I could figure out to avoid a console
diff --git a/tests/run_test.pl b/tests/run_test.pl
index 4393a012876..2602d6a4dca 100755
--- a/tests/run_test.pl
+++ b/tests/run_test.pl
@@ -120,10 +120,8 @@ sub run_program ($)
        }
     }
 
-    print "auto_run_tests: tests/$program\n";
-    my $start_time = time();
+    print STDERR "Running $program\n";
     $status = $P->SpawnWaitKill (400);
-    my $time = time() - $start_time;
 
     ### Check for problems
 
@@ -136,8 +134,6 @@ sub run_program ($)
         print STDERR "Error: $program FAILED with exit status $status\n";
     }
 
-    print "\nauto_run_tests_finished: test/$program Time:$time"."s Result:$status\n";
-
     check_log ($program);
 
     if ($config_list->check_config ('Codeguard')) {
diff --git a/tests/test_config.h b/tests/test_config.h
index 74e6934f5da..f8e0c38ed85 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -120,14 +120,9 @@ const size_t ACE_MAX_THREADS = 4;
 # define ACE_MAIN ace_main
 #endif /* ghs */
 #else /* ! VXWORKS */
-#  if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-#    define ACE_INIT_LOG_FMT ACE_TEXT ("%ls%ls%ls")
-#  else
-#    define ACE_INIT_LOG_FMT ACE_TEXT ("%s%s%s")
-#  endif /* !ACE_WIN32 && ACE_USES_WCHAR */
 #define ACE_INIT_LOG(NAME) \
   ACE_TCHAR temp[MAXPATHLEN]; \
-  ACE_OS::sprintf (temp, ACE_INIT_LOG_FMT, \
+  ACE_OS::sprintf (temp, ACE_TEXT ("%s%s%s"), \
                    ACE_LOG_DIRECTORY, \
                    ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR), \
                    ACE_LOG_FILE_EXT_NAME); \
diff --git a/websvcs/lib/URL_Addr.cpp b/websvcs/lib/URL_Addr.cpp
index 82ae6e93f2f..bc0bc4b7a16 100644
--- a/websvcs/lib/URL_Addr.cpp
+++ b/websvcs/lib/URL_Addr.cpp
@@ -44,15 +44,6 @@ static size_t tn3270_size = sizeof(tn3270)/sizeof(tn3270[0]) - 1;
 static ACE_TCHAR gopher[] = ACE_TEXT ("gopher:");
 static size_t gopher_size = sizeof(gopher)/sizeof(gopher[0]) - 1;
 
-// When assembling URLs, sprintf() is often used. The format specifier for
-// a string changes depending on the platform and char width being fed to it.
-// Since we use ACE_TCHAR for strings, and it changes with the char width,
-// the printf specifier needs to change with the platform.
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-#  define ACE_PRINTF_S ACE_TEXT ("%s")
-#else
-#  define ACE_PRINTF_S ACE_TEXT ("%ls")
-#endif
 
 ACE_URL_Addr::ACE_URL_Addr (void)
   : url_ (0)
@@ -268,11 +259,11 @@ ACE_HTTP_Addr::set (const ACE_HTTP_Addr &addr)
   if (addr.hostname_ != 0)
     ACE_ALLOCATOR_RETURN (this->hostname_, ACE_OS::strdup (addr.hostname_), -1);
   else
-    ACE_ALLOCATOR_RETURN (this->hostname_, ACE_OS::strdup (ACE_TEXT ("")), -1);
+    ACE_ALLOCATOR_RETURN (this->hostname_, ACE_OS::strdup (""), -1);
   if (addr.path_ != 0)
     ACE_ALLOCATOR_RETURN (this->path_, ACE_OS::strdup (addr.path_), -1);
   else
-    ACE_ALLOCATOR_RETURN (this->path_, ACE_OS::strdup (ACE_TEXT ("")), -1);
+    ACE_ALLOCATOR_RETURN (this->path_, ACE_OS::strdup (""), -1);
   this->port_number_ = addr.port_number_;
   if (addr.query_ != 0)
     ACE_ALLOCATOR_RETURN (this->query_, ACE_OS::strdup (addr.query_), -1);
@@ -516,28 +507,24 @@ ACE_HTTP_Addr::addr_to_string (ACE_TCHAR *buffer,
   if (flags == 0)
     {
       ACE_INET_Addr inet = this->get_inet_address ();
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, inet.get_host_addr ());
+      n += ACE_OS::sprintf (buffer + n, "%s", inet.get_host_addr ());
     }
   else
     {
-     n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->hostname_);
+     n += ACE_OS::sprintf (buffer + n, "%s", this->hostname_);
     }
 
   if (this->port_number_ != ACE_DEFAULT_HTTP_PORT)
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_TEXT (":%d"), this->port_number_);
+      n += ACE_OS::sprintf (buffer + n, ":%d", this->port_number_);
     }
   if (this->path_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT ("/") ACE_PRINTF_S,
-                            this->path_);
+      n += ACE_OS::sprintf (buffer + n, "/%s", this->path_);
     }
   if (this->query_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT ("?") ACE_PRINTF_S,
-                            this->query_);
+      n += ACE_OS::sprintf (buffer + n, "?%s", this->query_);
     }
   return 0;
 }
@@ -690,34 +677,30 @@ ACE_FTP_Addr::addr_to_string (ACE_TCHAR *buffer,
 
   if (this->user_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->user_);
+      n += ACE_OS::sprintf (buffer + n, "%s", this->user_);
     }
   if (this->password_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT (":") ACE_PRINTF_S,
-                            this->password_);
+      n += ACE_OS::sprintf (buffer + n, ":%s", this->password_);
     }
 
   if (this->user_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("@"));
+      n += ACE_OS::sprintf (buffer + n, "@");
     }
 
   if (flags == 0)
     {
       ACE_INET_Addr inet = this->get_inet_address ();
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, inet.get_host_addr ());
+      n += ACE_OS::sprintf (buffer + n, "%s", inet.get_host_addr ());
     }
   else
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->hostname_);
+      n += ACE_OS::sprintf (buffer + n, "%s", this->hostname_);
     }
   if (this->path_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT ("/") ACE_PRINTF_S,
-                            this->path_);
+      n += ACE_OS::sprintf (buffer + n, "/%s", this->path_);
     }
   return 0;
 }
@@ -901,13 +884,11 @@ ACE_Mailto_Addr::addr_to_string (ACE_TCHAR *buffer,
   if (this->user_ == 0 || this->hostname_ == 0)
     return -1;
 
-  size_t n = ACE_OS::sprintf (buffer,
-                              ACE_TEXT ("mailto:") ACE_PRINTF_S ACE_TEXT
-                              ("@") ACE_PRINTF_S,
+  size_t n = ACE_OS::sprintf (buffer, ACE_TEXT ("mailto:%s@%s"),
                               this->user_, this->hostname_);
   if (this->headers_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("?") ACE_PRINTF_S,
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("?%s"),
                             this->headers_);
     }
author	nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2004-09-16 21:19:02 +0000
committer	nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2004-09-16 21:19:02 +0000
commit	40fdc8a404e75ab03b68cc62e9987cf208fd8c30 (patch)
tree	37d9c4d3abe4aefd8a34ed797883dd2cd4862ca7
parent	c254b281f1b9a4ca19dd0c3ee73a0654a7718909 (diff)
download	ATCD-typecode-overhaul.tar.gz